gui_main.py: Revert app mover

Further testing required

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -126,7 +126,7 @@ body:
     id: used-forums
     attributes:
       label: Have you already verified this is a patcher bug and not a macOS bug/user error on our discord servers?
-      description: If no, please do not use issues for this. We'd appreciate it if users check discuss with others before filing. Issues are for valid patcher issues only, not for personal troubleshooting scessions.
+      description: If no, please do not use issues for this. We'd appreciate it if users check discuss with others before filing. Issues are for valid patcher issues only, not for personal troubleshooting secessions.
       multiple: true
       options:
         - 'true'
@@ -136,7 +136,7 @@ body:
   - type: dropdown
     id: 3rd-party-application
     attributes:
-      label: Is this issue with a 3rd party application? 
+      label: Is this issue with a 3rd party application?
       description: If yes, please move discussions onto forums. We're unable to dedicate time to working on every single application that may be broken in macOS. Only file issues if you have a fix you'd like to add to our project
       multiple: true
       options:

.github/workflows/build-app-wxpython.yml

@@ -11,9 +11,9 @@ jobs:
     name: Build wxPython
     runs-on: x86_64_mojave
     env:
-      branch: ${{ github.event.ref }}
-      commiturl: ${{ github.event.head_commit.url }}
-      commitdate: ${{ github.event.head_commit.timestamp }}
+      branch: ${{ github.ref }}
+      commiturl: ${{ github.event.head_commit.url }}${{ github.event.release.html_url }}
+      commitdate: ${{ github.event.head_commit.timestamp }}${{ github.event.release.published_at }}
     steps:
       - uses: actions/checkout@v3
       - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}"

.github/workflows/build-app.yml

@@ -11,9 +11,9 @@ jobs:
     name: Build TUI
     runs-on: x86_64_mojave
     env:
-      branch: ${{ github.event.ref }}
-      commiturl: ${{ github.event.head_commit.url }}
-      commitdate: ${{ github.event.head_commit.timestamp }}
+      branch: ${{ github.ref }}
+      commiturl: ${{ github.event.head_commit.url }}${{ github.event.release.html_url }}
+      commitdate: ${{ github.event.head_commit.timestamp }}${{ github.event.release.published_at }}
     steps:
       - uses: actions/checkout@v3
       - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/python3 Build-Binary.command --build_tui --reset_binaries --branch "${{ env.branch }}" --commit "${{ env.commiturl }}" --commit_date "${{ env.commitdate }}"

.gitignore

@@ -30,3 +30,5 @@ __pycache__/
 /payloads/OpenCore-Legacy-Patcher
 /payloads/InstallAssistant.pkg.integrityDataV1
 /payloads.dmg
+/payloads/OpenCore-Legacy-Patcher-*.plist
+/payloads/KDK.dmg

Build-Binary.command

@@ -40,7 +40,7 @@ class create_binary:
 
     def parse_arguments(self):
         parser = argparse.ArgumentParser(description='Builds OpenCore-Patcher binary')
-        parser.add_argument('--build_tui', action='store_true', help='Builds TUI binary, if ommited GUI binary is built')
+        parser.add_argument('--build_tui', action='store_true', help='Builds TUI binary, if omitted GUI binary is built')
         parser.add_argument('--branch', type=str, help='Git branch name')
         parser.add_argument('--commit', type=str, help='Git commit URL')
         parser.add_argument('--commit_date', type=str, help='Git commit date')
@@ -56,7 +56,7 @@ class create_binary:
         # macOS (using Python installed by homebrew (e.g. brew))
         if f"/usr/local/opt/python@3." in sys.executable:
             print(f"\t* NOTE: home(brew) python3 detected; using (sys.exec_prefix, python_path) ==> {sys.exec_prefix, python_path}")
-            # - under brew, pip3 will install pyinstall at:
+            # - under brew, pip3 will install pyinstaller at:
             #   /usr/local/lib/python3.9/site-packages/pyinstaller
             #   and /usr/local/bin/pyinstaller stub to load and run.
 
@@ -77,7 +77,7 @@ class create_binary:
         self.download_resources()
         if not self.args.build_tui:
             # payloads.dmg is only needed for GUI builds
-            self.generate_paylods_dmg()
+            self.generate_payloads_dmg()
 
     def postflight_processes(self):
         print("- Starting postflight processes")
@@ -117,12 +117,20 @@ class create_binary:
             "AutoPkg-Assets.pkg",
             "AutoPkg-Assets.pkg.zip",
             "InstallAssistant.pkg",
+            "InstallAssistant.pkg.integrityDataV1",
+            "KDK.dmg",
         ]
         print("- Deleting extra binaries...")
         for file in Path("payloads").glob(pattern="*"):
-            if file.name in delete_files:
+            if file.name in delete_files or file.name.startswith("OpenCore-Legacy-Patcher"):
                 print(f"  - Deleting {file.name}")
                 file.unlink()
+            elif (Path(file) / Path("Contents/Resources/createinstallmedia")).exists():
+                print(f"  - Deleting {file}")
+                subprocess.run(["rm", "-rf", file])
+            elif Path(file).is_dir() and file.name == "Universal-Binaries":
+                print(f"  - Deleting {file}")
+                subprocess.run(["rm", "-rf", file])
 
     def download_resources(self):
         patcher_support_pkg_version = constants.Constants().patcher_support_pkg_version
@@ -171,7 +179,7 @@ class create_binary:
                 print(mv_output.stderr.decode('utf-8'))
                 raise Exception("Move failed")
 
-    def generate_paylods_dmg(self):
+    def generate_payloads_dmg(self):
         if Path("./payloads.dmg").exists():
             if self.args.reset_binaries:
                 print("  - Removing old payloads.dmg")

CHANGELOG.md

@@ -1,5 +1,141 @@
 # OpenCore Legacy Patcher changelog
 
+## 0.5.2
+- Ventura Specific Updates:
+  - Resolve AMD Polaris external display output support
+    - AMD Polaris and legacy GCN cannot be mixed in the same system
+      - Legacy GCN support will be prioritized when both are present
+      - AMD Polaris GPU can still be used headless for rendering with legacy GCN (ex. [macOS: Prefer External GPU option](https://support.apple.com/en-ca/HT208544))
+  - Disables unsupported `mediaanalysisd` on Metal 1 GPUs
+    - Alleviates kernel panic when on prolonged idle
+  - Automatically remove unsupported News Widgets on Ivy Bridge and Haswell iGPUs
+    - Alleviates Notification Centre Crashing
+  - Implement downloading from Kernel Debug Kit Backup Repository
+    - Alleviates issues with Apple blocking KDK downloads from OCLP (Ref: [Issue #1016](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1016))
+- Work-around MacPro6,1 and Lilu race condition
+  - Ensure Model and Board ID are set correctly before Lilu loads
+- Publish Application Version in UI header
+  - Allows for easier identification of version when reporting issues
+- Drop usage of `HW_BID` rerouting in boot.efi
+  - Patch out PlatformSupport.plist instead, allows for less maintenance overall
+- Add support for AMD GOP injection (AMDGOP.efi)
+  - For MXM iMacs and Mac Pros with GPU VBIOS lacking GOP support (ie. no UEFI output even after OC loads)
+- Hide OpenCore Boot Picker when waking from hibernation
+- Increment Binaries:
+  - AirPortBrcmFixup 2.1.6 - release
+  - AppleALC 1.7.6 - release
+  - CryptexFixup 1.0.1 - release
+  - DebugEnhancer 1.0.7 - release
+  - FeatureUnlock 1.1.0 - release
+  - OpenCorePkg 0.8.7 - rolling (fcb4e33)
+  - RestrictEvents 1.0.9 - release
+  - WhateverGreen 1.6.1 - release
+
+## 0.5.1
+- Add support for `APPLE SSD TS0128F/256F` SSDs in macOS Ventura
+  - ie. stock SSD found in MacBookAir6,x
+- Lax KDK N-1 logic to allow 1 minor version difference
+  - ex. Allow 13.0 KDK on 13.1
+- Clean out `/Library/Extensions` on KDK-less root patches
+  - Ensures old, incompatible kexts are not linked against
+  - Old kexts are relocated to `/Library/Relocated Extensions`
+- Add OpenCore Picker timeout selection
+- Partially resolve MacPro6,1 support
+  - Allows for install and usage of 2013 Mac Pros on Ventura
+  - Currently CPU Power Management is not supported
+
+## 0.5.0
+- Ventura Specific Updates:
+  - Switch boot.efi model patch to iMac18,1
+  - Resolve pre-Force Touch Trackpad support in Ventura
+  - Add Ventura-dropped Models:
+    - MacPro6,1
+    - Macmini7,1
+    - iMac16,x, iMac17,1
+    - MacBook9,1
+    - MacBookAir7,x
+    - MacBookPro11,4/5, MacBookPro12,1, MacBookPro13,x
+  - Add Ventura Software Catalog parsing
+  - Add Kernel Debug Kit checks to Ventura root patching
+  - Add USB map injection for dropped models
+  - Resolve Ethernet support on MacPro3,1-5,1
+  - Fix VMM patch set
+  - Allow dyld shared cache swapping on pre-Haswell
+  - Fix MouSSE/SSE4,2 emulation in macOS 13.0 Beta 3 (22A5295h)
+  - Graphics Acceleration for legacy Metal GPUs
+    - Intel: Ivy Bridge, Haswell, Broadwell and Skylake
+    - Nvidia: Kepler
+    - AMD: GCN 1 through 3
+    - AMD: Polaris (on pre-AVX2.0 systems)
+      - Boot in safe mode to avoid stock driver loading
+  - Raise SIP requirement to 0x803 for root patching
+  - Add Ventura Boot Picker icons
+  - Implement KDK-less root patching for Metal Intel and Nvidia GPUs
+    - AMD GCN will still require a KDK installed for patching
+  - Resolve OpenCL support for legacy Metal GPUs
+  - Implement Automatic Rosetta Cryptex installation on OS installs and updates
+    - Drops need for manual OS.dmg swapping on pre-Haswell
+  - Implement automatic Kernel Debug Kit downloader for systems requiring Boot/SysKC rebuilding
+    - ex. AMD GCN
+    - Relies on N-1 system for when matching KDK is not present
+  - Delete unused KDKs in `/Library/Developer/KDKs` during root patching
+  - Resolve Power Management support for Ivy Bridge and older
+  - Drop AMFI requirement for Nvidia Kepler and AMD GCN 1-3
+  - Resolve numerous AMD GCN 1-3 issues (ex. Photos.app, Screen Saver, etc.)
+  - Resolve dGPU support for MacBookPro13,3
+- Add work-around to Catalyst Buttons not responding on non-Metal in macOS Monterey
+- Re-export OpenCanopy icons to better support Haswell and newer Macs
+- Increment Binaries:
+  - OpenCorePkg 0.8.5 release
+  - Lilu 1.6.2 - release
+  - FeatureUnlock 1.0.9 release
+  - PatcherSupportPkg 0.7.1 - release
+  - BrcmPatchRAM 2.6.4 - release
+  - AutoPkgInstaller 1.0.1 - release
+  - CryptexFixup 1.0.1 - rolling (cf3a1e4)
+
+## 0.4.12
+
+## 0.4.11
+- Enable AppleMCEReporterDisabler whenever spoofing affected SMBIOS
+  - ie. iMacPro1,1, MacPro6,1 and MacPro7,1
+- Verify host's disk space before downloading macOS Installers
+- Remove duplicate OS builds in macOS downloader
+  - Avoids Apple's odd bug of publishing 2 different 12.5.1 products
+- Implement deeper macOS installer parsing
+  - Provides better version detection than Apple provides in .app
+- Ensure WhateverGreen is always installed on Mac Pro configurations
+- Resolve Safari 16 rendering in macOS 12.6
+- Increment Binaries:
+  - PatcherSupportPkg 0.5.4 - release
+- Add missing OpenCL resources for Nvidia GPUs
+
+## 0.4.10
+- Resolve Nvidia Kepler support in macOS 12.5 Beta 3 and newer
+- Increment Binaries:
+  - PatcherSupportPkg 0.5.2 - release
+
+## 0.4.9
+- Split Kepler userspace and kernel space patches
+  - Only installs kernel space patches on 12.5 and newer
+  - Avoids lock out of user, however breaks graphics acceleration
+  - Install 12.4 or older for full graphics acceleration on Kepler
+  - Reference: [macOS 12.5: Nvidia Kepler and WindowServer crashing #1004](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1004)
+
+## 0.4.8
+- Ensure Apple Silicon-specific installers are not listed
+  - ie. M2 specific build (21F2092)
+- Avoid adding OpenCore icon in boot picker if Windows bootloader on same partition
+- Add error-handling to corrupt/non-standard NVRAM variables
+- Add warning prompt when using 'Allow native models'
+  - Attempt to avoid misuse of option
+- Work-around `Failed to extract AssetData` during installer creation
+  - Apple bug, resolved by using CoW into a different directory than `/Applications`
+- Avoid listing beta installers in downloader
+- Warn about downloading macOS Ventura installers, unsupported by current patcher
+- Fix AppleGVA regression introduced in 0.4.6
+  - Applicable for Ivy Bridge-only systems
+
 ## 0.4.7
 - Fix crashing on defaults parsing
 
@@ -28,7 +164,6 @@
 - Deprecate TUI support
   - Users may still manually run from source for future builds
   - Binaries will no longer be provided on future release
-- Switch boot.efi model patch to iMac18,1
 
 ## 0.4.5
 - Fix AutoPatcher.pkg download on releases
@@ -77,11 +212,11 @@
   - Unknown whether this is a "bug" or intentional from Apple, affects native Macs with SIP disabled
 - Resolved non-Metal issues:
   - Catalyst crashing after 1200 seconds on non-Metal
-  - Automatic Light/Darkmode (credit @moosethegoose2213)
+  - Automatic Light/Dark mode (credit @moosethegoose2213)
   - Rim improvements
   - Trackpad swipe between pages
   - Cycle between windows
-  - Improve Display Prefpane Image
+  - Improve Display Preference pane Image
   - Defaults prefix change (`ASB_` -> `MORAEA_`, reopen non-Metal Settings to apply)
 - Increment Binaries:
   - PatcherSupportPkg 0.3.9 - release
@@ -114,9 +249,9 @@
   - Add Disk Highlighting during Build/Install for previously installed disks
   - Only list newest installers by default (reload to show older binaries)
 - Remove manual root unpatching
-  - Removed due to reliablity issues
+  - Removed due to reliability issues
   - `bless` based reversion still supported in Big Sur+
-- Remove Unoffical Mojave/Catalina Root Patching
+- Remove Unofficial Mojave/Catalina Root Patching
   - For TeraScale 2-based acceleration on older OSes, use v0.4.3
 - Simplify Binary options
   - Removes Online Patcher Variants
@@ -136,7 +271,7 @@
   - Control Centre Sliders
   - Shift/missing icons
   - Hardware Cursor
-    - Note cursor images will be static (ie. beachball)
+    - Note cursor images will be static (ie. beach ball)
   - Quicklook dismiss/expand
   - Keyboard Backlight
     - Drops reliance on LabTick
@@ -199,7 +334,7 @@
   - PatcherSupportPkg 0.2.9 - release
 - Re-add Content Caching support for VMM-spoofed systems
 - Add wxPython Based GUI
-  - Superceeds Obj-C Based GUI
+  - Supersedes Obj-C Based GUI
   - Both standard and offline builds provided
 - Allow optional spoofing on native Models
   - Recommended for systems that cannot update their firmware natively (ie. dead internal drive)
@@ -259,7 +394,7 @@
 - Allow for setting custom SIP values via TUI
 - Drop `CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE` requirement for root patching
   - Lowers default SIP Disabled value to 0xA03
-- Update Legacy GMUX patchset to latest Sierra Secuirty Update
+- Update Legacy GMUX patchset to latest Sierra security Update
   - [Source](https://github.com/HackintoshHD/mbp5x-instant-gpu-switching)
 - Fix non-Metal acceleration crashing on 12.0.1
   - Yes Apple adding a notch broke our accel patches
@@ -360,7 +495,7 @@
   - Applicable for BRCM2046 and BRCM2070 chipsets
 - Disable Library Validation allowing for AMFI usage
   - Remove reliance on amfi_get_out_of_my_way=1
-- Add Kepler Accleration Patches for Monterey Beta 7 and newer
+- Add Kepler Acceleration Patches for Monterey Beta 7 and newer
 - Add FirmwareFeature upgrading to all Models
   - Fixes Monterey Beta 7 installation issues
 - Add iMac7,1 USB map
@@ -424,7 +559,7 @@
   - RestrictEvents 1.0.3 rolling (3773ce2 - 06-20-2021)
   - SidecarFixup 1.0.2 rolling (2c29166 - 06-21-2021)
   - PatcherSupportPkg 0.0.18
-- Allow AirPlay to Mac support on Skylake - Coffeelake Macs
+- Allow AirPlay to Mac support on Skylake - Coffee Lake Macs
 
 ## 0.1.9
 
@@ -645,7 +780,7 @@
   - OpenCore 9cd61bb (0.6.8 rolling - 2021-03-27)
 - Add Mavericks and newer .app support
 - Refactor USB map building, fixes USB 3.0 displaying as USB 2.0
-- Fix blackscreen on MacBookPro9,1
+- Fix black screen on MacBookPro9,1
 - Update RestrictEvents with custom build (1.0.1)
   - Blocks `/usr/libexec/displaypolicyd` on MacBookPro9,1 to ensure smooth GPU switching
 - Add custom SD Card icon

README.md

@@ -44,8 +44,10 @@ To start using the project, please see our in-depth guide:
 
 ## Support
 
-To get aid with the patcher, we recommend joining the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN). We're actively there and is the quickest way to receive help.
+This project is offered on an AS-IS basis, we do not guarantee support for any issues that may arise. However, there is a community server with other passionate users and developers that can aid you:
 
+* [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN)
+  * Keep in mind that the Discord is maintained by the community, so we ask everyone to be respectful.
   * Please review our docs on [how to debug with OpenCore](https://dortania.github.io/OpenCore-Legacy-Patcher/DEBUG.html) to gather important information to help others with troubleshooting.
 
 ## Running from source

SOURCE.md

@@ -26,7 +26,7 @@ cd ~/Developer
 git clone https://github.com/dortania/OpenCore-Legacy-Patcher
 # Move into Project directory
 cd ./OpenCore-Legacy-Patcher
-# Install Python dependacies used by the project
+# Install Python dependencies used by the project
 pip3 install -r requirements.txt
 ```
 
@@ -34,10 +34,11 @@ If you have installation error, see following troubleshooting options:
 
 * Use Python 3.9
   * Currently our build server uses py3.9 for generating binaries used in releases
-* Use .whl snapshots for installing additional dependancies
+* Use .whl snapshots for installing additional dependencies
   * [wxPython 4.1.1 wheel for py3.9](https://files.pythonhosted.org/packages/2c/a8/7027e8ca3ba20dc2ed2acd556e31941cb44097ab87d6f81d646a79de4eab/wxPython-4.1.1-cp39-cp39-macosx_10_10_x86_64.whl)
   * [PyObjc 8.5 wheel for py3](https://files.pythonhosted.org/packages/69/3d/786f379dd669a078cf0c4a686e242c9b643071c23367bfbd3d9a7eb589ec/pyobjc-8.5-py3-none-any.whl)
   * [Requests 2.27.1 for py2/py3](https://files.pythonhosted.org/packages/2d/61/08076519c80041bc0ffa1a8af0cbd3bf3e2b62af10435d269a9d0f40564d/requests-2.27.1-py2.py3-none-any.whl)
+  * [pyinstaller 5.3 for py3](https://files.pythonhosted.org/packages/65/70/625e86e5a45cb975a9c32a10a721394d10771275c69207308b80bc6a758e/pyinstaller-5.3-py3-none-macosx_10_13_universal2.whl)
 
 
 ## Running OpenCore Legacy Patcher
@@ -87,4 +88,4 @@ open ./dist/
 
 Once done, you'll find the application generated at `./dist/OpenCore-Patcher.app`:
 
-![](./images/build-dist.png)
+![](./images/build-dist.png)

data/amfi_data.py

@@ -0,0 +1,56 @@
+# Copyright (C) 2022, Mykola Grymalyuk
+
+# Within AppleMobileFileIntegrity.kext, Apple has a bitmask-based boot-arg (ex. amfi=128)
+# Below information is from reversed values in 13.0 Beta 6's AppleMobileFileIntegrity.kext
+# Currently only 'amfi=3' has been used by Apple publicly
+# - 0x3 used in 11.0.1 dyld source:
+#   - https://github.com/apple-oss-distributions/dyld/blob/5c9192436bb195e7a8fe61f22a229ee3d30d8222/testing/test-cases/kernel-hello-world.dtest/main.c#L2
+
+class apple_mobile_file_integrity:
+    # Names set are solely for readability
+    # Internal names are unknown
+    amfi_values = {
+        "AMFI_ALLOW_TASK_FOR_PID":      False,  # 0x1   - Allow Task for PID (alt. amfi_unrestrict_task_for_pid=0x1)
+        "AMFI_ALLOW_INVALID_SIGNATURE": False,  # 0x2   - Reduce sig enforcement (alt. amfi_allow_any_signature=0x1)
+        "AMFI_LV_ENFORCE_THIRD_PARTY":  False,  # 0x4   - Don't mark external binaries as platform binaries
+        "AMFI_UNKNOWN_1":               False,  # 0x8
+        "AMFI_UNKNOWN_2":               False,  # 0x10
+        "AMFI_UNKNOWN_3":               False,  # 0x20
+        "AMFI_UNKNOWN_4":               False,  # 0x40
+        "AMFI_ALLOW_EVERYTHING":        False,  # 0x80  - Disable sig enforcement and Library Validation (alt. amfi_get_out_of_my_way=0x1)
+    },
+
+# Internally within AMFI.kext, Apple references 0x2 and 0x80 as both 'Disable signature enforcement'
+# However 0x80 is a higher privilege than 0x2, and breaks TCC support in OS (ex. Camera, Microphone, etc prompts)
+
+# Supported boot-args within AMFI.kext, last compared against 13.0 Beta 6
+#
+#   Within _initializeAppleMobileFileIntegrity():
+#     - amfi_unrestrict_task_for_pid=0x1
+#     - amfi_dev_mode_policy=0x1
+#     - amfi_allow_any_signature=0x1
+#     - amfi_get_out_of_my_way=0x1
+#     - amfi_unrestricted_local_signing=0x1
+#     - pmap_cs_unrestricted_local_signing=0x1
+#     - amfi_ready_to_roll=0x1
+#     - cs_enforcement_disable=0x1
+#
+#   Within AMFIInitializeLocalSigningPublicKey():
+#     - -restore
+#
+#   Within macOSPolicyConfigurationInit():
+#     - amfi_force_policy=0x1
+#     - amfi_block_unsigned_code=0x1
+#     - amfi_force_cs_kill=0x1
+#     - amfi_hsp_disable=0x1
+#     - amfi_hsp_logging=0x1
+#     - amfi_allow_bni_as_platform=0x1
+#     - amfi_allow_non_platform=0x1
+#     - amfi_prevent_old_entitled_platform_binaries=0x1
+#     - amfi_allow_only_tc=0x1
+#     - amfi_allow_only_tc_override=0x1
+#
+#   Within configurationSettingsInit()
+#     - amfi_enforce_launch_constraints=0x1
+#     - amfi_allow_3p_launch_constraints=0x1
+#     - BATS_TESTPLAN_ID="Custom Team ID"

data/example_data.py

@@ -21,6 +21,7 @@ class MacBook:
         cpu=device_probe.CPU(
             name="Intel(R) Core(TM)2 Duo CPU     P8600  @ 2.40GHz",
             flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -42,7 +43,8 @@ class MacBookPro:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17201, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x1)/Pci(0x0,0x0)"),
         cpu=device_probe.CPU(
             name='Intel(R) Core(TM) i5-3210M CPU @ 2.50GHz',
-            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'EST', 'TM2', 'SSSE3', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C']
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'EST', 'TM2', 'SSSE3', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -67,7 +69,8 @@ class MacBookPro:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17312, class_code=163840, name='ARPT', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP03@1c0002/ARPT@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x2)/Pci(0x0,0x0)'),
         cpu=device_probe.CPU(
             name='Intel(R) Core(TM) i5-4258U CPU @ 2.40GHz',
-            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C']
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=[],
         ),
         oclp_version='0.4.2',
         opencore_version='DBG-077-2022-01-10',
@@ -75,6 +78,48 @@ class MacBookPro:
         third_party_sata_ssd=False
     )
 
+    MacBookPro133_Stock = device_probe.Computer(
+        real_model='MacBookPro13,3',
+        real_board_id='Mac-A5C67F76ED83108C',
+        reported_model='MacBookPro13,3',
+        reported_board_id='Mac-A5C67F76ED83108C',
+        build_model='MacBookPro13,3',
+        gpus=[
+            device_probe.Intel(vendor_id=32902, device_id=6427, class_code=196608, name='IGPU', model='Intel HD Graphics 530', acpi_path='IOACPIPlane:/_SB/PCI0@0/IGPU@20000', pci_path='PciRoot(0x0)/Pci(0x2,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.AMD(vendor_id=4098, device_id=26607, class_code=196608, name='GFX0', model='AMD Radeon Pro 455', acpi_path='IOACPIPlane:/_SB/PCI0@0/PEG0@10000/GFX0@0', pci_path='PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        igpu=device_probe.Intel(vendor_id=32902, device_id=6427, class_code=196608, name='IGPU', model='Intel HD Graphics 530', acpi_path='IOACPIPlane:/_SB/PCI0@0/IGPU@20000', pci_path='PciRoot(0x0)/Pci(0x2,0x0)', disable_metal=False, force_compatible=False),
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=26607, class_code=196608, name='GFX0', model='AMD Radeon Pro 455', acpi_path='IOACPIPlane:/_SB/PCI0@0/PEG0@10000/GFX0@0', pci_path='PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False),
+        storage=[
+            device_probe.NVMeController(vendor_id=5197, device_id=43012, class_code=67586, name='SSD0', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP17@1b0000/SSD0@0', pci_path='PciRoot(0x0)/Pci(0x1b,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False, aspm=258)
+        ],
+        usb_controllers=[
+            device_probe.XHCIController(vendor_id=32902, device_id=41263, class_code=787248, name='XHC1', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/XHC1@140000', pci_path='PciRoot(0x0)/Pci(0x14,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.XHCIController(vendor_id=32902, device_id=5588, class_code=787248, name='XHC3', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/PEG2@10002/UPSB@0/DSB2@20000/XHC3@0', pci_path='PciRoot(0x0)/Pci(0x1,0x2)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.XHCIController(vendor_id=32902, device_id=5588, class_code=787248, name='XHC2', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/PEG1@10001/UPSB@0/DSB2@20000/XHC2@0', pci_path='PciRoot(0x0)/Pci(0x1,0x1)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        sdxc_controller=[],
+        ethernet=[],
+        wifi=device_probe.Broadcom(vendor_id=5348, device_id=17338, class_code=163840, name='ARPT', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP01@1c0000/ARPT@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False),
+        cpu=device_probe.CPU(
+            name='Intel(R) Core(TM) i7-6820HQ CPU @ 2.70GHz',
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=[]
+        ),
+        oclp_version='0.5.0',
+        opencore_version=None,
+        opencore_path=None,
+        bluetooth_chipset=None,
+        ambient_light_sensor=False,
+        third_party_sata_ssd=False,
+        secure_boot_model='x86legacyap',
+        secure_boot_policy=0,
+        oclp_sys_version=None,
+        oclp_sys_date=None,
+        oclp_sys_url=None,
+        firmware_vendor='Apple'
+    )
+
     MacBookPro141_SSD_Upgrade = device_probe.Computer(
         real_model='MacBookPro14,1',
         real_board_id='Mac-B4831CEBD52A0C4C',
@@ -95,7 +140,8 @@ class MacBookPro:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17315, class_code=163840, name='ARPT', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP09@1d0000/ARPT@0', pci_path='PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)'),
         cpu=device_probe.CPU(
             name='Intel(R) Core(TM) i5-7360U CPU @ 2.30GHz',
-            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C']
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=[],
         ), oclp_version='0.4.1',
         opencore_version=None,
         bluetooth_chipset=None,
@@ -115,6 +161,7 @@ class MacBookPro:
         cpu=device_probe.CPU(
             name="Apple M1",
             flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTSE64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "AES", "SEGLIM64"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -122,6 +169,144 @@ class MacBookPro:
 
 class Macmini:
 
+    Macmini52_Stock = device_probe.Computer(
+        real_model='Macmini5,2',
+        real_board_id='Mac-4BC72D62AD45599E',
+        reported_model='Macmini5,2',
+        reported_board_id='Mac-4BC72D62AD45599E',
+        build_model='Macmini5,2',
+        gpus=[
+            device_probe.Intel(vendor_id=32902, device_id=294, class_code=229376, name='IGPU', model='Intel HD Graphics 3000', acpi_path='IOACPIPlane:/_SB/PCI0@0/IGPU@20000', pci_path='PciRoot(0x0)/Pci(0x2,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.AMD(vendor_id=4098, device_id=26433, class_code=196608, name='GFX0', model='AMD Radeon HD 6630M', acpi_path='IOACPIPlane:/_SB/PCI0@0/P0P2@10000/GFX0@0', pci_path='PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False)],
+        igpu=device_probe.Intel(vendor_id=32902, device_id=294, class_code=229376, name='IGPU', model='Intel HD Graphics 3000', acpi_path='IOACPIPlane:/_SB/PCI0@0/IGPU@20000', pci_path='PciRoot(0x0)/Pci(0x2,0x0)', disable_metal=False, force_compatible=False),
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=26433, class_code=196608, name='GFX0', model='AMD Radeon HD 6630M', acpi_path='IOACPIPlane:/_SB/PCI0@0/P0P2@10000/GFX0@0', pci_path='PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False),
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=7171, class_code=67073, name='SATA', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/SATA@1f0002', pci_path='PciRoot(0x0)/Pci(0x1f,0x2)', disable_metal=False, force_compatible=False)
+        ],
+        usb_controllers=[
+            device_probe.EHCIController(vendor_id=32902, device_id=7213, class_code=787232, name='EHC2', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/EHC2@1a0007', pci_path='PciRoot(0x0)/Pci(0x1a,0x7)', disable_metal=False, force_compatible=False),
+            device_probe.EHCIController(vendor_id=32902, device_id=7206, class_code=787232, name='EHC1', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/EHC1@1d0007', pci_path='PciRoot(0x0)/Pci(0x1d,0x7)', disable_metal=False, force_compatible=False),
+            device_probe.UHCIController(vendor_id=32902, device_id=7212, class_code=787200, name='UHC5', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/UHC5@1a0000', pci_path='PciRoot(0x0)/Pci(0x1a,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.UHCIController(vendor_id=32902, device_id=7207, class_code=787200, name='UHC1', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/UHC1@1d0000', pci_path='PciRoot(0x0)/Pci(0x1d,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        sdxc_controller=[
+            device_probe.SDXCController(vendor_id=5348, device_id=5820, class_code=525569, name='SDXC', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP01@1c0000/SDXC@1', pci_path='PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x1)', disable_metal=False, force_compatible=False)
+        ],
+        ethernet=[
+            device_probe.BroadcomEthernet(vendor_id=5348, device_id=5812, class_code=131072, name='GIGE', model='Broadcom 57765-B0', acpi_path='IOACPIPlane:/_SB/PCI0@0/RP01@1c0000/GIGE@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        wifi=device_probe.Broadcom(vendor_id=5348, device_id=17201, class_code=163840, name='ARPT', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP02@1c0001/ARPT@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x1)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False),
+        cpu=device_probe.CPU(
+            name='Intel(R) Core(TM) i5-2520M CPU @ 2.50GHz',
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'TSCTMR', 'AVX1.0'],
+            leafs=['']
+        ),
+        oclp_version='0.5.0',
+        opencore_version='REL-083-2022-08-01',
+        opencore_path='PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/HD(1,GPT,D011D782-7E9A-459B-905D-9DA8D6494A53,0x28,0x64000)/EFI\\OC\\OpenCore.efi',
+        bluetooth_chipset='BRCM20702 Hub',
+        ambient_light_sensor=False,
+        third_party_sata_ssd=True,
+        secure_boot_model='x86legacyap',
+        secure_boot_policy=0,
+        oclp_sys_version='v0.4.11',
+        oclp_sys_date='October 06, 2022 @ 10:06:53',
+        oclp_sys_url=None,
+        firmware_vendor='Apple',
+        rosetta_active=False
+    )
+
+    Macmini61_Stock = device_probe.Computer(
+        real_model='Macmini6,1',
+        real_board_id='Mac-031AEE4D24BFF0B1',
+        reported_model='Macmini6,1',
+        reported_board_id='Mac-031AEE4D24BFF0B1',
+        build_model='Macmini6,1',
+        gpus=[
+            device_probe.Intel(vendor_id=32902, device_id=358, class_code=196608, name='IGPU', model='Intel HD Graphics 4000', acpi_path='IOACPIPlane:/_SB/PCI0@0/IGPU@20000', pci_path='PciRoot(0x0)/Pci(0x2,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        igpu=device_probe.Intel(vendor_id=32902, device_id=358, class_code=196608, name='IGPU', model='Intel HD Graphics 4000', acpi_path='IOACPIPlane:/_SB/PCI0@0/IGPU@20000', pci_path='PciRoot(0x0)/Pci(0x2,0x0)', disable_metal=False, force_compatible=False),
+        dgpu=None,
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=7683, class_code=67073, name='SATA', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/SATA@1f0002', pci_path='PciRoot(0x0)/Pci(0x1f,0x2)', disable_metal=False, force_compatible=False)
+        ],
+        usb_controllers=[
+            device_probe.XHCIController(vendor_id=32902, device_id=7729, class_code=787248, name='XHC1', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/XHC1@140000', pci_path='PciRoot(0x0)/Pci(0x14,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.EHCIController(vendor_id=32902, device_id=7725, class_code=787232, name='EHC2', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/EHC2@1a0000', pci_path='PciRoot(0x0)/Pci(0x1a,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.EHCIController(vendor_id=32902, device_id=7718, class_code=787232, name='EHC1', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/EHC1@1d0000', pci_path='PciRoot(0x0)/Pci(0x1d,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        sdxc_controller=[
+            device_probe.SDXCController(vendor_id=5348, device_id=5820, class_code=525569, name='SDXC', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP01@1c0000/SDXC@1', pci_path='PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x1)', disable_metal=False, force_compatible=False)
+        ],
+        ethernet=[
+            device_probe.BroadcomEthernet(vendor_id=5348, device_id=5766, class_code=131072, name='GIGE', model='Broadcom 57766-A1', acpi_path='IOACPIPlane:/_SB/PCI0@0/RP01@1c0000/GIGE@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        wifi=device_probe.Broadcom(vendor_id=5348, device_id=17201, class_code=163840, name='ARPT', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP02@1c0001/ARPT@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x1)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False
+        ),
+        cpu=device_probe.CPU(
+            name='Intel(R) Core(TM) i5-3210M CPU @ 2.50GHz',
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'EST', 'TM2', 'SSSE3', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=['RDWRFSGS', 'SMEP', 'ERMS', 'MDCLEAR', 'IBRS', 'STIBP', 'L1DF', 'SSBD']
+        ),
+        oclp_version='0.5.0',
+        opencore_version='REL-083-2022-08-01',
+        opencore_path='PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/HD(1,GPT,B46958E3-7EB7-40C2-BB3A-2C88A0856DC7,0x28,0x64000)/EFI\\OC\\OpenCore.efi',
+        bluetooth_chipset='BRCM20702 Hub',
+        ambient_light_sensor=False,
+        third_party_sata_ssd=True,
+        secure_boot_model='x86legacyap',
+        secure_boot_policy=0,
+        oclp_sys_version='v0.5.0',
+        oclp_sys_date='October 04, 2022 @ 12:24:50',
+        oclp_sys_url='',
+        firmware_vendor='Apple',
+        rosetta_active=False
+    )
+
+    Macmini71_Stock = device_probe.Computer(
+        real_model='Macmini7,1',
+        real_board_id='Mac-35C5E08120C7EEAF',
+        reported_model='Macmini7,1',
+        reported_board_id='Mac-35C5E08120C7EEAF',
+        build_model='Macmini7,1',
+        gpus=[
+            device_probe.Intel(vendor_id=32902, device_id=2606, class_code=196608, name='IGPU', model='Intel Iris', acpi_path='IOACPIPlane:/_SB/PCI0@0/IGPU@20000', pci_path='PciRoot(0x0)/Pci(0x2,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        igpu=device_probe.Intel(vendor_id=32902, device_id=2606, class_code=196608, name='IGPU', model='Intel Iris', acpi_path='IOACPIPlane:/_SB/PCI0@0/IGPU@20000', pci_path='PciRoot(0x0)/Pci(0x2,0x0)', disable_metal=False, force_compatible=False),
+        dgpu=None,
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=39939, class_code=67073, name='SATA', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/SATA@1f0002', pci_path='PciRoot(0x0)/Pci(0x1f,0x2)', disable_metal=False, force_compatible=False)
+        ],
+        usb_controllers=[
+            device_probe.XHCIController(vendor_id=32902, device_id=39985, class_code=787248, name='XHC1', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/XHC1@140000', pci_path='PciRoot(0x0)/Pci(0x14,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        sdxc_controller=[
+            device_probe.SDXCController(vendor_id=5348, device_id=5820, class_code=525569, name='SDXC', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP04@1c0003/SDXC@1', pci_path='PciRoot(0x0)/Pci(0x1c,0x3)/Pci(0x0,0x1)', disable_metal=False, force_compatible=False)
+        ],
+        ethernet=[
+            device_probe.BroadcomEthernet(vendor_id=5348, device_id=5766, class_code=131072, name='GIGE', model='Broadcom 57766-A1', acpi_path='IOACPIPlane:/_SB/PCI0@0/RP04@1c0003/GIGE@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x3)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        wifi=device_probe.Broadcom(vendor_id=5348, device_id=17312, class_code=163840, name='ARPT', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP03@1c0002/ARPT@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x2)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False),
+        cpu=device_probe.CPU(
+            name='Intel(R) Core(TM) i5-4278U CPU @ 2.60GHz',
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=['RDWRFSGS', 'TSC_THREAD_OFFSET', 'BMI1', 'AVX2', 'SMEP', 'BMI2', 'ERMS', 'INVPCID', 'FPU_CSDS', 'MDCLEAR', 'IBRS', 'STIBP', 'L1DF', 'SSBD']
+        ),
+        oclp_version='0.5.0',
+        opencore_version='REL-083-2022-08-01',
+        opencore_path='PciRoot(0x0)/Pci(0x1F,0x2)/Sata(0x0,0x0,0x0)/HD(1,GPT,293E8ABF-B98C-4258-A811-04464BCA90EF,0x28,0x64000)/EFI\\OC\\OpenCore.efi',
+        bluetooth_chipset='BRCM20702 Hub',
+        ambient_light_sensor=False,
+        third_party_sata_ssd=True,
+        secure_boot_model='x86legacyap',
+        secure_boot_policy=0,
+        oclp_sys_version='v0.5.0',
+        oclp_sys_date='October 04, 2022 @ 12:04:48',
+        oclp_sys_url='https://github.com/dortania/OpenCore-Legacy-Patcher/commit/daf28a62effb2ce06a71cb5961c9d0c79d72c16b',
+        firmware_vendor='Apple',
+        rosetta_active=False
+    )
+
     Macmini81_Stock = device_probe.Computer(
         real_model="Macmini8,1",
         real_board_id="Mac-7BA5B2DFE22DDD8C",
@@ -134,7 +319,8 @@ class Macmini:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17508, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)"),
         cpu=device_probe.CPU(
             name="Intel(R) Core(TM) i7-8700B CPU @ 3.20GHz",
-            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "FMA", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "x2APIC", "MOVBE", "POPCNT", "AES", "PCID", "XSAVE", "OSXSAVE", "SEGLIM64", "TSCTMR", "AVX1.0", "RDRAND", "F16C"]
+            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "FMA", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "x2APIC", "MOVBE", "POPCNT", "AES", "PCID", "XSAVE", "OSXSAVE", "SEGLIM64", "TSCTMR", "AVX1.0", "RDRAND", "F16C"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None
@@ -155,7 +341,8 @@ class Macmini:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17445, class_code=163840, name="wlan", model=None, pci_path=""),
         cpu=device_probe.CPU(
             name="Apple M1",
-            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTSE64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "AES", "SEGLIM64"]
+            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTSE64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "AES", "SEGLIM64"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None
@@ -180,7 +367,8 @@ class iMac:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17192, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x4)/Pci(0x0,0x0)"),
         cpu=device_probe.CPU(
             name="Intel(R) Core(TM)2 Duo CPU     E8135  @ 2.40GHz",
-            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"]
+            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -203,7 +391,8 @@ class iMac:
         wifi=device_probe.Atheros(vendor_id=5772, device_id=42, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x1)/Pci(0x0,0x0)"),
         cpu=device_probe.CPU(
             name="Intel(R) Core(TM) i3 CPU         540  @ 3.07GHz",
-            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT", "PCID"]
+            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT", "PCID"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -226,7 +415,8 @@ class iMac:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17338, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x1)/Pci(0x0,0x0)"),
         cpu=device_probe.CPU(
             name="Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz",
-            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "xAPIC", "POPCNT", "AES", "PCID", "XSAVE", "OSXSAVE", "TSCTMR", "AVX1.0"]
+            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "xAPIC", "POPCNT", "AES", "PCID", "XSAVE", "OSXSAVE", "TSCTMR", "AVX1.0"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -252,7 +442,8 @@ class iMac:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17201, class_code=163840, name='ARPT', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP02@1c0001/ARPT@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x1)/Pci(0x0,0x0)'),
         cpu=device_probe.CPU(
             name='Intel(R) Core(TM) i7-2600 CPU @ 3.40GHz',
-            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'TSCTMR', 'AVX1.0']
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'TSCTMR', 'AVX1.0'],
+            leafs=[],
         ),
         oclp_version='0.3.3',
         opencore_version=None,
@@ -278,7 +469,8 @@ class iMac:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17312, class_code=163840, name='ARPT', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1c,0x2)/Pci(0x0,0x0)'),
         cpu=device_probe.CPU(
             name='Intel(R) Core(TM) i5-4690 CPU @ 3.50GHz',
-            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C']
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -305,7 +497,8 @@ class iMac:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17508, class_code=163840, name='ARPT', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/RP01@1c0000/ARPT@0', pci_path='PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)'),
         cpu=device_probe.CPU(
             name='Intel(R) Core(TM) i5-10500 CPU @ 3.10GHz',
-            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C']
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'FMA', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'PCID', 'XSAVE', 'OSXSAVE', 'SEGLIM64', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -333,6 +526,7 @@ class MacPro:
         cpu=device_probe.CPU(
             name="Intel(R) Xeon(R) CPU           X5482  @ 3.20GHz",
             flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -358,6 +552,7 @@ class MacPro:
         cpu=device_probe.CPU(
             name="Intel(R) Xeon(R) CPU           X5482  @ 3.20GHz",
             flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -383,6 +578,7 @@ class MacPro:
         cpu=device_probe.CPU(
             name="Intel(R) Xeon(R) CPU           X5482  @ 3.20GHz",
             flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -406,6 +602,7 @@ class MacPro:
         cpu=device_probe.CPU(
             name="Intel(R) Xeon(R) CPU           X5482  @ 3.20GHz",
             flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None,
@@ -424,7 +621,8 @@ class MacPro:
         wifi=device_probe.Atheros(vendor_id=5772, device_id=48, class_code=163840, name="PXS4", model=None, pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)/Pci(0x4,0x0)/Pci(0x0,0x0)"),
         cpu=device_probe.CPU(
             name="Intel(R) Xeon(R) CPU           W3520  @ 2.67GHz",
-            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT"]
+            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT"],
+            leafs=[],
         ),
         oclp_version=None,
         opencore_version=None
@@ -447,7 +645,8 @@ class MacPro:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17312, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)/Pci(0x4,0x0)/Pci(0x0,0x0)"),
         cpu=device_probe.CPU(
             name="Intel(R) Xeon(R) CPU           W3520  @ 2.67GHz",
-            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT"]
+            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT"],
+            leafs=[],
         ),
         oclp_version="0.2.5",
         opencore_version="REL-071-2021-07-02"
@@ -470,7 +669,8 @@ class MacPro:
         wifi=device_probe.Broadcom(vendor_id=5348, device_id=17312, class_code=163840, name="PXS4", model=None, pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)/Pci(0x4,0x0)/Pci(0x0,0x0)"),
         cpu=device_probe.CPU(
             name="Intel(R) Xeon(R) CPU           X5670  @ 2.93GHz",
-            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT", "AES", "PCID"]
+            flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "PCLMULQDQ", "DTES64", "MON", "DSCPL", "VMX", "SMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT", "AES", "PCID"],
+            leafs=[],
         ),
         oclp_version="0.2.5",
         opencore_version="REL-071-2021-07-02"
@@ -508,7 +708,8 @@ class MacPro:
         wifi=None,
         cpu=device_probe.CPU(
             name='Intel(R) Xeon(R) CPU           X5670  @ 2.93GHz',
-            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'POPCNT', 'AES', 'PCID']
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'DS', 'ACPI', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'TM', 'PBE', 'SSE3', 'PCLMULQDQ', 'DTES64', 'MON', 'DSCPL', 'VMX', 'SMX', 'EST', 'TM2', 'SSSE3', 'CX16', 'TPR', 'PDCM', 'SSE4.1', 'SSE4.2', 'POPCNT', 'AES', 'PCID'],
+            leafs=[],
         ),
         oclp_version='0.4.6',
         opencore_version='REL-080-2022-04-18',
@@ -521,4 +722,57 @@ class MacPro:
         oclp_sys_version='v0.4.6',
         oclp_sys_date='September 03, 2019 @ 23:13:43',
         firmware_vendor='Apple'
+    )
+
+
+class Hackintosh:
+
+    QEMU_Virtual_Machine_GT710 = device_probe.Computer(
+        real_model='iMac14,4',
+        real_board_id='Mac-81E3E92DD6088272',
+        reported_model='iMac14,4',
+        reported_board_id='Mac-81E3E92DD6088272',
+        build_model=None,
+        gpus=[
+            device_probe.NVIDIA(vendor_id=4318, device_id=4747, class_code=196608, name='GFX0', model='NVIDIA GeForce GT 710', acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False)
+        ],
+        igpu=None,
+        dgpu=device_probe.NVIDIA(vendor_id=4318, device_id=4747, class_code=196608, name='GFX0', model='NVIDIA GeForce GT 710', acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False),
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=10530, class_code=67073, name='pci8086,2922', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1f,0x2)', disable_metal=False, force_compatible=False),
+            device_probe.SATAController(vendor_id=32902, device_id=10530, class_code=67073, name='pci8086,2922', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1e,0x0)/Pci(0x1,0x0)/Pci(0x7,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.NVMeController(vendor_id=5197, device_id=43016, class_code=67586, name='pci144d,a808', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1c,0x1)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False, aspm=0)
+        ],
+        usb_controllers=[
+            device_probe.XHCIController(vendor_id=6945, device_id=8514, class_code=787248, name='pci1b21,2142', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1c,0x2)/Pci(0x0,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.EHCIController(vendor_id=32902, device_id=10556, class_code=787232, name='pci8086,293c', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1a,0x7)', disable_metal=False, force_compatible=False),
+            device_probe.EHCIController(vendor_id=32902, device_id=10554, class_code=787232, name='pci8086,293a', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1d,0x7)', disable_metal=False, force_compatible=False),
+            device_probe.UHCIController(vendor_id=32902, device_id=10551, class_code=787200, name='SD0', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/SD0@1a0000', pci_path='PciRoot(0x0)/Pci(0x1a,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.UHCIController(vendor_id=32902, device_id=10552, class_code=787200, name='pci8086,2938', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1a,0x1)', disable_metal=False, force_compatible=False),
+            device_probe.UHCIController(vendor_id=32902, device_id=10553, class_code=787200, name='pci8086,2939', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1a,0x2)', disable_metal=False, force_compatible=False),
+            device_probe.UHCIController(vendor_id=32902, device_id=10548, class_code=787200, name='SE8', model=None, acpi_path='IOACPIPlane:/_SB/PCI0@0/SE8@1d0000', pci_path='PciRoot(0x0)/Pci(0x1d,0x0)', disable_metal=False, force_compatible=False),
+            device_probe.UHCIController(vendor_id=32902, device_id=10549, class_code=787200, name='pci8086,2935', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1d,0x1)', disable_metal=False, force_compatible=False),
+            device_probe.UHCIController(vendor_id=32902, device_id=10550, class_code=787200, name='pci8086,2936', model=None, acpi_path=None, pci_path='PciRoot(0x0)/Pci(0x1d,0x2)', disable_metal=False, force_compatible=False)
+        ],
+        sdxc_controller=[],
+        ethernet=[],
+        wifi=None,
+        cpu=device_probe.CPU(
+            name='Intel(R) Core(TM) i9-7920X CPU @ 2.90GHz',
+            flags=['FPU', 'VME', 'DE', 'PSE', 'TSC', 'MSR', 'PAE', 'MCE', 'CX8', 'APIC', 'SEP', 'MTRR', 'PGE', 'MCA', 'CMOV', 'PAT', 'PSE36', 'CLFSH', 'MMX', 'FXSR', 'SSE', 'SSE2', 'SS', 'HTT', 'SSE3', 'PCLMULQDQ', 'VMX', 'SSSE3', 'FMA', 'CX16', 'PDCM', 'SSE4.1', 'SSE4.2', 'x2APIC', 'MOVBE', 'POPCNT', 'AES', 'VMM', 'PCID', 'XSAVE', 'OSXSAVE', 'TSCTMR', 'AVX1.0', 'RDRAND', 'F16C'],
+            leafs=['RDWRFSGS', 'TSC_THREAD_OFFSET', 'BMI1', 'HLE', 'AVX2', 'SMEP', 'BMI2', 'ERMS', 'INVPCID', 'RTM', 'MPX', 'AVX512F', 'AVX512DQ', 'RDSEED', 'ADX', 'SMAP', 'CLFSOPT', 'CLWB', 'AVX512CD', 'AVX512BW', 'AVX512VL', 'UMIP', 'MDCLEAR', 'IBRS', 'STIBP', 'ACAPMSR', 'SSBD']
+        ),
+        oclp_version=None,
+        opencore_version='REL-083-2022-08-01',
+        opencore_path=None,
+        bluetooth_chipset=None,
+        ambient_light_sensor=False,
+        third_party_sata_ssd=False,
+        secure_boot_model='x86legacyap',
+        secure_boot_policy=0,
+        oclp_sys_version=None,
+        oclp_sys_date=None,
+        oclp_sys_url=None,
+        firmware_vendor='EDK II',
+        rosetta_active=False
     )

data/mirror_data.py

@@ -1,4 +1,4 @@
-# Mirrors of Apple's InstallAssistant.ppkg
+# Mirrors of Apple's InstallAssistant.pkg
 # Currently only listing important Installers no longer on Apple's servers
 
 Install_macOS_Big_Sur_11_2_3 = {

data/model_array.py

@@ -8,6 +8,7 @@ SupportedSMBIOS = [
     "MacBook6,1",
     "MacBook7,1",
     "MacBook8,1",
+    "MacBook9,1",
     # MacBook Air
     "MacBookAir2,1",
     "MacBookAir3,1",
@@ -18,6 +19,8 @@ SupportedSMBIOS = [
     "MacBookAir5,2",
     "MacBookAir6,1",
     "MacBookAir6,2",
+    "MacBookAir7,1",
+    "MacBookAir7,2",
     # MacBook Pro
     "MacBookPro4,1",
     "MacBookPro5,1",
@@ -38,6 +41,12 @@ SupportedSMBIOS = [
     "MacBookPro11,1",
     "MacBookPro11,2",
     "MacBookPro11,3",
+    "MacBookPro11,4",
+    "MacBookPro11,5",
+    "MacBookPro12,1",
+    "MacBookPro13,1",
+    "MacBookPro13,2",
+    "MacBookPro13,3",
     # Mac Mini
     "Macmini3,1",
     "Macmini4,1",
@@ -46,6 +55,7 @@ SupportedSMBIOS = [
     "Macmini5,3",
     "Macmini6,1",
     "Macmini6,2",
+    "Macmini7,1",
     # iMac
     "iMac7,1",
     "iMac8,1",
@@ -64,10 +74,14 @@ SupportedSMBIOS = [
     "iMac14,3",
     "iMac14,4",
     "iMac15,1",
+    "iMac16,1",
+    "iMac16,2",
+    "iMac17,1",
     # Mac Pro
     "MacPro3,1",
     "MacPro4,1",
     "MacPro5,1",
+    "MacPro6,1",
     # Xserve
     "Xserve2,1",
     "Xserve3,1",
@@ -119,21 +133,45 @@ LegacyAudio = [
 # GPU
 
 ModernGPU = [
+    "MacBook8,1", # Intel 6000
+    "MacBook9,1", # Intel Skylake
     "MacBookAir5,1",  # Intel 4000
     "MacBookAir5,2",  # Intel 4000
+    "MacBookAir6,1",  # Intel 5000
+    "MacBookAir6,2",  # Intel 5000
+    "MacBookAir7,1",  # Intel 6000
+    "MacBookAir7,2",  # Intel 6000
     "MacBookPro9,1",  # Intel 4000 + Nvidia 650M
     "MacBookPro9,2",  # Intel 4000
     "MacBookPro10,1",  # Intel 4000 + Nvidia 650M
     "MacBookPro10,2",  # Intel 4000
+    "MacBookPro11,1",  # Intel 5000
+    "MacBookPro11,2",  # Intel 5000
     "MacBookPro11,3",  # Intel 5000 + Nvidia Kepler
+    "MacBookPro11,4",  # Intel 5000
+    "MacBookPro11,5",  # Intel 5000 + GCN 1
+    "MacBookPro12,1",  # Intel 6000
+    "MacBookPro13,1",  # Intel Skylake
+    "MacBookPro13,2",  # Intel Skylake
+    "MacBookPro13,3",  # Intel Skylake
     "Macmini6,1",  # Intel 4000
     "Macmini6,2",  # Intel 4000
+    "Macmini7,1",  # Intel 5000
     "iMac13,1",  # Intel 4000
     "iMac13,2",  # Intel 4000 + Nvidia Kepler
     "iMac13,3",  # Intel 4000
     "iMac14,1",  # Intel 5000 + Nvidia Kepler
     "iMac14,2",  # Intel 5000 + Nvidia Kepler
     "iMac14,3",  # Intel 5000 + Nvidia Kepler
+    "iMac14,4",  # Intel 5000
+    "iMac15,1",  # Intel 5000 + GCN 1
+    "iMac16,1",  # Intel 6000
+    "iMac16,2",  # Intel 6000
+    "iMac17,1",  # Intel Skylake + GCN1
+    "MacPro3,1", # Lacks AVX2.0
+    "MacPro4,1", # Lacks AVX2.0
+    "MacPro5,1", # Lacks AVX2.0
+    "MacPro6,1", # GCN 1
 ]
 
 LegacyGPU = [
@@ -277,3 +315,39 @@ Missing_USB_Map = [
     "Xserve2,1",
     "Xserve3,1",
 ]
+
+Missing_USB_Map_Ventura = [
+    "MacBook8,1",
+    "MacBookAir5,1",
+    "MacBookAir5,2",
+    "MacBookAir6,1",
+    "MacBookAir6,2",
+    "MacBookAir7,1",
+    "MacBookAir7,2",
+    "MacBookPro9,1",
+    "MacBookPro9,2",
+    "MacBookPro10,1",
+    "MacBookPro10,2",
+    "MacBookPro11,1",
+    "MacBookPro11,2",
+    "MacBookPro11,3",
+    "MacBookPro11,4",
+    "MacBookPro11,5",
+    "MacBookPro12,1",
+    "MacPro5,1",
+    "MacPro6,1",
+    "Macmini6,1",
+    "Macmini6,2",
+    "Macmini7,1",
+    "iMac13,1",
+    "iMac13,2",
+    "iMac14,1",
+    "iMac14,2",
+    "iMac14,3",
+    "iMac14,4",
+    "iMac15,1",
+    "iMac15,2",
+    "iMac16,1",
+    "iMac16,2",
+    "iMac17,1",
+]

data/os_data.py

@@ -1,24 +1,29 @@
+from curses.ascii import isdigit
 import enum
 
 
 class os_data(enum.IntEnum):
     # OS Versions, Based off Major Kernel Version
-    tiger = 8
-    leopard = 9
-    snow_leopard = 10
-    lion = 11
+    cheetah =       4 # Actually 1.3.1
+    puma =          5
+    jaguar =        6
+    panther =       7
+    tiger =         8
+    leopard =       9
+    snow_leopard =  10
+    lion =          11
     mountain_lion = 12
-    mavericks = 13
-    yosemite = 14
-    el_capitan = 15
-    sierra = 16
-    high_sierra = 17
-    mojave = 18
-    catalina = 19
-    big_sur = 20
-    monterey = 21
-    ventura = 22
-    max_os = 99
+    mavericks =     13
+    yosemite =      14
+    el_capitan =    15
+    sierra =        16
+    high_sierra =   17
+    mojave =        18
+    catalina =      19
+    big_sur =       20
+    monterey =      21
+    ventura =       22
+    max_os =        99
 
 
 class os_conversion:
@@ -45,4 +50,98 @@ class os_conversion:
             if source_minor < target_minor:
                 return True
             else:
-                return False
+                return False
+
+    def convert_kernel_to_marketing_name(kernel):
+        # Convert major XNU version to Marketing Name
+        try:
+            # Find os_data enum name
+            os_name = os_data(kernel).name
+
+            # Remove "_" from the string
+            os_name = os_name.replace("_", " ")
+
+            # Upper case the first letter of each word
+            os_name = os_name.title()
+        except ValueError:
+            # Handle cases where no enum value exists
+            # Pass kernel_to_os() as a substitute for a proper OS name
+            os_name = os_conversion.kernel_to_os(kernel)
+
+        return os_name
+
+    def convert_marketing_name_to_kernel(marketing_name):
+        # Convert Marketing Name to major XNU version
+        try:
+            # Find os_data enum value
+            os_kernel = os_data[marketing_name.lower().replace(" ", "_")]
+        except KeyError:
+            os_kernel = 0
+
+        return int(os_kernel)
+
+
+    def find_largest_build(build_array):
+        # Find the newest version within an array of versions
+        # These builds will have both numbers and letters in the version
+        # ex:
+        # [
+        #    "22A5295i",
+        #    "22A5266r",
+        #    "22A5286j",
+        #    "22A5295h",
+        # ]
+
+        max_length =        0  # Length of the longest build
+        build_array_split = [] # 'build_array', converted into individual array of elements
+        final_build =       "" # Largest determined build
+
+
+        # Convert strings to arrays
+        for build in build_array:
+            list_build = list(build)
+            if len(list_build) > max_length:
+                max_length = len(list_build)
+            build_array_split.append(list_build)
+
+        # Pad out each array to same length
+        for build in build_array_split:
+            while len(build) < max_length:
+                build.append("0")
+
+        # Convert all letters to int using ord()
+        for build in build_array_split:
+            for entry in build:
+                if not entry.isdigit():
+                    build[build.index(entry)] = ord(entry)
+
+        for build_outer_loop in build_array_split:
+            for build_inner_loop in list(build_array_split):
+                for i in range(len(build_outer_loop)):
+                    # remove any builds that are not the largest
+                    if int(build_outer_loop[i]) > int(build_inner_loop[i]):
+                        build_array_split.remove(build_inner_loop)
+                        break
+                    if int(build_outer_loop[i]) < int(build_inner_loop[i]):
+                        break
+
+        # Convert array back to string
+        for entry in build_array_split[0]:
+            # Since we split per character, we know that anything above 9 is a letter
+            if int(entry) > 9:
+                # revert back to letter
+                final_build += chr(entry)
+            else:
+                final_build += str(entry)
+
+        # Since we pad with 0s, we need to next determine how many 0s to remove
+        for build in build_array:
+            if final_build.startswith(build):
+                # Handle cases where Apple added a letter to the build
+                # ex. "22A5295" vs "22A5295"
+                remaining_strings = final_build.split(build)[1]
+                # If all remaining strings are 0s, then we can remove the 0s
+                if all(char == "0" for char in remaining_strings):
+                    final_build = build
+
+        return final_build

data/pci_data.py

@@ -1,6 +1,6 @@
 # Array of Device IDs for different devices
 class nvidia_ids:
-    # Courteous of envytools as well as Macrumors:
+    # Courteous of envytools as well as MacRumors:
     # https://envytools.readthedocs.io/en/latest/hw/pciid.html
     # https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/
     # https://pci-ids.ucw.cz/read/PC/10de

data/sip_data.py

@@ -134,6 +134,14 @@ class system_integrity_protection:
         "CSR_ALLOW_UNAPPROVED_KEXTS",  #           0x200 - Required for Aux Cache in Big Sur+
     ]
 
+    root_patch_sip_ventura = [
+        # Variables required to root patch in Ventura
+        "CSR_ALLOW_UNTRUSTED_KEXTS",  #            0x1   - Required for Aux Cache in Big Sur+
+        "CSR_ALLOW_UNRESTRICTED_FS",  #            0x2   - Required to mount and edit root volume, as well as load modded platform binaries
+        "CSR_ALLOW_UNAUTHENTICATED_ROOT",  #       0x800 - Required to avoid KC mismatch kernel panic
+    ]
+
+
     # CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE (introduced with Mojave):
     # This bit is quite strange and was originally assumed to be required for modded platform binaries
     # However after extensive testing, this doesn't seem true. In addition, this bit is never flipped via

data/smbios_data.py

@@ -14,6 +14,9 @@
 #   Switchable GPUs: If model uses a GMUX
 #   Stock GPUs: GPUs variations shipped
 
+# Reference:
+#   https://github.com/acidanthera/OpenCorePkg/blob/master/Library/OcMacInfoLib/AutoGenerated.c
+
 from resources import device_probe
 from data import cpu_data, os_data, bluetooth_data
 
@@ -225,10 +228,10 @@ smbios_dictionary = {
     },
     "MacBook9,1": {
         "Board ID": "Mac-9AE82516C7C6B903",
-        "FirmwareFeatures": "0xFC0FE13F",
+        "FirmwareFeatures": "0x8FC0FE13F",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.skylake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART,
         "Screen Size": 12,
@@ -242,7 +245,7 @@ smbios_dictionary = {
     },
     "MacBook10,1": {
         "Board ID": "Mac-EE2EBD4B90B839A8",
-        "FirmwareFeatures": "0xFC0FE13F",
+        "FirmwareFeatures": "0x8FC0FE13F",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.kaby_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -432,10 +435,10 @@ smbios_dictionary = {
     },
     "MacBookAir7,1": {
         "Board ID": "Mac-9F18E312C5C2BF0B",
-        "FirmwareFeatures": "0xFF0FF576",
+        "FirmwareFeatures": "0x8FF0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.broadwell.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Screen Size": 11,
@@ -449,10 +452,10 @@ smbios_dictionary = {
     },
     "MacBookAir7,2": {
         "Board ID": "Mac-937CB26E2E02BB01",
-        "FirmwareFeatures": "0xFF0FF576",
+        "FirmwareFeatures": "0x8FF0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.broadwell.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Screen Size": 13,
@@ -466,7 +469,7 @@ smbios_dictionary = {
     },
     "MacBookAir8,1": {
         "Board ID": "Mac-827FAC58A8FDFA22",
-        "FirmwareFeatures": "0xFD8FF42E",
+        "FirmwareFeatures": "0x8FD8FF42E",
         "SecureBootModel": "j140k",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -483,7 +486,7 @@ smbios_dictionary = {
     },
     "MacBookAir8,1_v2": {
         "Board ID": "Mac-112818653D3AABFC",
-        "FirmwareFeatures": "0xFD8FF42E",
+        "FirmwareFeatures": "0x8FD8FF42E",
         "SecureBootModel": "j140k",  # TODO: Verify
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -502,7 +505,7 @@ smbios_dictionary = {
         # AppleInternal MacBookAir8,1
         # True Model unknown
         "Board ID": "Mac-827FAC58A8FDFA22",
-        "FirmwareFeatures": "0xFD8FF42E",
+        "FirmwareFeatures": "0x8FD8FF42E",
         "SecureBootModel": "x589amlu",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -519,7 +522,7 @@ smbios_dictionary = {
     },
     "MacBookAir8,2": {
         "Board ID": "Mac-226CB3C6A851A671",
-        "FirmwareFeatures": "0xFD8FF42E",
+        "FirmwareFeatures": "0x8FD8FF42E",
         "SecureBootModel": "j140a",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -536,7 +539,7 @@ smbios_dictionary = {
     },
     "MacBookAir9,1": {
         "Board ID": "Mac-0CFF9C7C2B63DF8D",
-        "FirmwareFeatures": "0xFFAFF06E",
+        "FirmwareFeatures": "0x8FFAFF06E",
         "SecureBootModel": "j230k",
         "CPU Generation": cpu_data.cpu_data.ice_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -555,7 +558,7 @@ smbios_dictionary = {
         # AppleInternal MacBookAir9,1
         # True Model unknown
         "Board ID": "Mac-0CFF9C7C2B63DF8D",
-        "FirmwareFeatures": "0xFFAFF06E",
+        "FirmwareFeatures": "0x8FFAFF06E",
         "SecureBootModel": "x589icly",
         "CPU Generation": cpu_data.cpu_data.ice_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1014,7 +1017,7 @@ smbios_dictionary = {
         "Screen Size": 13,
         "Ethernet Chipset": "Broadcom",
         "Stock GPUs": [
-            device_probe.NVIDIA.Archs.Kepler
+            device_probe.Intel.Archs.Ivy_Bridge,
         ],
         "Stock Storage": [
             "SATA 2.5",
@@ -1050,7 +1053,7 @@ smbios_dictionary = {
         "Screen Size": 13,
         "Ethernet Chipset": None,
         "Stock GPUs": [
-            device_probe.NVIDIA.Archs.Kepler
+            device_probe.Intel.Archs.Ivy_Bridge,
         ],
         "Stock Storage": [
             "mSATA",
@@ -1103,6 +1106,7 @@ smbios_dictionary = {
         "Ethernet Chipset": None,
         "Stock GPUs": [
             device_probe.Intel.Archs.Haswell,
+            device_probe.NVIDIA.Archs.Kepler,
         ],
         "Stock Storage": [
             "NVMe",
@@ -1110,10 +1114,10 @@ smbios_dictionary = {
     },
     "MacBookPro11,4": {
         "Board ID": "Mac-06F11FD93F0323C5",
-        "FirmwareFeatures": "0xEB0FF577",
+        "FirmwareFeatures": "0x8EB0FF577",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.haswell.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Screen Size": 15,
@@ -1127,10 +1131,10 @@ smbios_dictionary = {
     },
     "MacBookPro11,5": {
         "Board ID": "Mac-06F11F11946D27C5",
-        "FirmwareFeatures": "0xEB0FF577",
+        "FirmwareFeatures": "0x8EB0FF577",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.haswell.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Screen Size": 15,
@@ -1146,10 +1150,10 @@ smbios_dictionary = {
     },
     "MacBookPro12,1": {
         "Board ID": "Mac-E43C1C25D4880AD6",
-        "FirmwareFeatures": "0xFD0FF576",
+        "FirmwareFeatures": "0x8FD0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.broadwell.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Screen Size": 13,
@@ -1163,10 +1167,10 @@ smbios_dictionary = {
     },
     "MacBookPro13,1": {
         "Board ID": "Mac-473D31EABEB93F9B",
-        "FirmwareFeatures": "0xFC0FE137",
+        "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.skylake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART,
         "Screen Size": 13,
@@ -1180,10 +1184,10 @@ smbios_dictionary = {
     },
     "MacBookPro13,2": {
         "Board ID": "Mac-66E35819EE2D0D05",
-        "FirmwareFeatures": "0xFC0FE137",
+        "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.skylake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART,
         "Screen Size": 13,
@@ -1197,10 +1201,10 @@ smbios_dictionary = {
     },
     "MacBookPro13,3": {
         "Board ID": "Mac-A5C67F76ED83108C",
-        "FirmwareFeatures": "0xFC0FE137",
+        "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.skylake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART,
         "Screen Size": 15,
@@ -1216,7 +1220,7 @@ smbios_dictionary = {
     },
     "MacBookPro14,1": {
         "Board ID": "Mac-B4831CEBD52A0C4C",
-        "FirmwareFeatures": "0xFF0FF57E",
+        "FirmwareFeatures": "0x8FF0FF57E",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.kaby_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1233,7 +1237,7 @@ smbios_dictionary = {
     },
     "MacBookPro14,2": {
         "Board ID": "Mac-CAD6701F7CEA0921",
-        "FirmwareFeatures": "0xFF0FF57E",
+        "FirmwareFeatures": "0x8FF0FF57E",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.kaby_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1250,7 +1254,7 @@ smbios_dictionary = {
     },
     "MacBookPro14,3": {
         "Board ID": "Mac-551B86E5744E2388",
-        "FirmwareFeatures": "0xFF0FF57E",
+        "FirmwareFeatures": "0x8FF0FF57E",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.kaby_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1269,7 +1273,7 @@ smbios_dictionary = {
     },
     "MacBookPro15,1": {
         "Board ID": "Mac-937A206F2EE63C01",
-        "FirmwareFeatures": "0xFD8FF426",
+        "FirmwareFeatures": "0x8FD8FF426",
         "SecureBootModel": "j680",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1288,7 +1292,7 @@ smbios_dictionary = {
     },
     "MacBookPro15,2": {
         "Board ID": "Mac-827FB448E656EC26",
-        "FirmwareFeatures": "0xFD8FF426",
+        "FirmwareFeatures": "0x8FD8FF426",
         "SecureBootModel": "j132",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1305,7 +1309,7 @@ smbios_dictionary = {
     },
     "MacBookPro15,3": {
         "Board ID": "Mac-1E7E29AD0135F9BC",
-        "FirmwareFeatures": "0xFD8FF426",
+        "FirmwareFeatures": "0x8FD8FF426",
         "SecureBootModel": "j780",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1324,7 +1328,7 @@ smbios_dictionary = {
     },
     "MacBookPro15,4": {
         "Board ID": "Mac-53FDB3D8DB8CA971",
-        "FirmwareFeatures": "0xFD8FF426",
+        "FirmwareFeatures": "0x8FD8FF426",
         "SecureBootModel": "j213",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1341,7 +1345,7 @@ smbios_dictionary = {
     },
     "MacBookPro16,1": {
         "Board ID": "Mac-E1008331FDC96864",
-        "FirmwareFeatures": "0xFDAFF066",
+        "FirmwareFeatures": "0x8FDAFF066",
         "SecureBootModel": "j152f",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1360,7 +1364,7 @@ smbios_dictionary = {
     },
     "MacBookPro16,2": {
         "Board ID": "Mac-5F9802EFE386AA28",
-        "FirmwareFeatures": "0xFFAFF06E",
+        "FirmwareFeatures": "0x8FFFFFF7F",
         "SecureBootModel": "j214k",
         "CPU Generation": cpu_data.cpu_data.ice_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1377,7 +1381,7 @@ smbios_dictionary = {
     },
     "MacBookPro16,3": {
         "Board ID": "Mac-E7203C0F68AA0004",
-        "FirmwareFeatures": "0xFDAFF066",
+        "FirmwareFeatures": "0x8FDAFF066",
         "SecureBootModel": "j223",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1394,7 +1398,7 @@ smbios_dictionary = {
     },
     "MacBookPro16,4": {
         "Board ID": "Mac-A61BADE1FDAD7B05",
-        "FirmwareFeatures": "0xFDAFF066",
+        "FirmwareFeatures": "0x8FDAFF066",
         "SecureBootModel": "j215",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -1637,10 +1641,10 @@ smbios_dictionary = {
     },
     "Macmini7,1": {
         "Board ID": "Mac-35C5E08120C7EEAF",
-        "FirmwareFeatures": "0xE00DE137",
+        "FirmwareFeatures": "0x8E00DE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.haswell.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Ethernet Chipset": "Broadcom",
@@ -1654,7 +1658,7 @@ smbios_dictionary = {
     },
     "Macmini8,1": {
         "Board ID": "Mac-7BA5B2DFE22DDD8C",
-        "FirmwareFeatures": "0xFD8FF466",
+        "FirmwareFeatures": "0x8FD8FF466",
         "SecureBootModel": "j174",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2137,7 +2141,6 @@ smbios_dictionary = {
         "Ethernet Chipset": "Broadcom",
         "Stock GPUs": [
             device_probe.Intel.Archs.Ivy_Bridge,
-            device_probe.NVIDIA.Archs.Kepler,
         ],
         "Stock Storage": [
             "SATA 3.5",
@@ -2155,7 +2158,6 @@ smbios_dictionary = {
         "Ethernet Chipset": "Broadcom",
         "Stock GPUs": [
             device_probe.Intel.Archs.Haswell,
-            device_probe.NVIDIA.Archs.Kepler,
         ],
         "Stock Storage": [
             "SATA 3.5",
@@ -2255,10 +2257,10 @@ smbios_dictionary = {
     },
     "iMac16,1": {
         "Board ID": "Mac-A369DDC4E67F1C45",
-        "FirmwareFeatures": "0xFC0FE137",
+        "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.broadwell.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Ethernet Chipset": "Broadcom",
@@ -2272,10 +2274,10 @@ smbios_dictionary = {
     },
     "iMac16,2": {
         "Board ID": "Mac-FFE5EF870D7BA81A",
-        "FirmwareFeatures": "0xFC0FE137",
+        "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.broadwell.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Ethernet Chipset": "Broadcom",
@@ -2289,16 +2291,17 @@ smbios_dictionary = {
     },
     "iMac17,1": {
         "Board ID": "Mac-DB15BD556843C820",
-        "FirmwareFeatures": "0xFC0FE137",
+        "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.skylake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Ethernet Chipset": "Broadcom",
         "5K Display": True,
         "Stock GPUs": [
             device_probe.Intel.Archs.Skylake,
+            device_probe.AMD.Archs.Legacy_GCN_8000,
             device_probe.AMD.Archs.Legacy_GCN_9000,
         ],
         "Stock Storage": [
@@ -2308,16 +2311,17 @@ smbios_dictionary = {
     },
     "iMac17,1_v2": {
         "Board ID": "Mac-65CE76090165799A",
-        "FirmwareFeatures": "0xFC0FE137",
+        "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.skylake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Ethernet Chipset": "Broadcom",
         "5K Display": True,
         "Stock GPUs": [
             device_probe.Intel.Archs.Skylake,
+            device_probe.AMD.Archs.Legacy_GCN_8000,
             device_probe.AMD.Archs.Legacy_GCN_9000,
         ],
         "Stock Storage": [
@@ -2327,16 +2331,17 @@ smbios_dictionary = {
     },
     "iMac17,1_v3": {
         "Board ID": "Mac-B809C3757DA9BB8D",
-        "FirmwareFeatures": "0xFC0FE137",
+        "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.skylake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Ethernet Chipset": "Broadcom",
         "5K Display": True,
         "Stock GPUs": [
             device_probe.Intel.Archs.Skylake,
+            device_probe.AMD.Archs.Legacy_GCN_8000,
             device_probe.AMD.Archs.Legacy_GCN_9000,
         ],
         "Stock Storage": [
@@ -2346,7 +2351,7 @@ smbios_dictionary = {
     },
     "iMac18,1": {
         "Board ID": "Mac-4B682C642B45593E",
-        "FirmwareFeatures": "0xFD0FF576",
+        "FirmwareFeatures": "0x8FD0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.kaby_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2363,7 +2368,7 @@ smbios_dictionary = {
     },
     "iMac18,2": {
         "Board ID": "Mac-77F17D7DA9285301",
-        "FirmwareFeatures": "0xFD0FF576",
+        "FirmwareFeatures": "0x8FD0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.kaby_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2381,7 +2386,7 @@ smbios_dictionary = {
     },
     "iMac18,3": {
         "Board ID": "Mac-BE088AF8C5EB4FA2",
-        "FirmwareFeatures": "0xFD0FF576",
+        "FirmwareFeatures": "0x8FD0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.kaby_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2400,7 +2405,7 @@ smbios_dictionary = {
     },
     "iMac19,1": {
         "Board ID": "Mac-AA95B1DDAB278B95",
-        "FirmwareFeatures": "0xFD8FF576",
+        "FirmwareFeatures": "0x8FD8FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2421,7 +2426,7 @@ smbios_dictionary = {
     "AAPL_iMac19,1": {
         # AppleInternal iMac19,1 unit
         "Board ID": "Mac-CF21D135A7D34AA6",
-        "FirmwareFeatures": "0xFD8FF576",
+        "FirmwareFeatures": "0x8FD8FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2441,7 +2446,7 @@ smbios_dictionary = {
     },
     "iMac19,2": {
         "Board ID": "Mac-63001698E7A34814",
-        "FirmwareFeatures": "0xFD8FF576",
+        "FirmwareFeatures": "0x8FD8FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2460,7 +2465,7 @@ smbios_dictionary = {
     },
     "iMac20,1": {
         "Board ID": "Mac-CFF7D910A743CAAF",
-        "FirmwareFeatures": "0xFD8FF576",
+        "FirmwareFeatures": "0x8FFB3F066",
         "SecureBootModel": "j185",
         "CPU Generation": cpu_data.cpu_data.comet_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2478,7 +2483,7 @@ smbios_dictionary = {
     },
     "iMac20,2": {
         "Board ID": "Mac-AF89B6D9451A490B",
-        "FirmwareFeatures": "0xFD8FF576",
+        "FirmwareFeatures": "0x8FFB3F066",
         "SecureBootModel": "j185f",
         "CPU Generation": cpu_data.cpu_data.comet_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2589,7 +2594,9 @@ smbios_dictionary = {
         "Ethernet Chipset": "Intel 80003ES2LAN",
         "Socketed GPUs": "PCIe",
         "Stock GPUs": [
-            device_probe.AMD.Archs.TeraScale_1
+            device_probe.AMD.Archs.TeraScale_1,
+            device_probe.AMD.Archs.Polaris,
+
         ],
         "Stock Storage": [
             "SATA 3.5",
@@ -2607,7 +2614,8 @@ smbios_dictionary = {
         "Ethernet Chipset": "Intel 82574L",
         "Socketed GPUs": "PCIe",
         "Stock GPUs": [
-            device_probe.NVIDIA.Archs.Tesla
+            device_probe.NVIDIA.Archs.Tesla,
+            device_probe.AMD.Archs.Polaris,
         ],
         "Stock Storage": [
             "SATA 3.5",
@@ -2624,7 +2632,8 @@ smbios_dictionary = {
         "Ethernet Chipset": "Intel 82574L",
         "Socketed GPUs": "PCIe",
         "Stock GPUs": [
-            device_probe.AMD.Archs.TeraScale_2
+            device_probe.AMD.Archs.TeraScale_2,
+            device_probe.AMD.Archs.Polaris,
         ],
         "Stock Storage": [
             "SATA 3.5",
@@ -2632,10 +2641,10 @@ smbios_dictionary = {
     },
     "MacPro6,1": {
         "Board ID": "Mac-F60DEB81FF30ACF6",
-        "FirmwareFeatures": "0xE90FF576",
+        "FirmwareFeatures": "0x8E90FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.cpu_data.ivy_bridge.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.monterey,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2,
         "Ethernet Chipset": "Broadcom",
@@ -2648,7 +2657,7 @@ smbios_dictionary = {
     },
     "MacPro7,1": {
         "Board ID": "Mac-27AD2F918AE68F61",
-        "FirmwareFeatures": "0xFDAFF066",
+        "FirmwareFeatures": "0x8FDAFF066",
         "SecureBootModel": "j160",
         "CPU Generation": cpu_data.cpu_data.coffee_lake.value,
         "Max OS Supported": os_data.os_data.max_os,
@@ -2814,7 +2823,7 @@ smbios_dictionary = {
         # Apple Silicon Virtual Machine
         "Board ID": None,
         "FirmwareFeatures": None,
-        "SecureBootModel": "vma1macos",
+        "SecureBootModel": "vma1",
         "CPU Generation": cpu_data.cpu_data.apple_m1.value,
         "Max OS Supported": os_data.os_data.max_os,
         "Wireless Model": None,

data/sys_patch_dict.py

@@ -3,7 +3,7 @@
 
 # Schema for sys_patch_dict.py:
 # Supports 6 types of higher level keys:
-#  - OS Support:         Supported OSes by patchse   - Dictionary of Min/Max Kernel Major and Minor versions
+#  - OS Support:         Supported OSes by patches   - Dictionary of Min/Max Kernel Major and Minor versions
 #  - Install:            Install to root volume      - Dictionary of strings with string value of source
 #  - Install Non-Root:   Install to data partition   - Dictionary of strings with string value of source
 #  - Remove:             Files to remove             - Array of strings
@@ -42,7 +42,6 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "CoreDisplay.framework": f"10.14.4-{os_major}",
                         "IOSurface.framework":   f"10.15.7-{os_major}",
                         "QuartzCore.framework":  f"10.15.7-{os_major}",
-                        **({ "WebKit.framework":  "11.6" } if os_major >= os_data.os_data.monterey else {}),
                     },
                     "/System/Library/PrivateFrameworks": {
                         "GPUSupport.framework": "10.14.3",
@@ -75,12 +74,15 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "GeForce.kext",
                         "IOAcceleratorFamily2.kext",
                         "IOGPUFamily.kext",
+                        "AppleAfterburner.kext",
                     ],
                 },
                 "Install Non-Root": {
                     "/Library/Application Support/SkyLightPlugins": {
-                        **({ "DropboxHack.dylib": "SkyLightPlugins" } if os_major >= os_data.os_data.monterey else {}),
-                        **({ "DropboxHack.txt":   "SkyLightPlugins" } if os_major >= os_data.os_data.monterey else {}),
+                        **({ "DropboxHack.dylib":    "SkyLightPlugins" } if os_major >= os_data.os_data.monterey else {}),
+                        **({ "DropboxHack.txt":      "SkyLightPlugins" } if os_major >= os_data.os_data.monterey else {}),
+                        **({ "CatalystButton.dylib": "SkyLightPlugins" } if os_major >= os_data.os_data.monterey else {}),
+                        **({ "CatalystButton.txt":   "SkyLightPlugins" } if os_major >= os_data.os_data.monterey else {}),
                     },
                 },
                 "Processes": {
@@ -167,11 +169,15 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 },
             },
 
+            # AMD GCN and Nvidia Kepler require Metal Downgrade in Ventura
+            # The patches are required due to struct issues in the Metal stack
+            # - AMD GCN will break on BronzeMtlDevice
+            # - See Nvidia Kepler patchset for more info
             "Metal Common": {
                 "Display Name": "",
                 "OS Support": {
                     "Minimum OS Support": {
-                        "OS Major": os_data.os_data.monterey,
+                        "OS Major": os_data.os_data.ventura,
                         "OS Minor": 0
                     },
                     "Maximum OS Support": {
@@ -181,38 +187,97 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 },
                 "Install": {
                     "/System/Library/Frameworks": {
-                        "OpenCL.framework": "11.6",
-                        "WebKit.framework": "11.6",
+                        "Metal.framework":                   "12.5",
+                        "MetalPerformanceShaders.framework": "12.5",
                     },
                 },
             },
 
-            # Resolve AppleGVACore crashing on MacBookPro11,3 due to mixed GPU combo
-            # ie. native Haswell iGPU + non-native Kepler dGPU
-            # This can be remove after 0.4.6 release, as 0.4.5 downgrades to 10.15.7
-            "GVA Work-Around": {
+            # Temporary work-around for Kepler GPUs on Ventura
+            # We removed the reliance on Metal.framework downgrade, however the new Kepler
+            # patchset breaks with the old Metal. Thus we need to ensure stock variant is used
+            # Remove this when OCLP is merged onto mainline
+            "Revert Metal Downgrade": {
+                "Display Name": "",
+                "OS Support": {
+                    "Minimum OS Support": {
+                        "OS Major": os_data.os_data.ventura,
+                        "OS Minor": 0
+                    },
+                    "Maximum OS Support": {
+                        "OS Major": os_data.os_data.ventura,
+                        "OS Minor": 99
+                    },
+                },
+                "Remove": {
+                    "/System/Library/Frameworks/Metal.framework/Versions/A/": [
+                        "Metal",
+                        "MetalOld.dylib",
+                    ],
+                    "/System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSCore.framework/Versions/A": [
+                        "MPSCore",
+                    ],
+                },
+            },
+
+            # Monterey has a WebKit sandboxing issue where many UI elements fail to render
+            # This patch simple replaces the sandbox profile with one supporting our GPUs
+            # Note: Neither Big Sur nor Ventura have this issue
+            "WebKit Monterey Common": {
                 "Display Name": "",
                 "OS Support": {
                     "Minimum OS Support": {
                         "OS Major": os_data.os_data.monterey,
                         "OS Minor": 0
                     },
+                    "Maximum OS Support": {
+                        "OS Major": os_data.os_data.monterey,
+                        "OS Minor": 99
+                    },
+                },
+                "Install": {
+                    "/System/Library/Frameworks": {
+                        "WebKit.framework":  "11.6"
+                    },
+                },
+                "Install Non-Root": {
+                    "/Library/Apple/System/Library/StagedFrameworks/Safari": {
+                        "WebKit.framework":  "11.6"
+                    },
+                },
+            },
+
+            # Intel Ivy Bridge, Haswell and Nvidia Kepler are Metal 3802-based GPUs
+            # Due to this, we need to re-add 3802 compiler support to the Metal stack
+            "Metal 3802 Common": {
+                "Display Name": "",
+                "OS Support": {
+                    "Minimum OS Support": {
+                        "OS Major": os_data.os_data.ventura,
+                        "OS Minor": 0
+                    },
                     "Maximum OS Support": {
                         "OS Major": os_data.os_data.max_os,
                         "OS Minor": 99
                     },
                 },
-                "Remove": {
-                    "/System/Library/PrivateFrameworks/AppleGVA.framework/Versions/A": [
-                        "AppleGVA",
-                    ],
-                    "/System/Library/PrivateFrameworks/AppleGVACore.framework/Versions/A": [
-                        "AppleGVACore",
-                    ],
+                "Install": {
+                    "/System/Library/Frameworks": {
+                        "Metal.framework": "12.5-3802",
+                    },
+                    "/System/Library/PrivateFrameworks": {
+                        "MTLCompiler.framework": "12.5-3802",
+                        "GPUCompiler.framework": "12.5-3802",
+                    },
+                    "/System/Library/Sandbox/Profiles": {
+                        "com.apple.mtlcompilerservice.sb": "12.5-3802",
+                    }
                 },
             },
 
-            "Modern GVA": {
+            # For GPUs last natively supported in Catalina/Big Sur
+            # Restores DRM support
+            "Catalina GVA": {
                 "Display Name": "",
                 "OS Support": {
                     "Minimum OS Support": {
@@ -232,7 +297,29 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 },
             },
 
-            "Legacy GVA": {
+            # For GPUs last natively supported in Monterey
+            # Restores DRM support
+            "Monterey GVA": {
+                "Display Name": "",
+                "OS Support": {
+                    "Minimum OS Support": {
+                        "OS Major": os_data.os_data.ventura,
+                        "OS Minor": 0
+                    },
+                    "Maximum OS Support": {
+                        "OS Major": os_data.os_data.max_os,
+                        "OS Minor": 99
+                    },
+                },
+                "Install": {
+                    "/System/Library/PrivateFrameworks": {
+                        "AppleGVA.framework":     "12.5",
+                        "AppleGVACore.framework": "12.5",
+                    },
+                },
+            },
+
+            "High Sierra GVA": {
                 "Display Name": "",
                 "OS Support": {
                     "Minimum OS Support": {
@@ -252,6 +339,65 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 },
             },
 
+            "Big Sur OpenCL": {
+                "Display Name": "",
+                "OS Support": {
+                    "Minimum OS Support": {
+                        "OS Major": os_data.os_data.monterey,
+                        "OS Minor": 0
+                    },
+                    "Maximum OS Support": {
+                        "OS Major": os_data.os_data.max_os,
+                        "OS Minor": 99
+                    },
+                },
+                "Install": {
+                    "/System/Library/Frameworks": {
+                        "OpenCL.framework": "11.6",
+                    },
+                },
+            },
+
+            "Monterey OpenCL": {
+                "Display Name": "",
+                "OS Support": {
+                    "Minimum OS Support": {
+                        "OS Major": os_data.os_data.ventura,
+                        "OS Minor": 0
+                    },
+                    "Maximum OS Support": {
+                        "OS Major": os_data.os_data.max_os,
+                        "OS Minor": 99
+                    },
+                },
+                "Install": {
+                    "/System/Library/Frameworks": {
+                        "OpenCL.framework": "12.5",
+                    },
+                },
+            },
+
+            # In Ventura, Apple added AVX2.0 code to AMD's OpenCL/GL compilers
+            "AMD OpenCL": {
+                "Display Name": "",
+                "OS Support": {
+                    "Minimum OS Support": {
+                        "OS Major": os_data.os_data.ventura,
+                        "OS Minor": 0
+                    },
+                    "Maximum OS Support": {
+                        "OS Major": os_data.os_data.max_os,
+                        "OS Minor": 99
+                    },
+                },
+                "Install": {
+                    "/System/Library/Frameworks": {
+                        "OpenCL.framework": "12.5 non-AVX2.0",
+                        "OpenGL.framework": "12.5 non-AVX2.0",
+                    },
+                },
+            },
+
             "Nvidia Tesla": {
                 "Display Name": "Graphics: Nvidia Tesla",
                 "OS Support": {
@@ -292,15 +438,22 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 },
                 "Install": {
                     "/System/Library/Extensions": {
-                        "GeForceAIRPlugin.bundle": "11.0 Beta 3",
-                        "GeForceGLDriver.bundle":  "11.0 Beta 3",
-                        "GeForceMTLDriver.bundle": "11.0 Beta 3",
                         "GeForce.kext":            "12.0 Beta 6",
-                        "GeForceVADriver.bundle":  "12.0 Beta 6",
                         "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 os_major <= os_data.os_data.monterey else f"11.0 Beta 3-{os_major}",
+                        "GeForceVADriver.bundle":  "12.0 Beta 6",
+                    },
+                    "/System/Library/Frameworks": {
+                        # XNU 21.6 (macOS 12.5)
+                        **({ "Metal.framework": "12.5 Beta 2"} if (os_data.os_conversion.is_os_newer(os_data.os_data.monterey, 5, os_major, os_minor) and os_major < os_data.os_data.ventura) else {}),
+                    },
+                    "/System/Library/PrivateFrameworks": {
+                        "GPUCompiler.framework": "11.6",
                     },
                 },
             },
@@ -471,12 +624,52 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "OS Minor": 99
                     },
                 },
-                "Install Reference": {
+                "Install": {
                     "/System/Library/Extensions": {
-                        "AMD7000Controller.kext": "12.4",
-                        "AMD8000Controller.kext": "12.4",
-                        "AMD9000Controller.kext": "12.4",
-                        "AMDRadeonX4000.kext":    "12.4",
+                        "AMD7000Controller.kext":        "12.5",
+                        "AMD8000Controller.kext":        "12.5",
+                        "AMD9000Controller.kext":        "12.5",
+                        "AMD9500Controller.kext":        "12.5",
+                        "AMDRadeonX4000.kext":           "12.5",
+                        "AMDRadeonX4000HWServices.kext": "12.5",
+                        "AMDFramebuffer.kext":           "12.5",
+                        "AMDSupport.kext":               "12.5",
+
+                        "AMDRadeonX4000GLDriver.bundle": "12.5",
+                        "AMDMTLBronzeDriver.bundle":     "12.5",
+                        "AMDShared.bundle":              "12.5",
+                    },
+                },
+                "Remove": {
+                    "/System/Library/Extensions": [
+                        # Due to downgraded AMDSupport.kext
+                        # In the future, we will have to downgrade the entire AMD stack
+                        # to support non-AVX2.0 machines with Vega or newer
+                        "AMD10000Controller.kext",
+                    ],
+                },
+            },
+            # Used only for AMD Polaris with host lacking AVX2.0
+            # Note missing framebuffers are not restored (ex. 'ATY,Berbice')
+            "AMD Legacy Polaris": {
+                "Display Name": "Graphics: AMD Legacy Polaris",
+                 "OS Support": {
+                    "Minimum OS Support": {
+                        "OS Major": os_data.os_data.ventura,
+                        "OS Minor": 0
+                    },
+                    "Maximum OS Support": {
+                        "OS Major": os_data.os_data.max_os,
+                        "OS Minor": 99
+                    },
+                },
+                "Install": {
+                    "/System/Library/Extensions": {
+                        "AMDRadeonX4000.kext":           "12.5",
+
+                        "AMDRadeonX4000GLDriver.bundle": "12.5",
+                        "AMDMTLBronzeDriver.bundle":     "12.5",
+                        "AMDShared.bundle":              "12.5",
                     },
                 },
             },
@@ -537,9 +730,6 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "OS Minor": 99
                     },
                 },
-                "Processes": {
-                    "defaults write com.apple.coremedia hardwareVideoDecoder -string enable": False,
-                },
                 "Install": {
                     "/System/Library/Extensions": {
                         "AppleIntelHD4000GraphicsGLDriver.bundle":  "11.0 Beta 6",
@@ -564,14 +754,15 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "OS Minor": 99
                     },
                 },
-                "Install Reference": {
+                "Install": {
                     "/System/Library/Extensions": {
-                        "AppleIntelFramebufferAzul.kext":           "12.4",
-                        "AppleIntelHD5000Graphics.kext":            "12.4",
-                        "AppleIntelHD5000GraphicsGLDriver.bundle":  "11.0 Beta 6",
-                        "AppleIntelHD5000GraphicsMTLDriver.bundle": "11.0 Beta 6",
-                        "AppleIntelHD5000GraphicsVADriver.bundle":  "11.0 Beta 6",
-                        "AppleIntelHSWVA.bundle":                   "11.0 Beta 6",
+                        "AppleIntelFramebufferAzul.kext":           "12.5",
+                        "AppleIntelHD5000Graphics.kext":            "12.5",
+                        "AppleIntelHD5000GraphicsGLDriver.bundle":  "12.5",
+                        "AppleIntelHD5000GraphicsMTLDriver.bundle": "12.5",
+                        "AppleIntelHD5000GraphicsVADriver.bundle":  "12.5",
+                        "AppleIntelHSWVA.bundle":                   "12.5",
+                        "AppleIntelGraphicsShared.bundle":          "12.5",
                     },
                 },
             },
@@ -587,14 +778,15 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "OS Minor": 99
                     },
                 },
-                "Install Reference": {
+                "Install": {
                     "/System/Library/Extensions": {
-                        "AppleIntelBDWGraphics.kext":            "12.4",
-                        "AppleIntelBDWGraphicsFramebuffer.kext": "12.4",
-                        "AppleIntelBDWGraphicsGLDriver.bundle":  "11.0 Beta 6",
-                        "AppleIntelBDWGraphicsMTLDriver.bundle": "11.0 Beta 6",
-                        "AppleIntelBDWGraphicsVADriver.bundle":  "11.0 Beta 6",
-                        "AppleIntelBDWGraphicsVAME.bundle":      "11.0 Beta 6",
+                        "AppleIntelBDWGraphics.kext":            "12.5",
+                        "AppleIntelBDWGraphicsFramebuffer.kext": "12.5",
+                        "AppleIntelBDWGraphicsGLDriver.bundle":  "12.5",
+                        "AppleIntelBDWGraphicsMTLDriver.bundle": "12.5",
+                        "AppleIntelBDWGraphicsVADriver.bundle":  "12.5",
+                        "AppleIntelBDWGraphicsVAME.bundle":      "12.5",
+                        "AppleIntelGraphicsShared.bundle":       "12.5",
                     },
                 },
             },
@@ -610,21 +802,22 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "OS Minor": 99
                     },
                 },
-                "Install Reference": {
+                "Install": {
                     "/System/Library/Extensions": {
-                        "AppleIntelSKLGraphics.kext":            "12.4",
-                        "AppleIntelSKLGraphicsFramebuffer.kext": "12.4",
-                        "AppleIntelSKLGraphicsGLDriver.bundle":  "11.0 Beta 6",
-                        "AppleIntelSKLGraphicsMTLDriver.bundle": "11.0 Beta 6",
-                        "AppleIntelSKLGraphicsVADriver.bundle":  "11.0 Beta 6",
-                        "AppleIntelSKLGraphicsVAME.bundle":      "11.0 Beta 6",
+                        "AppleIntelSKLGraphics.kext":            "12.5",
+                        "AppleIntelSKLGraphicsFramebuffer.kext": "12.5",
+                        "AppleIntelSKLGraphicsGLDriver.bundle":  "12.5",
+                        "AppleIntelSKLGraphicsMTLDriver.bundle": "12.5",
+                        "AppleIntelSKLGraphicsVADriver.bundle":  "12.5",
+                        "AppleIntelSKLGraphicsVAME.bundle":      "12.5",
+                        "AppleIntelGraphicsShared.bundle":       "12.5",
                     },
                 },
             },
         },
         "Audio": {
             "Legacy Realtek": {
-                "Display Name": "Audio: Legacy Realtek Audio",
+                "Display Name": "Audio: Legacy Realtek",
                 "OS Support": {
                     "Minimum OS Support": {
                         "OS Major": os_data.os_data.sierra,
@@ -654,7 +847,7 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
             },
             # For Mac Pros with non-UGA/GOP GPUs
             "Legacy Non-GOP": {
-                "Display Name": "Audio: Legacy non-GOP Audio",
+                "Display Name": "Audio: Legacy non-GOP",
                 "OS Support": {
                     "Minimum OS Support": {
                         "OS Major": os_data.os_data.mojave,
@@ -673,15 +866,15 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
             },
         },
         "Networking": {
-            "Legacy WiFi": {
-                "Display Name": "Networking: Legacy WiFi",
+            "Legacy Wireless": {
+                "Display Name": "Networking: Legacy Wireless",
                 "OS Support": {
                     "Minimum OS Support": {
                         "OS Major": os_data.os_data.monterey,
                         "OS Minor": 0
                     },
                     "Maximum OS Support": {
-                        "OS Major": os_data.os_data.max_os,
+                        "OS Major": os_data.os_data.monterey,
                         "OS Minor": 99
                     },
                 },
@@ -702,8 +895,8 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
             },
         },
         "Brightness": {
-            "Legacy Brightness": {
-                "Display Name": "Brightness: Legacy Brightness",
+            "Legacy Backlight Control": {
+                "Display Name": "Brightness: Legacy Backlight Control",
                 "OS Support": {
                     "Minimum OS Support": {
                         "OS Major": os_data.os_data.high_sierra,

docs/.vuepress/config.js

@@ -93,6 +93,15 @@ module.exports = {
 
         },
         {
+            title: 'macOS Ventura',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				['VENTURA-DROP', 'macOS Ventura Support'],
+            ]
+        },      
+		  
+	{
             title: 'macOS Monterey',
             collapsable: false,
             sidebarDepth: 1,

docs/ACCEL.md

@@ -18,7 +18,7 @@ The below page is for users experiencing issues with their overall usage of macO
 
 * Intel 3rd and 4th Gen - GMA series
 
-For those unfamiliar with what is considered a non-Metal GPU, see below chart:
+For those unfamiliar with what is considered a non-Metal GPU, see the chart below:
 
 ::: details macOS GPU Chart
 
@@ -105,9 +105,9 @@ Workaround: Press some combination of Tab, or Tab and then Shift-Tab, or just Sh
 
 ## Wake from sleep heavily distorted on AMD/ATI in macOS 11.3 and newer
 
-Unfortunately a very well known issue the community is investigating, current known solution is to simply downgrade to 11.2.3 or older until a proper fix can be found. Additionally logging out and logging in can resolve the issue without requiring a reboot
+Unfortunately a very well known issue that the community is investigating. A currently known solution is to downgrade to macOS 11.2.3 or older until a proper fix can be found. Additionally logging out and logging in can resolve the issue without requiring a reboot.
 
-* Note, this issue should be exclusive to TeraScale 1 GPUs (ie. HD2000-4000). TeraScale 2 GPUs should not exhibit this issue
+* Note, this issue should be exclusive to TeraScale 1 GPUs (ie. HD2000-4000). TeraScale 2 GPUs should not exhibit this issue.
 
 In the event Apple removes 11.2.3 from their catalogue, we've provided a mirror below:
 
@@ -123,11 +123,11 @@ The best way to achieve this is to boot Recovery (or Single User Mode if the dGP
 nvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%01%00%00%00
 ```
 
-This will disable the dGPU and allow the iGPU to function in Big Sur. Note that external display outputs are directly routed to the dGPU and therefore can no longer be used. Solutions such as a [DisplayLink Adapters](https://www.displaylink.com/products/usb-adapters) can work around this limitation, however note that you'll need to use older drivers (5.2.6):
+This will disable the dGPU and allow the iGPU to function in Big Sur. Note that external display outputs are directly routed to the dGPU and therefore can no longer be used. Solutions such as [DisplayLink Adapters](https://www.displaylink.com/products/usb-adapters) can work around this limitation, however, note that you'll need to use older drivers (5.2.6):
 
 * [DisplayLink USB Graphics Software for macOS - For Mojave and Catalina - 5.2.6](https://www.synaptics.com/products/displaylink-graphics/downloads/macos-5.2.6)
 
-Note this driver only provides partial support in macOS, full graphics acceleration is not currently available on the displays driven by DisplayLink
+Note: This driver only provides partial support in macOS, full graphics acceleration is not currently available on displays driven by DisplayLink.
 
 ## Erratic Colours on ATI TeraScale 2 GPUs (HD5000/HD6000)
 
@@ -135,7 +135,7 @@ Resolved with OpenCore Legacy Patcher v0.4.2
 
 ::: details Legacy Fix (prior to 0.4.2)
 
-Due to an odd bug with ATI's TeraScale 2 GPUs, many users will experience erratic/strobing colours once finished installing and rebooting into the accelerated patches. The issue stems from an incorrect assumption in the GPU drivers where it will enforce the Billion Colour space on your display. To fix, simply force your Display into a lower color depth such as a Million Colours.
+Due to an odd bug with ATI's TeraScale 2 GPUs, many users will experience erratic/strobing colours once finished installing accelerated patches and rebooting into macOS. The issue stems from an incorrect assumption in the GPU drivers where it will enforce the Billion Colour space on your display. To fix, simply force your Display into a lower color depth such as Million Colours.
 
 Applications that can set color depth are:
 
@@ -146,15 +146,15 @@ Applications that can set color depth are:
 
 ## Unable to allow Safari Extensions
 
-Due to an bug on the legacy acceleration patches, users won't be able to enable Safari Extensions
+Due to a bug in the legacy acceleration patches, users won't be able to enable Safari Extensions.
 
-This tool can be used to work-around this issue:
+The following tool can be used to work-around this issue:
 
 * [Non-Metal Safari Extensions](https://github.com/moosethegoose2213/Non-Metal-Safari-Extensions/)
 
 ## Cannot Login on 2011 15" and 17" MacBook Pros
 
-By default OpenCore Legacy Patcher will assume MacBookPro8,2/3 have a faulty dGPU and disable acceleration. This is the safest option for most users as enabling dGPU acceleration on faulty Macs will result in failed booting.
+By default, OpenCore Legacy Patcher will assume MacBookPro8,2/3 have a faulty dGPU and disable acceleration. This is the safest option for most users as enabling dGPU acceleration on faulty Macs will result in failed booting.
 
 However if your machine does not have the dGPU disabled via NVRAM, you'll experience a login loop. To work around this is quite simple:
 
@@ -163,8 +163,7 @@ However if your machine does not have the dGPU disabled via NVRAM, you'll experi
 2. When command line prompt appears, enter the dGPU disabler argument (at the bottom)
 3. Reboot and patched macOS should work normally
 4. If you still want to use the dGPU, run OpenCore Legacy Patcher and enable TS2 Acceleration from settings. Then root patch your Mac again
-    * TUI: `Patcher Settings -> Misc Settings -> TeraScale 2 Accel`
-    * GUI: `Patcher Settings -> Developer Settings -> Set TeraScale 2 Accel`
+     `Patcher Settings -> Developer Settings -> Set TeraScale 2 Accel`
 5. Either Reset NVRAM or set `gpu-power-prefs` to zeros to re-enable the dGPU
 
 ```sh
@@ -178,10 +177,10 @@ nvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%00%00%00%00
 
 A somewhat strange issue on Intel HD3000-based Macs, on 3rd party displays sometimes UI elements may become black and unreadable. To resolve, select either the generic `Display` or `Display P3` Color Profiles in Display Settings.
 
-* Mainly applicable for HDMI Displays, DVI and DisplayPort are generally unaffected
+* Mainly applicable for HDMI Displays, DVI and DisplayPort are generally unaffected.
 * If you're inside Setup Assistant, press `Cmd` + `Option` + `Control` + `T` to launch Terminal. From there, run `open /System/Applications/System\ Preferences.app`
 
 
 | Default Color Profile | Display/Display P3 Profile |
 | :---                  | :---                       |
-| ![](../images/HD3000-Default-Colors.png) | ![](../images/HD3000-Display-Colors.png) |
+| ![](../images/HD3000-Default-Colors.png) | ![](../images/HD3000-Display-Colors.png) |

docs/BUILD.md

@@ -18,7 +18,7 @@ Here we'll select Build and Install OpenCore and start building:
 
 Once it finishes building, you'll want to select the Install OpenCore button:
 
-* If you created a macOS USB manually and don't see it listed, make sure it's either formatted as GUID/GPT or has a FAT32 partition for OpenCore to sit on
+* If you created a macOS USB manually and don't see it listed, make sure it's either formatted as GUID/GPT or has a FAT32 partition for OpenCore to reside on.
 
 
 | Select Drive | Select Partition |

docs/DEBUG.md

@@ -1,10 +1,10 @@
 # How to debug with OpenCore
 
-For those who've hit an odd bug and unsure if it's user error or patcher, we recommend asking on the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) for help.
+For those who've hit an odd bug and unsure if it's user error or within the patcher, we recommend asking on the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) for help.
 
 ## Debugging yourself
 
-The easiest way to debug yourself is via Patcher Settings. Here there are many different settings however the 3 main options that will help are:
+The easiest way to debug yourself is via Patcher Settings. Here there are many different settings, however, the 3 main options that will help are:
 
 * "Enable Verbose Mode"
 * "Enable OpenCore DEBUG"
@@ -38,7 +38,7 @@ From there, you'll have a log on your desktop.
 Currently issues have been disabled due to [current events](ISSUES-HOLD.md). You can continue to receive support in the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN), where there are active members of the community available.
 :::
 
-Now that you have proper logs, you can now [file issues with us](https://github.com/dortania/OpenCore-Legacy-Patcher/issues). Reminder we want the following info:
+Now that you have proper logs, you can now [file issues with us](https://github.com/dortania/OpenCore-Legacy-Patcher/issues). This is a reminder to include the following info:
 
 * Model patching for (ie. MacBookPro10,1)
 * Target OS (ie. macOS 11.2.3)

docs/DONATE.md

@@ -8,10 +8,6 @@ Main sections of help we'd appreciate:
 
 * Donating any Mac you own
   * Does require SSE4,1 CPU to test on Sierra and newer however
-* Donating any spare SATA SSDs
-  * Having extra SSDs on hand allows us to quickly and easily test specific builds of macOS without having to wipe drives and reinstall as much
-* Aiding by buying items in our Amazon Wishlist
-  * Currently we have a few members within Dortania testing so we recommend messaging the email listed below to see which member at the time would require something purchased the most
 
 Additionally, hardware info dumps are greatly beneficial for us to determine what patches a machine might need:
 

docs/INSTALLER.md

@@ -22,11 +22,13 @@ First we'll want to select the "Create macOS Installer" button. This will presen
 
 For this example, we'll assume you'll need an installer. Selecting this option will download Apple's Installer Catalogs and build a list for you to choose:
 
-| Downloading | Listed Installers |
-| :--- | :--- |
-| ![OCLP GUI Installer Download Catalog](../images/OCLP-GUI-Installer-Download-Catalog.png) | ![OCLP GUI Installer Download Listed Products](../images/OCLP-GUI-Installer-Download-Listed-Products.png) |
+| Downloading | Listed Installers | Unsupported Installer |
+| :--- | :--- | :--- |
+| ![OCLP GUI Installer Download Catalog](../images/OCLP-GUI-Installer-Download-Catalog.png) | ![OCLP GUI Installer Download Listed Products](../images/OCLP-GUI-Installer-Download-Listed-Products.png) | ![](../images/OCLP-GUI-Installer-Download-Unsupported.png)
 
-Since the patcher officially supports Big Sur and newer for patching, only those entires will be shown. For ourselves, we'll select 12.1 as that's the latest public release at the time of writing. This will download and install the macOS installer to your applications folder.
+Since the patcher officially supports Big Sur and newer for patching, only those entires will be shown. For ourselves, we'll select macOS 12 as that's the latest public release at the time of writing. This will download and install the macOS installer to your applications folder.
+
+* Note that some machines (namely 2012 and older) may not be currently supported on macOS Ventura. If you see this prompt, you'll need to use an older version of macOS.
 
 | Downloading the Installer | Requesting to install | Finished Installing |
 | :--- | :--- | :--- |

docs/LICENSE.md

@@ -1,4 +1,4 @@
-# OpenCore Legacy Patcher Licence
+# OpenCore Legacy Patcher License
 
 This patcher is made of multiple external applications from different people and organizations. See each program for their licensing:
 

docs/MODELS.md

@@ -1,6 +1,6 @@
 # Supported Models
 
-Any hardware supporting SSE4.1 CPU and 64-Bit firmware work on this patcher. To check your hardware model, run the below command on the applicable machine in terminal:
+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'
@@ -18,10 +18,12 @@ The below table will list all supported and unsupported functions of the patcher
 
 Regarding OS support, see below:
 
+* Machines listing `YES - Monterey and older` means they cannot run macOS Ventura at this time. Machines with only `YES` can run all of the supported macOS versions offered by OpenCore Legacy Patcher.
+
 | Support Entry | Supported OSes | Description | Comment |
 | :--- | :--- | :--- | :--- |
-| HostOS | macOS 10.9 - macOS 12 | 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.command` located in the repo |
-| TargetOS | macOS 11 - macOS 12 | 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. |
+| HostOS | macOS 10.9 - 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.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. |
 
 ### MacBook
 
@@ -30,27 +32,30 @@ Regarding OS support, see below:
 | 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 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Mavericks and newer<br/>- No Keyboard and Trackpad<br/>- No USB |
-| MacBook5,1 | Late 2008 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> |
-| MacBook5,2 | Early 2009 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- Trackpad is recognized as mouse |
-| MacBook6,1 | Late 2009 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> |
+| MacBook4,1 | Early 2008 | <span style="color:#30BCD5"> YES - Monterey and older</span> | - No GPU Acceleration in Mavericks and newer<br/>- No Keyboard and Trackpad<br/>- No USB |
+| MacBook5,1 | Late 2008 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md))|
+| MacBook5,2 | Early 2009 | ^^ | ^^ |
+| MacBook6,1 | Late 2009 | ^^ | ^^ |
 | MacBook7,1 | Mid-2010 | ^^ | ^^ |
-| MacBook8,1 | Mid-2015 | ^^ | <span style="color:green"> Everything is supported</span> |
+| MacBook8,1 | Mid-2015 | <span style="color:#30BCD5"> YES </span> | <span style="color:green"> Everything is supported</span> |
+| MacBook9,1 | Early 2016 | ^^ | ^^ |
 
 ### 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)) |
+| MacBookAir2,1 | Late 2008 | <span style="color:#30BCD5"> YES - Monterey and older</span> | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md))|
 | MacBookAir3,1 | Late 2010 | ^^ | ^^ |
 | MacBookAir3,2 | ^^ | ^^ | ^^ |
 | MacBookAir4,1 | Mid-2011 | ^^ | ^^ |
 | MacBookAir4,2 | ^^ | ^^ | ^^ |
-| MacBookAir5,1 | Mid-2012 |^^ | <span style="color:green"> Everything is supported</span> |
+| MacBookAir5,1 | Mid-2012 | <span style="color:#30BCD5"> YES </span> | <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 | ^^ | ^^ | ^^ |
 
 ### MacBook Pro
 
@@ -61,7 +66,7 @@ Regarding OS support, see below:
 | 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)) |
+| MacBookPro4,1 | Early 2008 | <span style="color:#30BCD5"> YES - Monterey and older</span> | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md))|
 | MacBookPro5,1 | Late 2008 | ^^ | ^^ |
 | MacBookPro5,2 | Early 2009 | ^^ | ^^ |
 | MacBookPro5,3 | Mid-2009 | ^^ | ^^ |
@@ -73,13 +78,19 @@ Regarding OS support, see below:
 | MacBookPro8,1 | Early 2011 | ^^ | ^^ |
 | MacBookPro8,2 | ^^ | ^^ | ^^ |
 | MacBookPro8,3 | ^^ | ^^ | ^^ |
-| MacBookPro9,1 | Mid-2012 | ^^ | <span style="color:green"> Everything is supported</span> |
+| MacBookPro9,1 | Mid-2012 | <span style="color:#30BCD5"> YES </span> | <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 | ^^ | ^^ | ^^ |
 
 ### Mac mini
 
@@ -87,13 +98,14 @@ Regarding OS support, see below:
 | :--- | :--- | :--- | :--- |
 | 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)) |
+| Macmini3,1 | Early 2009 | <span style="color:#30BCD5"> YES - Monterey and older</span> | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)) <br/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md)) |
 | Macmini4,1 | Mid-2010 | ^^ | ^^ |
 | Macmini5,1 | Mid-2011 | ^^ | ^^ |
 | Macmini5,2 | ^^ | ^^ | ^^ |
 | Macmini5,3 | ^^ | ^^ | ^^ |
-| Macmini6,1 | Late 2012 | ^^ | <span style="color:green"> Everything is supported</span> |
+| Macmini6,1 | Late 2012 | <span style="color:#30BCD5"> YES </span> | <span style="color:green"> Everything is supported</span> |
 | Macmini6,2 | ^^ | ^^ | ^^ |
+| Macmini7,1 | Mid-2014 | ^^ | ^^ |
 
 ### iMac
 
@@ -104,23 +116,26 @@ Regarding OS support, see below:
 | 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  |
-| iMac8,1 | Early 2008 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))) |
+| iMac7,1 | Mid-2007 | <span style="color:#30BCD5"> YES - Monterey and older</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/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md)) |
+| iMac8,1 | Early 2008 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108)))<br/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md))|
 | 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)) |
+| 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/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md))|
 | iMac11,1 | ^^ | ^^ | ^^ |
 | 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,1 | Late 2012 | <span style="color:#30BCD5"> YES </span> | <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 | ^^ | ^^ | 
+| 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)
 
@@ -130,16 +145,17 @@ Regarding OS support, see below:
 | :--- | :--- | :--- | :--- |
 | 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> | - Potential boot issues with built-in USB 1.1 ports (recommend using a USB 2.0 hub or dedicated USB PCIe controller)<br/>- Potential boot issues with stock Bluetooth card, recommend removing to avoid kernel panics |
-| MacPro4,1 | Early 2009 | ^^ | <span style="color:green"> Everything is supported as long as GPU is Metal capable </span> |
+| MacPro3,1 | Early 2008 | <span style="color:#30BCD5"> YES - Monterey and older</span> | - Potential boot issues with built-in USB 1.1 ports (recommend using a USB 2.0 hub or dedicated USB PCIe controller) <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/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md)) |
 | MacPro5,1 | Mid-2010, Mid-2012 | ^^ | ^^ |
+| MacPro6,1 | Late 2013 | ^^ | - CPU Power Management currently unsupported<br/> - No DRM support |
 
 ### 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> | <span style="color:green"> Everything is supported as long as GPU is Metal capable </span> |
+| Xserve2,1 | Early 2008 | <span style="color:#30BCD5"> YES - Monterey and older</span> | - Everything is supported as long as GPU is Metal capable <br/> - Supports macOS Monterey and older ([Ventura support in development](./VENTURA-DROP.md))|
 | Xserve3,1 | Early 2009 | ^^ | ^^ |
 
 # Once you've verified your hardware is supported, head to [Download and build macOS Installers](./INSTALLER.md)

docs/MONTEREY-DROP.md

@@ -1,7 +1,7 @@
 ![](../images/macos-monterey.png)
 
 With OpenCore Legacy Patcher v0.1.7 and newer, we've implemented beta macOS Monterey support for users. Please note that Apple has dropped a lot of hardware with this release as well as broken many of our previous patch sets. This page will be used to inform users regarding current issues and will be updated as new patch sets are developed and added to our patcher.
- 
+
 ## Newly dropped hardware
 
 With Monterey, Apple continues their their somewhat ruthless march of dropping Intel hardware. This release saw the removal, and thus addition into OpenCore Legacy Patcher, of the following models:
@@ -29,7 +29,7 @@ With Monterey, Apple continues their their somewhat ruthless march of dropping I
 * MacBook Pro (Retina, 13-inch, Mid 2014)
 * MacBook Pro (Retina, 15-inch, Mid 2014)
 
-::: 
+:::
 
 All of these models now have support in OpenCore Legacy Patcher.
 
@@ -43,7 +43,7 @@ Due to the display being routed through the NVIDIA Kepler card and macOS being r
 
 ::: details iMac15,1 5K Display Output Issue (Resolved in 0.3.2 and newer)
 
-* Documentation: 
+* Documentation:
   * [5K iMac and UEFI: Fixing the dreaded output limitation](https://khronokernel.github.io/macos/2021/12/08/5K-UEFI.html)
 * Associated Github Issue:
   * [5k Output issues on iMac15,1 (27" 5k iMac - 2014) #359](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/359)
@@ -79,7 +79,7 @@ The following models lost Wifi support in macOS Monterey due to their legacy Wir
   * MacBookPro6,x is exempt
 * MacPro5,1 and older
 
-Note: BCM943224, BCM94331, BCM94360 and BCM943602 are still fully support by OpenCore Legacy Patcher
+Note: BCM943224, BCM94331, BCM94360 and BCM943602 are still fully supported by OpenCore Legacy Patcher
 
 :::
 
@@ -96,7 +96,7 @@ The following models lost Bluetooth support in macOS Monterey due to their legac
 * MacBookPro8,1 and older
 * MacPro5,1 and older
 
-Note: Native BRCM20702 and BRCM20703 are still fully support by OpenCore Legacy Patcher
+Note: Native BRCM20702 and BRCM20703 are still fully supported by OpenCore Legacy Patcher
 
 ::: details Dropped Firmwares
 

docs/PATCHEXPLAIN.md

@@ -8,7 +8,7 @@ In our patcher, there are numerous patches used to ensure a stable system. Here
 
 ## OpenCore Settings
 
-Below is a run down of the main logic OpenCore Legacy Patcher uses to gain native support in macOS. Note OpenCore's configuration is documented within [OpenCorePkg](https://github.com/acidanthera/OpenCorePkg) as well as an online version provided by us:
+Below is a run down of the main logic OpenCore Legacy Patcher uses to gain native support in macOS. Note that OpenCore's configuration is documented within [OpenCorePkg](https://github.com/acidanthera/OpenCorePkg) as well as on an online version provided by us:
 
 * [OpenCorePkg Online Docs](https://dortania.github.io/docs/latest/Configuration.html)
 
@@ -17,7 +17,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
 ### ACPI -> Add
 
 * SSDT-CPBG
-  * Reason: Resolves Kernel Panic on Arrendale Macs in early Big Sur builds
+  * Reason: Resolves Kernel Panic on Arrandale Macs in early Big Sur builds
   * Logic: Disable dummy CPBG device in ACPI
   * Models: MacBookPro6,x and iMac11,x
 * SSDT-PCI
@@ -28,7 +28,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
   * Reason: Allows for software based deMUX disabling dGPUs in 2011 MacBook Pros
   * Logic: Sends power down request to dGPU via ACPI
   * Models: MacBookPro8,2 and MacBookPro8,3 with dead dGPUs
- 
+
 ### ACPI -> Patch
 
 * `EHCx` and `XHC1` Patches
@@ -39,13 +39,13 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
   * Reason: To be paired with SSDT-PCI
 * `_INI` to `XINI` Patch
   * Reason: To be paired with SSDT-DGPU
-  
+
 ### Booter -> Patch
 
 * Reroute `HW_BID` to `OC_BID`
   * Reason: Allows macOS installers to be used on unsupported models
   * Logic: Reroutes Board ID macOS checks to custom variable
-  * Models: All systems using VMM spoofing 
+  * Models: All systems using VMM spoofing
 
 ### Booter -> Quirks
 
@@ -146,7 +146,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
   * 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
-  
+
 :::
 
 ## Injected Kext
@@ -173,7 +173,7 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
   * Reason: Patches BlueTool to enable bluetooth functionality on Monterey
   * Models: All models with pre-BCM94360 wireless cards or 3rd-party chipsets
 * Bluetooth-Spoof
-  * Reason: Injects extra data into certain bluetooth chipsets for recognition by the system 
+  * Reason: Injects extra data into certain bluetooth chipsets for recognition by the system
   * Models: Models with the BCM2070 or BCM2046 chipsets
 * FeatureUnlock (Night Shift)
   * Reason: Patches CoreBrightness.framework to enable Night Shift on unsupported models
@@ -195,7 +195,7 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
   * Models: 2008 and older Marvel Ethernet require
 * CatalinaBCM5701Ethernet
   * Reason: Inject old Broadcom Ethernet kext to resolve networking in Big Sur
-  * Logic: Patch out conflicting symbols to not colide existing BCM5701Ethernet
+  * Logic: Patch out conflicting symbols to not collide existing BCM5701Ethernet
   * Models: 2011 and older Broadcom Ethernet require
 
 ### Maps
@@ -217,11 +217,11 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
 
 * IO80211HighSierra
   * Reason: Re-inject Atheros wifi drivers from High Sierra
-  * Logic: Patch out conflicting symbols to not colide existing IO80211Family
+  * Logic: Patch out conflicting symbols to not collide existing IO80211Family
   * Models: Atheros cards
 * IO80211Mojave
   * Reason: Re-inject Broadcom wifi drivers from Mojave
-  * Logic: Patch out conflicting symbols to not colide existing IO80211Family
+  * Logic: Patch out conflicting symbols to not collide existing IO80211Family
   * Models: BCM94322
 
 ### Misc

docs/POST-INSTALL.md

@@ -14,7 +14,7 @@ Once you've installed macOS through OpenCore, you can boot up and go through the
 * Install OpenCore to internal drive
 * Reboot holding Option, and select the internal EFI
 
-And voila! No more USB drive required
+And voila! No more USB drive required.
 
 ## Booting seamlessly without Verbose or OpenCore Picker
 
@@ -29,27 +29,27 @@ Here you can change different patcher settings, however the main interest is:
 * Show Boot Picker (GUI)
 * Set ShowPicker Mode (TUI)
 
-Once you've toggled them both off, build your OpenCore EFI once again and install to your desired drive. Now to show the OpenCore selector, you can simply hold down the "ESC" key while clicking on EFI boot, then you can release the "ESC" key when you see the cursor arrow at the top left.
+Once you've toggled them both off, build your OpenCore EFI once again and install to your desired drive. Now to show the OpenCore selector, you can simply hold down the "ESC" key while clicking on EFI boot, and then you can release the "ESC" key when you see the cursor arrow at the top left.
 
 ## Enabling SIP
 
-For many users, SIP will be enabled by default on build. For Intel HD 4000 users, you may have noticed that SIP is partially disabled. This is to ensure full compatibility with macOS Monterey and allow seamless booting between it and older OSes. However for users who do not plan to boot Monterey, you can re-enable under Patcher Settings.
+For many users, SIP will be lowered by default on build. For Intel HD 4000 users, you may have noticed that SIP is partially disabled. This is to ensure full compatibility with macOS Monterey and allow seamless booting between it and older OSes. However for users who do not plan to boot Monterey, you can re-enable under Patcher Settings.
 
-Note: Machines with non-Metal GPUs cannot enable SIP in Big Sur either due to patched root volume
+Note: Machines running macOS Ventura or systems with non-Metal GPUs cannot enable SIP outright, due to having a patched root volume. Enabling will brick the installation.
 
 | SIP Enabled | SIP Lowered (Root Patching) | SIP Disabled |
 | :--- | :--- | :--- |
 | ![](../images/OCLP-GUI-Settings-SIP-Enabled.png) | ![](../images/OCLP-GUI-Settings-SIP-Root-Patch.png) | ![](../images/OCLP-GUI-Settings-SIP-Disabled.png) |
 
-:::warning 
+:::warning
 
-If you're unsure whether you should enable SIP, leave as-is. Systems where you have already ran the Post Install Root Patching cannot enable SIP without potentially breaking the current install. 
+If you're unsure whether you should enable SIP, leave it as-is. Systems where you have already ran the Post Install Root Patching cannot enable SIP without potentially breaking the current install.
 
 :::
 
 ## Applying Post Install Volume Patches
 
-Post Install Volume Patches, sometimes also called root patches, are patches that have to be installed on disk for some older Macs to gain back functionality.
+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 v0.4.4 and higher include an autopatcher, which will automatically root patch your system but **only if the USB install media was created within OCLP.**
 
@@ -69,7 +69,7 @@ In OCLP v0.4.5 a new indicator was added to help users to see if, when and on wh
 
 ### Running Post Install patches manually
 
-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. 
+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.
 
 | Listing Patches | Patching Finished |
 | :--- | :--- |
@@ -78,13 +78,22 @@ If you're using OCLP v0.4.3 or earlier, or need to run the patcher manually, you
 
 :::warning
 
-With OpenCore Legacy Patcher versions prior to v0.4.4, Root Patching requires a network connection by default to grab associated resources. If your system is having difficulties with wifi or ethernet, you can grab the newest release :
+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:
 
-* [OpenCore Legacy Patcher releases](https://github.com/dortania/OpenCore-Legacy-Patcher/releases/latest)
+* [Apple's Developer Download Page](https://developer.apple.com/download/all/?q=Kernel%20Debug%20Kit)
+
+Grab the closet Kernel Debug Kit to the OS you installed, and install it to the machine running Ventura.
+
+Machines that require this are those with AMD Metal dGPUs:
+* 2008 - 2013 Mac Pros (MacPro3,1 - 6,1)
+* 2009 - 2016 iMacs (iMac10,1 - 17,1)
+* 2015 15" MacBook Pro with a dGPU (MacBookPro11,5)
 
 :::
 
-:::details Unsupported GPUs in macOS Big Sur
+Below entires represent GPUs no longer natively supported, ie. requiring root volume patch with OpenCore Legacy Patcher:
+
+:::details GPUs requiring patching in macOS Big Sur
 
 * NVIDIA:
   * Tesla (8000 - 300 series)
@@ -96,7 +105,7 @@ With OpenCore Legacy Patcher versions prior to v0.4.4, Root Patching requires a
 
 :::
 
-:::details Unsupported GPUs in macOS Monterey
+:::details GPUs requiring patching in macOS Monterey
 
 * NVIDIA:
   * Tesla (8000 - 300 series)
@@ -110,7 +119,7 @@ With OpenCore Legacy Patcher versions prior to v0.4.4, Root Patching requires a
 
 :::
 
-:::details Unsupported Wireless Cards in macOS Monterey
+:::details Wireless Cards requiring patching in macOS Monterey
 
 * Broadcom:
   * BCM94328
@@ -118,3 +127,18 @@ With OpenCore Legacy Patcher versions prior to v0.4.4, Root Patching requires a
 * Atheros
 
 :::
+
+:::details GPUs requiring patching in macOS Ventura
+
+* NVIDIA:
+  * Kepler (600 - 800 series)
+* AMD:
+  * GCN 1-3 (7000 - R9 series)
+  * Polaris (RX 4xx/5xx series, if CPU lacks AVX2)
+* Intel:
+  * Ivy Bridge (4000 series)
+  * Haswell (4400, 4600, 5000 series)
+  * Broadwell (6000 series)
+  * Skylake (500 series)
+
+:::

docs/START.md

@@ -1,15 +1,13 @@
 # What is OpenCore?
 
-This is a sophisticated boot loader used to inject and patch data in memory, instead of on disk. This means we're able to get near-native experience on many unsupported Macs. 
+OpenCore is a sophisticated boot loader used to inject and patch data in memory, instead of on disk. This means that we're able to achieve a near-native experience on many unsupported Macs. 
 
-* We recommend viewing the [OpenCore Patcher Terminology Page](./TERMS.md) if you have questions
-* For troubleshooting, join the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) and see our [Troubleshooting Page](./TROUBLESHOOTING.md)
+* We recommend viewing the [OpenCore Patcher Terminology Page](./TERMS.md) if you have questions.
+* For troubleshooting, join the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) and see our [Troubleshooting Page](./TROUBLESHOOTING.md).
 
 ## How do I get started?
 
-1. The first step of ensuring whether your model is supported is checking here:
-
-* [Supported Models](./MODELS.md)
+1. The first step of ensuring whether your model is supported is by checking the [Supported Models](./MODELS.md) page.
 
 2. [Download and build macOS Installer](./INSTALLER.md)
 3. [Run the `OpenCore-Patcher.app`](./BUILD.md)

docs/TERMS.md

@@ -16,14 +16,14 @@ Term | Description
 --- | ---
 **OpenCore**   | The new hotness on the scene, made with security in mind by the [Acidanthera team](https://github.com/acidanthera), has faster booting and lighter weight than previous boot managers. Supports many native Mac features such as SIP, FileVault, Secure Boot, etc
 **ACPI**   | Tables defined in your firmware defining your hardware and different methods, tied directly to how IOKit/IOService handles device setup
-**NVRAM**   | Non-volitile storage, where many variables are stored including default boot options, Hibernation keys, Secure Boot information, etc
+**NVRAM**   | Non-volatile storage, where many variables are stored including default boot options, Hibernation keys, Secure Boot information, etc
 ---
 Term | Description
 --- | ---
 **XNU**    | Also known as **X** is **N**ot **U**nix, XNU is referred to as macOS's "kernel" and the heart of what makes macOS tick
 **Kexts**   | Also known as **K**ernel **Ext**ensions, are macOS's drivers. They're used to perform different tasks like device drivers or for a different purpose (in this patcher) like patching the OS, injecting information or running tasks.
 **KernelCollection**   | Also known as the ImmutableKernel and PrelinkedKernel, this is a bundle of the kernel(XNU) and kernel extensions(Kexts) that we use to boot macOS. This is also what OpenCore patches in memory to allow us to have a seamless experience <br/>- PrelinkedKernel: Default caching system since 10.7 <br/>- ImmutableKernel: Secure Boot based caching system since 10.13 <br/>- KernelCollection: Merge of both Prelinked and ImmutableKernel's since macOS 11, Big Sur
-**IOKit**   | Backbone of how Kernel Extentions (Kexts) probe and attach onto hardware, starts quickly after kernel initates
+**IOKit**   | Backbone of how Kernel Extensions (Kexts) probe and attach onto hardware, starts quickly after kernel initiates
 **WindowServer**   | Backbone of the GUI interface in macOS, one of the first userfacing userspace programs to kick-in
 **OTA**   | Short for **O**ver **T**he **A**ir, refers to native OS updates via System Preferences like a supported Mac
 **DELTA**   | Often used with OTA, refers to OS updates that much smaller than full installers (generally ~3GB), note Deltas require the root volume to be unmodified otherwise ~12GB updates will occur.

docs/TESTED.md

@@ -1,6 +1,6 @@
 # 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.
+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
 
@@ -20,7 +20,7 @@ To aid users in troubleshooting, we've compiled a list of users who've reported
 ::: 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 | ^^ |
@@ -39,12 +39,12 @@ To aid users in troubleshooting, we've compiled a list of users who've reported
 ::: 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,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 |
@@ -62,7 +62,7 @@ To aid users in troubleshooting, we've compiled a list of users who've reported
 | ^^ | ^^ | LIPA85 | ^^ | ^^ | ^^ |
 | MacBookPro9,2 | <span style="color:#30BCD5"> YES </span> | alexx17xx | ^^ | ^^ | ^^ |
 | ^^ | ^^ | Arvxistanx | ^^ | ^^ | ^^ |
-| ^^ | ^^ | CyberDroid1 | ^^ | 0.0.16 | ^^ | 
+| ^^ | ^^ | CyberDroid1 | ^^ | 0.0.16 | ^^ |
 | ^^ | ^^ | woefi | Upgraded | 0.0.13 | Upgraded BCM94331CAX |
 | ^^ | ^^ | whgmkeller | Stock | 0.0.11 | N/A |
 | ^^ | ^^ | vinaypundith | Unknown | 0.0.7 | ^^ |
@@ -79,13 +79,13 @@ To aid users in troubleshooting, we've compiled a list of users who've reported
 ::: 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. | 
+| ^^ | ^^ | 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 | ^^ |
@@ -99,7 +99,7 @@ To aid users in troubleshooting, we've compiled a list of users who've reported
 ::: 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 | ^^ | ^^ | ^^ |
@@ -128,7 +128,7 @@ To aid users in troubleshooting, we've compiled a list of users who've reported
 ::: 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 |

docs/TROUBLESHOOTING.md

@@ -2,6 +2,7 @@
 
 Here are some common errors 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)
 * [Cannot boot macOS without the USB](#cannot-boot-macos-without-the-usb)
 * [Infinite Recovery OS Booting](#infinite-recovery-os-reboot)
@@ -20,27 +21,36 @@ Here are some common errors users may experience while using this patcher:
 * [No acceleration after a Metal GPU swap on Mac Pro](#no-acceleration-after-a-metal-gpu-swap-on-mac-pro)
 
 
+
+## OpenCore Legacy Patcher not launching
+
+If the application won't launch (e.g. icon will bounce in the Dock), try launching OCLP via Terminal by typing the following command, make sure you've moved the app to `/Applications` before this.
+
+```sh
+/Applications/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher
+```
+
 ## Stuck on `This version of Mac OS X is not supported on this platform`
 
-This means macOS has detected a SMBIOS it does not support, to resolve this ensure you're booting OpenCore **before** the macOS installer in the boot picker. Reminder the option will be called `EFI Boot`
+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 NVRAM reset or you remove the drive with OpenCore installed.
+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.
 
 ## 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 but select your internal drive.
+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.
 
 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.
 
 ## Infinite Recovery OS Booting
 
-With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates work correctly and reliably with Big Sur. However this installs NVRAM variables that will confuse your Mac if not running with OpenCore. To resolve, simply uninstall OpenCore and [reset NVRAM](https://support.apple.com/en-mide/HT201255).
+With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates work correctly and reliably with Big Sur. However this installs NVRAM variables that will confuse your Mac if not running with OpenCore. To resolve this, simply uninstall OpenCore and [reset NVRAM](https://support.apple.com/en-mide/HT201255).
 
-* Note: Machines with modded root volumes will also result in infinite recovery until integrity is restored
+* Note: Machines with modded root volumes will also result in an infinite recovery loop until integrity is restored.
 
 ## Reboot when entering Hibernation (`Sleep Wake Failure`)
 
-[Known issue on some models](https://github.com/dortania/Opencore-Legacy-Patcher/issues/72), temporary fix is to disable Hibernation:
+[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:
 
 ```
 sudo pmset -a hibernatemode 0
@@ -48,58 +58,57 @@ 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:
+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 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"
+* 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.
+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
 
-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" inside OpenCore's Picker to list all boot options.
+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.
 
 ## Stuck on "Your Mac needs a firmware update"
 
 Full error: "Your Mac needs a firmware update in order to install to this Volume. Please select a Mac OS Extended (Journaled) volume instead."
 
-This error occurs when macOS determines the firmware to not have full APFS support. To resolve is quite simple, when building OpenCore head to "Patcher Settings" and enable "Moderate SMBIOS Patching" or higher. This will ensure that the firmware reported will show as supporting full APFS capabilities.
+This error occurs when macOS determines that the current firmware does not have full APFS support. To resolve this, when installing OpenCore, head to "Patcher Settings" and enable "Moderate SMBIOS Patching" or higher. This will ensure that the firmware reported will show support for full APFS capabilities.
 
 ## No Brightness Control
 
-With OCLP v0.0.22, we've added support for brightness control on many models. However some users may have noticed that their brightness keys do not work.
+With OCLP v0.0.22, we've added support for brightness control on many models. However, some users may have noticed that their brightness keys do not work.
 
-To work-around, we recommend user try out the below app:
+As a work-around, we recommend users try out the below app:
 
 * [Brightness Slider](https://actproductions.net/free-apps/brightness-slider/)
 
 ## Cannot connect Wi-Fi on Monterey with legacy cards
 
-With OCLP v0.2.5, we've added support for legacy Wi-Fi on Monterey. However some users may have noticed that they can't connect to wireless networks.
+With OCLP v0.2.5, we've added support for legacy Wi-Fi on Monterey. However, some users may have noticed that they can't connect to wireless networks.
 
-To work-around, we recommend users to manually connect using the "other" option on the Wi-Fi menu bar or manually adding the network on the "Network" preference pane.
+To work-around this, we recommend that users manually connect using the "other" option in the Wi-Fi menu bar or manually adding the network in the "Network" preference pane.
 
 ## No Graphics Acceleration
 
+In macOS, GPU drivers are often dropped from the OS with each major release of it. With macOS Big Sur, currently all non-Metal GPUs require additional patches to gain acceleration. In addition, macOS Monterey removed Graphics Drivers for both Intel Ivy Bridge and NVIDIA Kepler graphics processors. 
 
-In macOS, each release generally means GPU drivers are dropped from the OS. With macOS Big Sur, currently all non-Metal GPUs require additional patches to gain acceleration. In addition, macOS Monterey removed Graphics Drivers for both Intel Ivy Bridge and NVIDIA Kepler. 
-
-If you're using OCLP v0.4.4, you should have been prompted to install Root Volume patches after first boot from installation of macOS. If you need to do this manually, you can within our app. Once rebooted, acceleration will be re-enabled as well as brightness control for laptops.
+If you're using OCLP v0.4.4, you should have been prompted to install Root Volume patches after the first boot from installation of macOS. If you need to do this manually, you can do so within the patcher app. Once rebooted, acceleration will be re-enabled as well as brightness control for laptops.
 
 ## Black Screen on MacBookPro11,3 in macOS Monterey
 
 Due to Apple dropping NVIDIA Kepler support in macOS Monterey, [MacBookPro11,3's GMUX has difficulties switching back to the iGPU to display macOS correctly.](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/522) To work-around this issue, boot the MacBookPro11,3 in Safe Mode and once macOS is installed, run OCLP's Post Install Root Patches to enable GPU Acceleration for the NVIDIA dGPU.
 
-* Safe Mode can be started by holding Shift+Enter when selecting macOS Monterey in OCLP's Boot Menu.
+* Safe Mode can be started by holding `Shift` + `Enter` when selecting macOS Monterey in OCLP's Boot Menu.
 
 ## No DisplayPort Output on Mac Pros with NVIDIA Kepler
 
-If you're having troubles with DisplayPort output on Mac Pros, try enabling Minimal Spoofing in Settings -> SMBIOS Settings and rebuild/install OpenCore. This will trick macOS drivers into thinking you have a newer MacPro7,1 and play nicer.
+If you're having trouble with DisplayPort output on Mac Pros, try enabling Minimal Spoofing in Settings -> SMBIOS Settings and rebuild/install OpenCore. This will trick macOS drivers into thinking you have a newer MacPro7,1 and resolve the issue.
 
 ![](../images/OCLP-GUI-SMBIOS-Minimal.png)
 
@@ -111,17 +120,17 @@ A semi-common popup some users face is the "Volume Hash Mismatch" error:
 <img src="../images/Hash-Mismatch.png">
 </p>
 
-What this error signifies is that the OS detects the boot volume's hash does not match to what the OS detects, this error is generally cosmetic and can be ignored. However if your system starts to crash spontaneously shortly after, you'll want to reinstall macOS fresh without importing any data at first.
+What this error signifies is that the OS detects that the boot volume's hash does not match what the OS is expecting, this error is generally cosmetic and can be ignored. However if your system starts to crash spontaneously shortly after, you'll want to reinstall macOS fresh without importing any data at first.
 
 * Note that this bug affects native Macs as well and is not due to issues with unsupported Macs: [OSX Daily: “Volume Hash Mismatch” Error in MacOS Monterey](https://osxdaily.com/2021/11/10/volume-hash-mismatch-error-in-macos-monterey/)
 
-Additionally it can help to disable FeatureUnlock in Settings -> Misc Settings as this tool can be strenuous on systems with weaker memory stability.
+Additionally, it can help to disable FeatureUnlock in Settings -> Misc Settings as this tool can be strenuous on systems with weaker memory stability.
 
 ## Cannot Disable SIP in recoveryOS
 
-With OCLP, the patcher will always overwrite the current SIP value on boot to ensure that users don't brick an installation after NVRAM reset. However for users wanting to disable SIP entirely, this can be done easily.
+With OCLP, the patcher will always overwrite the current SIP value on boot to ensure that users don't brick an installation after an NVRAM reset. However, for users wanting to disable SIP entirely, this can be done easily.
 
-Head into the GUI, Patcher Settings and toggle the bits you need disabled from SIP:
+Head into the GUI, go to Patcher Settings, and toggle the bits you need disabled from SIP:
 
 | SIP Enabled | SIP Lowered (Root Patching) | SIP Disabled |
 | :--- | :--- | :--- |
@@ -136,19 +145,19 @@ For those experiencing issues with USB 1.1 devices (such as mice, keyboards and
 
 Because of this, we recommend placing a USB 2.0/3.0 hub between your devices and the port on the Mac Pro. UHCI and EHCI cannot both be used at once, so using a USB hub will always force the EHCI controller on.
 
-* Alternatively, you can try cold starting the hardware and see if macOS recognizes the UHCI controller properly
+* Alternatively, you can try cold-starting the hardware and see if macOS recognizes the UHCI controller properly.
 
 ## Stuck on "Less than a minute remaining..."
 
-A common area for systems to get "stuck", namely for units that are missing the `AES` CPU instruction/older mobile hardware. During this stange a lot of heavy cryptography is performed, which can make systems appear to be stuck when in reality they are working quite hard to finish up the installation. 
+A common area for systems to get "stuck", namely for units that are missing the `AES` CPU instruction/older mobile hardware. During this stage, a lot of heavy cryptography is performed, which can make systems appear to be stuck. In reality they are working quite hard to finish up the installation.
 
-Because this step can take a few hours or more depending on drive speeds, be patient at this stage and do not manually reboot your machine as this will break the installation and require you to reinstall. If you think your system has stalled, press the Caps Lock key. If the light turns on, your system is busy.
+Because this step can take a few hours or more depending on drive speeds, be patient at this stage and do not manually power off or reboot your machine as this will break the installation and require you to reinstall. If you think your system has stalled, press the Caps Lock key. If the light turns on, your system is busy.
 
 ## No acceleration after a Metal GPU swap on Mac Pro
 
 If you finished installing Monterey with the original card installed (to see bootpicker for example) and swapped your GPU to a Metal supported one, you may notice that you're missing acceleration. To fix this, open OCLP and revert root patches to get your Metal-supported GPU work again.
 
-Alternatively, you can remove "AutoPkg-Assets.pkg" from /Library/Packages on the USB drive before proceeding with the installation. To see the folder, enable hidden files with `Command` + `Shift` + `.` 
+Alternatively, you can remove "AutoPkg-Assets.pkg" from /Library/Packages on the USB drive before proceeding with the installation. To see the folder, enable hidden files with `Command` + `Shift` + `.`
 
-The reason for this is that the autopatcher will assume you will be using the original card and therefore does non-metal patching, which includes removing some drivers for other cards. This causes Metal cards to not accelerate when swapped.
+The reason for this is that the autopatcher will assume that you will be using the original graphics card and therefore does non-metal patching, which includes removing some drivers for other cards. This causes Metal cards to not accelerate after swapping.
 

docs/UNINSTALL.md

@@ -1,13 +1,14 @@
 # Uninstalling OpenCore
 
-To remove OpenCore is actually quite simply:
+To remove OpenCore:
 
 1. Remove OpenCore either from the USB or internal drive
 
-* You'll need to mount the drive's EFI partition, and delete the `EFI/OC` and `System` folders
-  * Note **do not** delete the entire EFI folder, this will likely break any existing Windows and Linux installations
-  * [See here for an example on how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
+  * You'll need to mount the drive's EFI partition, and delete the `EFI/OC` and `System` folders
+    * Note: **Do not** delete the entire EFI folder, this will likely break any existing Windows and Linux installations.
+    * [See here for an example on how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
+    * For 5k iMac users, you will also need to delete `boot.efi` on the root of the EFI partition.
 
 2. [Reset NVRAM](https://support.apple.com/HT204063)
 
-Know 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.
+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.

docs/UNIVERSALCONTROL.md

@@ -1,8 +1,9 @@
+
 # Universal Control on unsupported Macs
 
-Introduced in macOS 12 Monterey, Universal Control is a feature that allows a Mac to control other Macs and/or iPads, share input devices, and share files across them simultaneously. With OpenCore and FeatureUnlock, Universal Control can be unlocked for most unsupported Macs, so long as they meet the technical requirements.
+Introduced in macOS 12 Monterey, Universal Control is a feature that allows a Mac to control other Macs and/or iPads, share input devices, and share files across them simultaneously. With OpenCore and FeatureUnlock, Universal Control can be unlocked for most unsupported Macs, as long as they meet the technical requirements listed on this page.
 
-* Note: Following page is primarily for hobbiests, no proper support is provided outside of Discord support (see bottom of page)
+* Note: The following page is primarily for tinkerers, no proper support is provided outside of Discord support (see bottom of page).
 
 ## Enabling Universal Control
 
@@ -14,7 +15,7 @@ If you meet all the requirements, in most cases you can go to Display Preference
 | ![](../images/UC-enable-1.png) | ![OCLP GUI Build Finished](../images/UC-enable-2.png) |
 
 
-Most Macs 2011 and above should work out of the box. However, older Macs like 2008-2011 MacBook Pro's require upgrading to a newer Wi-Fi/Bluetooth card. More info in the [requirements section.](#requirements-for-universal-control)
+Most Mac models from 2011 and above should work out of the box. However, older Macs like the 2008-2011 MacBook Pros require upgrading the Wi-Fi/Bluetooth card to a newer model. More info in the [requirements section.](#requirements-for-universal-control)
 
 Some Monterey-native models are blacklisted, check the [blacklisted models section](#blacklisted-models) for more info.
 
@@ -28,33 +29,34 @@ Technical requirements:
 * iPadOS 15.4 or newer (if applicable)
 * OpenCore Legacy Patcher 0.4.3 or newer
 
-Check the [table of models](#table-of-models) below whether you need to upgrade hardware and exactly what hardware is required to be changed based on the offending Macs. Refer for help on how to upgrade the Wi-Fi card on older 2008-2011 models on the Discord channel [#hardware](https://discord.gg/rqdPgH8xSN) if required.
+Check the [table of models](#table-of-models) below to see whether you need to upgrade hardware and exactly what hardware is required to be changed based on the offending Macs listed. For help on how to upgrade the Wi-Fi card in older 2008-2011 models, refer to the Discord channel [#hardware](https://discord.gg/rqdPgH8xSN) if required.
 
 
 
 Other requirements:
 
-* All devices signed into the same iCloud account.
-* Two Factor Authentication enabled with your Apple ID.
-* Bluetooth and WiFi enabled, neither needs to be connected so long as they are enabled.
+* All devices are signed into the same iCloud account.
+* Two Factor Authentication is enabled with your Apple ID.
+* Bluetooth and WiFi are enabled. Neither needs to be connected, leaving them enabled is sufficient.
 * Handoff turned on from iCloud settings.
-* The devices in question to be in close proximity.
+* The devices in question are in close proximity.
 
 
 ### Table of models
 
-This table shows which models do and don't support Universal Control out of box (OOB) and what is required to gain support.
+This table shows which models do and do not support Universal Control out of box (OOB) and what is required to gain support.
+Note: For AirPort upgrades, only the best/newest cards are listed.
 
 ::: details MacBook
 
 |   SMBIOS   | WiFi/BT version | UC OOB  | Comment |
 |------------|-----------------|------------|---------|
-| MacBook4,1 | Wi-Fi 4 / BT 2.0 EDR |  <span style="color:red"> NO </span> | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360 |
-| MacBook5,1 | ^^ |  ^^ | ^^ |
-| MacBook5,2 | WiFi 4 / BT 2.1 EDR  | ^^ | ^^ |
-| MacBook6,1 | ^^ | ^^ | Upgrade to BCM94360 |
+| 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,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 | ^^ | ^^ | ^^ |
-| MacBook8,1 | WiFi 5 + BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
+| MacBook8,1 | WiFi 4 + BT 4.2 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 
 :::
 
@@ -62,8 +64,8 @@ This table shows which models do and don't support Universal Control out of box
 
 | SMBIOS | WiFi/BT version | UC OOB  | Comment |
 |--------|-----------------|------------|---------|
-| MacBookAir2,1 | Wi-Fi 4 / BT 2.1 EDR | <span style="color:red"> NO </span> | Replace the card with BCM94360 and disconnect/disable the BT module. |
-| MacBookAir3,1 | ^^ | ^^ | ^^ |
+| MacBookAir2,1 | Wi-Fi 4 / BT 2.1 EDR | <span style="color:red"> NO </span> | Use a Broadcom USB Bluetooth 4.0+ Dongle |
+| MacBookAir3,1 | ^^ | ^^ | Replace stock AirPort card with a BCM94360CS2 card |
 | MacBookAir3,2 | ^^ | ^^ | ^^ |
 | MacBookAir4,1 | Wi-Fi 4 +  BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 | MacBookAir4,2 | ^^ | ^^ | ^^ |
@@ -81,16 +83,16 @@ This table shows which models do and don't support Universal Control out of box
 
 | SMBIOS | WiFi/BT version | UC OOB   | Comment |
 |--------|-----------------|-------------|---------|
-| MacBookPro4,1 | Wi-Fi 4   /   BT 2.1 EDR | <span style="color:red"> NO </span> | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360 |
-| MacBookPro5,1 | ^^ | ^^ | Upgrading to BCM94331 requires some heavy case hardware modifications, so instead use a USB BT 4.0 dongle |
+| MacBookPro4,1 | Wi-Fi 4   /   BT 2.1 EDR | <span style="color:red"> NO </span> | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CS2 card |
+| MacBookPro5,1 | ^^ | ^^ | Use a Broadcom USB Bluetooth 4.0+ Dongle |
 | MacBookPro5,2 | ^^ | ^^ | ^^ |
 | MacBookPro5,3 | ^^ | ^^ | ^^ |
 | MacBookPro5,4 | ^^ | ^^ | ^^ |
 | MacBookPro5,5 | ^^ | ^^ | ^^ |
 | MacBookPro6,1 | ^^ | ^^ | ^^ |
-| MacBookPro6,2 | ^^ | ^^ | ^^ |
-| MacBookPro7,1 | ^^ | ^^ | ^^ |
-| MacBookPro8,1 | Wi-Fi 4 + BT 2.1 EDR | ^^ | Upgrade to BCM94331 |
+| MacBookPro6,2 | ^^ | ^^ | Replace stock AirPort card with a BCM94331PCIEBT4CAX/BCM94331PCIEBT4 card |
+| MacBookPro7,1 | ^^ | ^^ | Use a Broadcom USB Bluetooth 4.0+ Dongle |
+| MacBookPro8,1 | Wi-Fi 4 + BT 2.1 EDR | ^^ | Replace stock AirPort card with a BCM94331PCIEBT4CAX/BCM94331PCIEBT4 card |
 | MacBookPro8,2 | ^^ | ^^ | ^^ |
 | MacBookPro9,1 | Wi-Fi 4 + BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 | MacBookPro9,2 | ^^ | ^^ | ^^ |
@@ -108,8 +110,8 @@ This table shows which models do and don't support Universal Control out of box
 
 | SMBIOS | WiFi/BT version | UC OOB | Comment |
 |--------|-----------------|------------|---------|
-| Macmini3,1 | Wi-Fi 4 + BT 2.1 EDR  |  <span style="color:red"> NO </span>  | Upgrade requires some heavy electrical and case modifications, so instead used a USB BT 4.0 dongle. |
-| Macmini4,1 | ^^ |  ^^ | Upgrade to BCM94360. |
+| Macmini3,1 | Wi-Fi 4 + BT 2.1 EDR  |  <span style="color:red"> NO </span>  | Upgrade requires some heavy electrical and case modifications, so instead used a Broadcom USB Bluetooth 4.0+ Dongle. |
+| Macmini4,1 | ^^ |  ^^ | ^^ |
 | Macmini5,1 | Wi-Fi 4 + BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 | Macmini5,2 | ^^ | ^^ | ^^ |
 | Macmini5,3 | ^^ | ^^ | ^^ |
@@ -117,21 +119,21 @@ This table shows which models do and don't support Universal Control out of box
 | Macmini6,2 | ^^ | ^^ | ^^ |
 | Macmini7,1 | Wi-Fi 5 + BT 4.0 | <span style="color:red"> NO </span> | Hardware supports UC. <br> [**Spoofing required.**](#blacklisted-models) |
 
-::: 
+:::
 
 
 :::details iMac
 
 |  SMBIOS  | WiFi/BT version | UC OOB | Comment |
 |----------|-----------------|------------|---------|
-| iMac7,1  | Wi-Fi 4 + BT 2.0 EDR  | <span style="color:red"> NO </span> | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360 (soldering required for BT)
+| iMac7,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 BCM94360CD card
 | iMac8,1  | ^^ | ^^ | ^^ |
 | iMac9,1  | Wi-Fi 4 / BT 2.1 EDR  | ^^ | ^^ |
 | iMac10,1 | ^^ | ^^ | ^^ |
 | iMac11,1 | ^^ | ^^ | ^^ |
 | iMac11,2 | ^^ | ^^ | ^^ |
 | iMac11,3 | ^^ | ^^ | ^^ |
-| iMac12,1 | ^^ | ^^ | ^^ |
+| iMac12,1 | ^^ | ^^ | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM943602CD card
 | iMac12,2 | ^^ | ^^ | ^^ |
 | iMac13,1 | Wi-Fi 4 + BT 4.0 | <span style="color:#30BCD5"> YES </span> | Universal Control will work. |
 | iMac13,2 | ^^ | ^^ | ^^ |
@@ -144,21 +146,32 @@ This table shows which models do and don't support Universal Control out of box
 | iMac16,1 | Wi-Fi 5 + BT 4.2 | <span style="color:red"> NO </span> | Hardware supports UC. <br> [**Spoofing required.**](#blacklisted-models) |
 | iMac16,2 | ^^ | ^^ | ^^ |
 
-::: 
+:::
 
 :::details Mac Pro
 
 | SMBIOS    | WiFi/BT version | UC OOB  | Comment |
 |-----------|-----------------|---------|---------|
-| MacPro3,1 | Wi-Fi 4 + BT 2.0 EDR | <span style="color:red"> NO </span> | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360. |
-| MacPro4,1 | Wi-Fi 4 + BT 2.1 EDR | ^^ | Use the Mac Pro Wi-Fi upgrade kit to upgrade to BCM94360 (soldering required for BT) |
+| MacPro3,1 | Wi-Fi 4 + BT 2.0 EDR | <span style="color:red"> NO </span> | Replace stock AirPort card with an mPCIE Adapter board with a BCM943602CD card |
+| MacPro4,1 | Wi-Fi 4 + BT 2.1 EDR | ^^ | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM943602CD card |
 | MacPro5,1 | ^^ | ^^ | ^^ |
 | MacPro6,1 | Wi-Fi 5 + BT 4.0 | ^^ | Hardware supports UC. <br> [**Spoofing required.**](#blacklisted-models) |
 
 * Note: Some older Mac Pro configurations may not have shipped with a WiFi card in the base model
 
 
-::: 
+:::
+
+
+:::details Xserve ;p
+
+| SMBIOS    | WiFi/BT version | UC OOB  | Comment |
+|-----------|-----------------|---------|---------|
+| Xserve2,1 | N/A | <span style="color:red"> NO </span> | Install a PCIe BCM943602CD card |
+| Xserve3,1 | ^^ | ^^ | ^^ |
+
+:::
+
 ## Blacklisted models
 
 The following models are blacklisted from using Universal Control by Apple:
@@ -171,9 +184,9 @@ The following models are blacklisted from using Universal Control by Apple:
 - Macmini7,x - Mac mini 2014
 - MacPro6,x - Mac Pro Late 2013
 
-The hardware in these models is capable but due to blacklisting, the only solution to use Universal Control on the models above is to spoof their SMBIOS. SMBIOS spoofing essentially fools some aspects of macOS to think they are running on a different machine. 
+The hardware in these models are capable of supporting Universal Control, but due to blacklisting, the only solution to use Universal Control on these models is to spoof their SMBIOS. SMBIOS spoofing essentially fools some aspects of macOS to think they are running on a different machine. 
 
-With SMBIOS Spoofing, the Universal Control handshake recognizes a different SMBIOS and thus grants a blacklisted Mac to connect to other iPads and Macs with Universal Control.
+With SMBIOS Spoofing, the Universal Control handshake recognizes a different SMBIOS and thus grants a blacklisted Mac to connect to other Macs and iPads with Universal Control.
 
 | Situation | Condition | Solution |
 |-----------|-----------|---------|
@@ -184,17 +197,56 @@ With SMBIOS Spoofing, the Universal Control handshake recognizes a different SMB
 
 :::warning
 
-Before we continue, please keep in mind SMBIOS Spoofing is an advanced feature of OpenCore, that with reckless usage of it, could potentially screw things around and leave your installation non-working. Once you boot into a spoofed state, it is highly recommended you stay spoofed, and avoid booting macOS without OpenCore.
+Before we continue, please keep in mind that SMBIOS Spoofing is an advanced feature of OpenCore. Reckless usage of it could potentially break important functionality and leave your installation in a non-working state. Once you boot into a spoofed state, it is highly recommended that you stay spoofed, and avoid booting macOS without OpenCore.
 
 :::
 
 ### How to spoof
 
-Firstly, run the GUI version of OpenCore Legacy Patcher, go to **Settings** and tick **Allow native models**.
+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.
 
-**Note:** Unless you are building OpenCore on a different machine than it's targeted for, **do not** change the model in this main settings view. It is important to understand that OCLP targets this model regardless of what you may have spoofed to, as your Mac is still what the Native SMBIOS shows.
+::: details macOS Ventura
 
-Secondly, go to **SMBIOS Settings**, tick **Allow Native Spoofs**, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model to **one next to your native model in the table for spoofed models below.**
+Firstly run the GUI version of OpenCore Legacy Patcher. 
+
+Then go to **Settings**, go to **SMBIOS Settings**, 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 Ventura 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 Ventura support should work, but these are the earliest Macs natively supported by Ventura 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 | 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 |
+
+:::
+
+::: details macOS Monterey
+
+Firstly, run the GUI version of OpenCore Legacy Patcher. Secondly, go to **Settings** and tick **Allow native models**.
+
+Then, go to **SMBIOS Settings**, tick **Allow Native Spoofs**, set SMBIOS Spoof Level to **Moderate**. Set SMBIOS Spoof Model to **one listed next to your native model in the table for spoofed models below.**
+
+
+| Main Settings view | SMBIOS settings |
+| :--- | :--- |
+| ![](../images/OCLP-allow-native-models.png) | ![](../images/OCLP-smbios-settings.png) |
 
 
 ::: details Table for spoofed models (click to expand)
@@ -208,20 +260,17 @@ Any model after the list of officially blacklisted Macs should be supported, but
 |-------------|---------------|--------------|--------|-----------|
 | 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 | ^^ | ^^ 
+| 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 |
 
 :::
 
-| Main Settings view | SMBIOS settings |
-| :--- | :--- |
-| ![](../images/OCLP-allow-native-models.png) | ![](../images/OCLP-smbios-settings.png) |
+**Note:** Unless you are building OpenCore on a different machine than it's targeted for, **do not** change the model in the main settings view. It is important to understand that OCLP targets this model regardless of what you may have spoofed to, as your Mac is still what the Native SMBIOS shows.
 
-
-Build and install OpenCore again, reboot back to the OS. Enable Universal Control as explained in [Enabling Universal Control section.](#enabling-universal-control)
+Lastly, Build and install OpenCore again, and reboot back to the OS. Enable Universal Control as explained in the [Enabling Universal Control section.](#enabling-universal-control)
 
 
 
-You should now be prompted to log back into iCloud by your Mac. This means you were successful, otherwise, verify you are correctly following the steps listed above, or else ask on the Discord group for assistance on [#misc-help](https://discord.gg/rqdPgH8xSN).
+You should now be prompted to log back into iCloud by your Mac. If you get this prompt, you have successfully configured SMBIOS spoofing. Otherwise, verify that you have correctly followed the steps listed above, or ask on the Discord server for further assistance in [#misc-help](https://discord.gg/rqdPgH8xSN).

docs/UPDATE.md

@@ -1,14 +1,14 @@
 # Updating OpenCore and Patches
 
-With OpenCore Legacy Patcher, generally there's very little reason for users to update the OpenCore installed on their machine unless you feel there's a benefit with new versions for your setup, e.g. Bluetooth has stopped working with a new macOS update. 
+With OpenCore Legacy Patcher, there's generally very little reason for users to update the OpenCore installation on their machine unless you feel there's a benefit with new versions for your setup, e.g. Bluetooth has stopped working with a new macOS update. 
 
-For those who do wish to update, it's actually quite easy. Simply [download the latest release](https://github.com/dortania/OpenCore-Legacy-Patcher/releases) and rerun the patcher:
+For those who do wish to update, simply [download the latest release](https://github.com/dortania/OpenCore-Legacy-Patcher/releases) and rerun the patcher:
 
 ![](../images/OCLP-GUI-Main-Menu.png)
 
-Then simply rebuild your OpenCore build and install again. Then voila, OpenCore is updated!
+Then, rebuild your OpenCore build and install again. OpenCore Will now be updated!
 
-To check what version of OpenCore and Patcher version you're currently running, you can run the following in terminal:
+To check what version of OpenCore and the Patcher you're currently running, you can run the following in the terminal:
 
 ```bash
 # OpenCore Version
@@ -19,4 +19,4 @@ nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:OCLP-Version
 
 ![](../images/oclp-version.png)
 
-From this, we can see we're running a RELEASE version of OpenCore 0.6.8 built on March 27th, 2021 with Patcher Version 0.0.20!
+From this, we can see that we're running a RELEASE version of OpenCore 0.6.8 built on March 27th, 2021 with Patcher Version 0.0.20!

docs/VENTURA-DROP.md

@@ -0,0 +1,146 @@
+![](../images/ventura.png)
+
+With the release of OpenCore Legacy Patcher v0.5.0 and newer, early support for macOS Ventura has been implemented for most Metal-capable Macs. This page will be used to inform users regarding current issues and will be updated as new patch sets are developed and added to our patcher.
+
+## Newly dropped hardware
+
+Ventura's release dropped a large amount of Intel hardware, thus requiring the usage of OpenCore Legacy Patcher on the following models (in addition to previously removed models):
+
+* iMac16,1 (21.5-inch, Late 2015)
+* iMac16,2 (21.5-inch 4K, Late 2015)
+* iMac17,1 (27-inch 5K, Late 2015)
+* MacBook9,1 (12-inch, Early 2016)
+* MacBookAir7,1 (11-inch, Early 2015)
+* MacBookAir7,2 (13-inch, Early 2015)
+* MacBookPro11,4 (15-inch, Mid 2015, iGPU)
+* MacBookPro11,5 (15-inch, Mid 2015, dGPU)
+* MacBookPro12,1 (13-inch, Early 2015)
+* MacBookPro13,1 (13-inch, Late 2016)
+* MacBookPro13,2 (13-inch, Late 2016)
+* MacBookPro13,3 (15-inch, Late 2016)
+* Macmini7,1 (Late 2014)
+* MacPro6,1 (Late 2013)
+
+
+## Current status
+
+Overall, macOS Ventura is useable on most Metal-capable machines (ie. 2012 and newer). The graphics patches implemented have near feature parity to macOS Monterey, with patches still being under heavy development. See [Legacy Metal Graphics Support and macOS Ventura #1008](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1008) issue for more information.
+
+<img width="625" alt="" src="../images/OCLP-051-Initial-Support.png">
+
+For older hardware, see below sections:
+
+* [Currently Unsupported/Broken Hardware in Ventura](#currently-unsupportedbroken-hardware-in-ventura)
+  * [AMD Polaris, Vega and Navi support on pre-2019 Mac Pros and pre-2012 iMacs](#amd-polaris-vega-and-navi-support-on-pre-2019-mac-pros-and-pre-2012-imacs)
+  * [Non-Metal Graphics Acceleration](#non-metal-graphics-acceleration)
+  * [Legacy Wireless Support](#legacy-wireless-support)
+  * [USB 1.1 (OHCI/UHCI) Support](#usb-11-ohciuhci-support)
+  * [Ethernet issue with Early 2008 Mac Pro](#ethernet-issue-with-early-2008-mac-pro)
+
+The team is doing their best to investigate and fix the aforementioned issues, however no estimated time can be provided.
+
+## Currently Unsupported/Broken Hardware in Ventura
+
+### AMD Polaris, Vega and Navi support on pre-2019 Mac Pros and pre-2012 iMacs
+
+For users with 2008 to 2013 Mac Pros (MacPro3,1-6,1) and 2009 to 2011 iMacs (iMac9,1-12,2), keep in mind macOS Ventura now requires [AVX2.0 support in the CPU](https://en.wikipedia.org/wiki/Advanced_Vector_Extensions#Advanced_Vector_Extensions_2) for native graphics acceleration. Thus while your GPU may be natively supported, you cannot run Ventura officially with these GPUs.
+
+* CPUs supporting AVX2.0 are Haswell or newer, which no pre-2019 Mac Pros can be upgraded with.
+
+Currently at this time, OpenCore Legacy Patcher only supports patching the AMD Polaris Graphics stack to no longer require AVX2.0. However due to lack of hardware on-hand, we cannot support AMD Vega or Navi on Ventura.
+
+* If you have spare Vega or Navi GPUs you'd like to donate, feel free to reach out: khronokernel@icloud.com
+
+Additionally, the native stack will crash over and over on macOS Ventura as it fails to load the AVX2.0-based binaries. Thus to patch Ventura, you will need to boot in Safe Mode and run OCLP's Root Volume Patcher
+
+* To enter Safe Mode, hold Shift+Enter when selecting Ventura in OCLP's Boot Picker
+
+Following GPUs are applicable:
+
+| GPU Architecture | Model Families | Supported |
+| :--- | :--- | :--- |
+| AMD Polaris | RX 4xx/5xx (10/20 series) | <span style="color:#30BCD5"> Supported with patching </span> |
+| AMD Vega    | Vega 56/64/VII (10/20 series) | <span style="color:red"> Unsupported </span> |
+| AMD Navi    | RX 5xxx/6xxx (10/20 series) | ^^ |
+
+
+### Non-Metal Graphics Acceleration
+
+Regarding non-Metal, the team is hard at work to get non-Metal working, however this is our greatest challenge since Big Sur.
+
+Apple has made significant changes to the graphics stack in order to facilitate fancy effects, and in particularly, Stage Manager. We will update you as we work on development, however, now is not the best time to ask about ETAs.
+
+The following GPUs are applicable:
+
+* NVIDIA:
+  * Tesla (8000 - 300 series)
+* AMD:
+  * TeraScale (2000 - 6000 series)
+* Intel:
+  * Iron Lake
+  * Sandy Bridge (2000 - 3000 series)
+
+
+The following machines shipped stock with an unsupported GPU:
+
+::: warning Systems shipped with non-Metal Graphics Cards
+
+* iMac7,1 - iMac12,x
+* MacBook4,1 - MacBook7,1
+* MacBookAir2,1 - MacBookAir4,x
+* MacBookPro4,1 - MacBookPro8,x
+* Macmini3,1 - Macmini5,x
+* MacPro3,1 - MacPro5,1
+* Xserve2,1 - Xserve3,1
+
+:::
+
+
+### Legacy Wireless Support
+
+For systems that required Root Patches in macOS Monterey to achieve Wireless support, unfortunately macOS Ventura has broken the patch set. Currently the following Wifi cards are unsupported:
+
+* Atheros: All models
+* Broadcom: BCM94328 and BCM94322
+
+The following machines shipped stock with these cards:
+
+::: warning Systems shipped with applicable cards
+
+* iMac12,x and older
+* Macmini3,1 and older
+* MacBook5,x and older
+* MacBookAir2,1 and older
+* MacBookPro7,1 and older
+  * MacBookPro6,x is exempt
+* MacPro5,1 and older
+
+:::
+
+Currently BCM943224, BCM94331, BCM94360 and BCM943602 are still fully supported by OpenCore Legacy Patcher. Consider upgrading to these cards if possible.
+
+
+### USB 1.1 (OHCI/UHCI) Support
+
+For Penryn systems and pre-2013 Mac Pros, USB 1.1 support was outright removed in macOS Ventura. 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
+
+
+::: warning The following systems rely on USB 1.1
+
+* iMac10,x and older
+* Macmini3,1 and older
+* MacBook7,1 and older
+* MacBookAir3,1 and older
+* MacBookPro7,1 and older
+  * MacBookPro6,x is exempt
+* MacPro5,1 and older
+
+:::
+
+### Ethernet issue with Early 2008 Mac Pro
+
+MacPro3,1 suffers from Ethernet driver dying after returning from sleep, current workaround is to use a USB Ethernet adapter or disable sleep.

docs/WINDOWS.md

@@ -2,18 +2,18 @@
 
 * Guide based off of [cdf's Mac Pro Thread](https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/)
 
-To install UEFI is actually super simple! All it requires is to boot Windows' Installer through OpenCore to force a UEFI setup. Here we'll be going a bit more step by step in the process including partitioning and such.
+To install a UEFI copy of Windows is actually super simple! All it requires is to boot Windows' Installer through OpenCore to force a UEFI setup. Here we'll be going step by step in the process, including partitioning and such.
 
-* Note: UEFI Windows is generally quite usable for Arrendale and newer models, however machines with Penryn CPUs may experience issues
+* Note: UEFI Windows is generally quite usable for Arrandale and newer models, however machines with Penryn CPUs may experience issues
 * Recommended Models:
   * MacBookAir4,x - 5,x
   * MacBookPro8,x - 10,x
   * Macmini5,x - 6,x
   * iMac11,x - 13,x
 
-Once you know your model is supported, you're good to go with the rest of this guide
+Once you know if your model is supported, you're good to go with the rest of this guide.
 
-* Newer models than listed here will already natively support UEFI Windows through Boot Camp
+* Newer models than listed here will already natively support UEFI Windows through Boot Camp.
 
 For MacPro4,1/5,1 and Xserve3,1 users, please be aware that Windows has troubles with automatic installation, so please refer to cdf's guide on manual installation:
 
@@ -24,19 +24,19 @@ For MacPro4,1/5,1 and Xserve3,1 users, please be aware that Windows has troubles
 To start off, we'll need the following:
 
 * An 8GB USB drive for the Windows Installer
-* Minimum of 30GB of free space on whatever drive you want to install Windows too
+* A minimum of 30GB of free space on whichever drive you want to install Windows to
 
-First, lets format out drives as follows:
+First, let's format our drives with the following steps:
 
 ### USB Drive Formatting
 
-Open Disk Utility in macOS and format the USB Drive as ExFat with MBR Scheme:
+Open Disk Utility in macOS and format the USB Drive as ExFat with the Master Boot Record scheme:
 
 ![](../images/windows-mbr-format.png)
 
 ### Disk Formatting
 
-Next, grab the drive you wish to install Windows on and partition it as ExFat (If formatting entire drive, ensure it's GUID Partition Table):
+Next, grab the drive you wish to install Windows on and partition it as ExFat (If formatting the entire drive, ensure it's using the GUID Partition Table scheme):
 
 ![](../images/windows-partition-1.png)
 
@@ -44,8 +44,8 @@ If you plan to use the same hard drive for macOS and Windows, we recommend creat
 
 Recommended size is 200MB and the partition format **must** be FAT32 for OpenCore to operate correctly. You will next want to install OpenCore onto the new partition, either moving from the ESP with [MountEFI](https://github.com/corpnewt/MountEFI) or rerunning the OpenCore-Patcher.app
 
-* Note: For machines with dedicated drives for Windows, having different partitions for OpenCore is not required
-* Note 2: We recommend uninstalling OpenCore from the ESP/EFI Partition when you create this new OpenCore partition to avoid confusion when selecting OpenCore builds in the Mac's boot picker
+* Note 1: For machines with dedicated drives for Windows, having different partitions for OpenCore is not required.
+* Note 2: We recommend uninstalling OpenCore from the ESP/EFI Partition when you create this new OpenCore partition to avoid confusion when selecting OpenCore builds in the Mac's boot picker.
 
 ![](../images/windows-partition-2.png)
 
@@ -59,7 +59,7 @@ Next, mount the Windows 10 ISO:
 
 ![](../images/windows-iso.png)
 
-The open terminal and run `rsync` on the USB drive (replace CCCOMA_X64 with the mounted ISO's name, as well as replacing W10USB with your USB drive's name):
+Then open terminal and run `rsync` on the USB drive (replace CCCOMA_X64 with the mounted ISO's name, as well as replacing W10USB with your USB drive's name):
 
 ```
 rsync -r -P /Volumes/CCCOMA_X64/ /Volumes/W10USB
@@ -75,7 +75,7 @@ rsync -vha -P --exclude=sources/install.wim /Volumes/CCCOMA_X64/ /Volumes/W10USB
 
 # Use wimlib to split the install.wim file into a size that fits
 wimlib-imagex split /Volumes/CCCOMA_X64/sources/install.wim /Volumes/W10USB/sources/install.swm 4000
-``` 
+```
 
 Once that's completed, you can continue.
 :::
@@ -84,17 +84,17 @@ Once that's completed, you can continue.
 
 Command will take some time, so sit back and get some coffee. Once finished, the root of the USB drive should look as follows:
 
-* Ensure that these folders and files are on the root, otherwise the USB will not boot
+* Ensure that these folders and files are in the root of the USB drive, otherwise the USB will not boot.
 
 ![](../images/windows-rsync-done.png)
 
 Once done, lets reboot into OpenCore's Menu and you'll see a new Windows' entry:
 
-* Note: Do not boot the installer outside of OpenCore as this will default back to the old MBR BIOS setup. Booting through OpenCore ensures Windows uses UEFI
+* Note: Do not boot the installer outside of OpenCore as this will default back to the old MBR BIOS setup. Booting through OpenCore ensures Windows uses UEFI.
 
 ![](../images/oc-windows.png)
 
-From there, install Windows as normal and you'll get a new BootCamp entry in OpenCore's picker when done! Don't forget to run BootCamp's utilities installer as well to ensure Wifi and such are functioning correctly. This can be downloaded from the BootCamp Assistant app in macOS, or with [brigadier](https://github.com/timsutton/brigadier) in Windows.
+From there, install Windows as normal and you'll get a new BootCamp entry in OpenCore's picker when done! Don't forget to run BootCamp's utilities installer as well to ensure Wi-Fi and other important features are functioning correctly. This can be downloaded from the BootCamp Assistant app in macOS, or with [brigadier](https://github.com/timsutton/brigadier) in Windows.
 
 ![](../images/oc-windows-done.png)
 
@@ -124,4 +124,4 @@ 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: [iMac 12,1 Windows 10 Boot Loop – Fix Intel Graphics issue](https://zzq.org/?p=39)
+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)

docs/scripts/linkcheck.py

@@ -2,8 +2,8 @@ from pathlib import Path
 import subprocess
 
 for i in [i for i in list(Path().resolve().glob("**/*.md")) if "node_modules" not in str(i.parent) and "_book" not in str(i.parent)]:
-    #bert = subprocess.run(['npx', 'markdown-link-check', '"' + str(i) + '"', '-c', '.markdownlinkcheck.json'], capture_output=True, shell=True, cwd=Path().resolve())    
+    #bert = subprocess.run(['npx', 'markdown-link-check', '"' + str(i) + '"', '-c', '.markdownlinkcheck.json'], capture_output=True, shell=True, cwd=Path().resolve())
     bert = subprocess.run('npx markdown-link-check "' + str(i) + '"', stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=Path().resolve())
-    outpot = bert.stdout.decode().replace("\r", "").split("\n")
-    outpot = [i for i in outpot if ("FILE: " in i or " → Status: " in i) and " → Status: 429" not in i]
-    [print(i) for i in outpot]
+    output = bert.stdout.decode().replace("\r", "").split("\n")
+    output = [i for i in output if ("FILE: " in i or " → Status: " in i) and " → Status: 429" not in i]
+    [print(i) for i in output]

gui/gui_main.py

@@ -15,8 +15,11 @@ import threading
 from pathlib import Path
 import binascii
 import hashlib
+from datetime import datetime
 
-from resources import constants, defaults, build, install, installer, sys_patch_download, utilities, sys_patch_detect, sys_patch, run, generate_smbios, updates, integrity_verification, global_settings
+from resources import constants, defaults, install, installer, utilities, run, generate_smbios, updates, integrity_verification, global_settings, kdk_handler
+from resources.sys_patch import sys_patch_download, sys_patch_detect, sys_patch, sys_patch_auto
+from resources.build import build
 from data import model_array, os_data, smbios_data, sip_data
 from gui import menu_redirect, gui_help
 
@@ -31,6 +34,7 @@ class wx_python_gui:
         self.finished_cim_process = False
         self.target_disk = ""
         self.pulse_forward = False
+        self.prepare_result = False
         self.non_metal_required = self.use_non_metal_alternative()
         self.hyperlink_colour = (25, 179, 231)
 
@@ -52,7 +56,7 @@ class wx_python_gui:
         self.app = wx.App()
         if frame is None:
             self.frame = wx.Frame(
-                None, title="OpenCore Legacy Patcher",
+                None, title=f"OpenCore Legacy Patcher ({self.constants.patcher_version})",
                 size=(self.WINDOW_WIDTH_MAIN, self.WINDOW_HEIGHT_MAIN),
                 style = wx.DEFAULT_FRAME_STYLE & ~(wx.RESIZE_BORDER | wx.MAXIMIZE_BOX)
             )
@@ -140,7 +144,7 @@ class wx_python_gui:
                 self.popup = wx.MessageDialog(
                     self.frame,
                     f"During unpacking of our internal files, we seemed to have encountered an error.\n\nIf you keep seeing this error, please try rebooting and redownloading the application.",
-                    "Internal Error occured!",
+                    "Internal Error occurred!",
                     style = wx.OK | wx.ICON_EXCLAMATION
                 )
                 self.popup.ShowModal()
@@ -181,10 +185,108 @@ class wx_python_gui:
             # Spawn thread to check for updates
             threading.Thread(target=self.check_for_updates).start()
 
+    def check_for_local_installs(self, event=None):
+        # Update app in '/Library/Application Support/Dortania' folder
+
+        # Skip if we're running from source
+        if self.constants.launcher_script:
+            return False
+
+        # Only performed if application is already installed (ie. we're updating)
+        application_path = Path("/Library/Application Support/Dortania/OpenCore-Patcher.app")
+        if not application_path.exists():
+            return False
+
+        # Check application version
+        # If we're older than the installed version, skip
+        application_plist_path = application_path / "Contents/Info.plist"
+        if not application_plist_path.exists():
+            return False
+
+        application_plist = plistlib.load(application_plist_path.open("rb"))
+        if not "CFBundleShortVersionString" in application_plist:
+            return False
+
+        application_version = application_plist["CFBundleShortVersionString"].split(".")
+        local_version = self.constants.patcher_version.split(".")
+
+        if application_version == local_version:
+            if "Build Date" not in application_plist:
+                return False
+
+            # Check build date of installed version
+            plist_path = self.constants.launcher_binary.replace("MacOS/OpenCore-Patcher", "Info.plist")
+            if not Path(plist_path).exists():
+                return False
+
+            plist = plistlib.load(Path(plist_path).open("rb"))
+            if "Build Date" not in plist:
+                return False
+
+            if plist["Build Date"] == application_plist["Build Date"]:
+                return False
+
+            local_build_date = datetime.strptime(plist["Build Date"], "%Y-%m-%d %H:%M:%S")
+            installed_build_date = datetime.strptime(application_plist["Build Date"], "%Y-%m-%d %H:%M:%S")
+
+            if local_build_date <= installed_build_date:
+                return False
+
+        elif updates.check_binary_updates(self.constants).check_if_build_newer(local_version, application_version) is False:
+            return False
+
+        # Ask user if they want to move the application to the Applications folder
+        self.popup = wx.MessageDialog(
+            self.frame,
+            f"We've detected an old version of OpenCore-Patcher.app installed in the Application Support directory.\n\nWould you like to replace it with this version?",
+            "Move to Applications?",
+            wx.YES_NO | wx.ICON_INFORMATION
+        )
+        self.popup.SetYesNoLabels("Replace", "Ignore")
+        answer = self.popup.ShowModal()
+        if answer != wx.ID_YES:
+            return False
+
+        path = str(self.constants.launcher_binary).split("/Contents/MacOS/OpenCore-Patcher")[0]
+
+        args = [
+            "osascript",
+            "-e",
+            f'''do shell script "ditto {path} '/Library/Application Support/Dortania/OpenCore-Patcher.app'"'''
+            ' with prompt "OpenCore Legacy Patcher needs administrator privileges to copy in."'
+            " with administrator privileges"
+            " without altering line endings",
+        ]
+
+        result = subprocess.run(args,stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        if result.returncode != 0:
+            print("- Failed to move application into /Library/Application Support/Dortania/OpenCore-Patcher.app")
+            # Notify user we failed to move the application
+            self.popup = wx.MessageDialog(
+                self.frame,
+                f"Failed to move the application to the Applications folder.\n\nThis is likely due to permission errors, you can copy the app manually into '/Library/Application Support/Dortania/OpenCore-Patcher.app' if you continue to see this error.",
+                "Failed to Move!",
+                style = wx.OK | wx.ICON_EXCLAMATION
+            )
+            self.popup.ShowModal()
+            return False
+
+        subprocess.run(["xattr", "-cr", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        subprocess.run(["open", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        if "AppTranslocation" not in path:
+            subprocess.run(["rm", "-R", path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        self.OnCloseFrame()
+
     def check_for_updates(self, event=None):
+        if self.constants.has_checked_updates is True:
+            return
+
+        did_find_update = False
         ignore_updates = global_settings.global_settings().read_property("IgnoreAppUpdates")
         if ignore_updates is not True:
             self.constants.ignore_updates = False
+            self.constants.has_checked_updates = True
             dict = updates.check_binary_updates(self.constants).check_binary_updates()
             if dict:
                 for entry in dict:
@@ -198,10 +300,11 @@ class wx_python_gui:
                         style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION
                     )
                     self.dialog.SetYesNoCancelLabels("View on Github", "Always Ignore", "Ignore Once")
-                    responce = self.dialog.ShowModal()
-                    if responce == wx.ID_YES:
+                    response = self.dialog.ShowModal()
+                    did_find_update = True
+                    if response == wx.ID_YES:
                         webbrowser.open(github_link)
-                    elif responce == wx.ID_NO:
+                    elif response == wx.ID_NO:
                         print("- Setting IgnoreAppUpdates to True")
                         self.constants.ignore_updates = True
                         global_settings.global_settings().write_property("IgnoreAppUpdates", True)
@@ -209,6 +312,9 @@ class wx_python_gui:
             self.constants.ignore_updates = True
             print("- Ignoring App Updates due to defaults")
 
+        # if did_find_update is False:
+        #     self.check_for_local_installs()
+
     def relaunch_as_root(self, event=None):
 
         # Add Dialog Box asking if it's ok to relaunch as root
@@ -231,10 +337,13 @@ class wx_python_gui:
             extension = ""
             if event:
                 if event.GetEventObject() != wx.Menu:
-                    if event.GetEventObject().GetLabel() == "Start Root Patching":
-                        extension = " --gui_patch"
-                    elif event.GetEventObject().GetLabel() == "Revert Root Patches":
-                        extension = " --gui_unpatch"
+                    try:
+                        if event.GetEventObject().GetLabel() in ["Start Root Patching", "Reinstall Root Patches"]:
+                            extension = " --gui_patch"
+                        elif event.GetEventObject().GetLabel() == "Revert Root Patches":
+                            extension = " --gui_unpatch"
+                    except TypeError:
+                        pass
 
             if self.constants.launcher_script is None:
                 args_string = f"'{self.constants.launcher_binary}'{extension}"
@@ -339,7 +448,7 @@ class wx_python_gui:
         self.reset_window()
 
         # Set header text
-        self.frame.SetTitle(f"OpenCore Legacy Patcher")
+        self.frame.SetTitle(f"OpenCore Legacy Patcher ({self.constants.patcher_version})")
         # Header
         self.header = wx.StaticText(self.frame, label=f"OpenCore Legacy Patcher v{self.constants.patcher_version}")
         self.header.SetFont(wx.Font(18, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD))
@@ -619,7 +728,7 @@ class wx_python_gui:
         while self.is_unpack_finished() is False:
             time.sleep(0.1)
 
-        build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).build_opencore()
+        build.build_opencore(self.constants.custom_model or self.constants.computer.real_model, self.constants).build_opencore()
         # Once finished, change build_opencore button to "Install OpenCore"
         self.build_opencore.SetLabel("🔩 Install OpenCore")
         self.build_opencore.Bind(wx.EVT_BUTTON, self.install_menu)
@@ -771,7 +880,7 @@ class wx_python_gui:
         self.return_to_main_menu.SetPosition(
             wx.Point(
                 self.reload_button.GetPosition().x,
-                self.reload_button.GetPosition().y + self.reload_button.GetSize().height + 7.5
+                self.reload_button.GetPosition().y + self.reload_button.GetSize().height + 8
             )
         )
         self.return_to_main_menu.Bind(wx.EVT_BUTTON, self.main_menu)
@@ -877,7 +986,49 @@ class wx_python_gui:
         self.frame_modal.SetSize(-1, self.return_to_main_menu.GetPosition().y + self.return_to_main_menu.GetSize().height + 20)
 
         if result is True:
-            self.reboot_system(message="OpenCore has finished installing to disk.\n\nYou will need to reboot and hold the Option key and select OpenCore/Boot EFI's option.\n\nWould you like to reboot?")
+            if not self.constants.custom_model:
+                self.reboot_system(message="OpenCore has finished installing to disk.\n\nYou will need to reboot and hold the Option key and select OpenCore/Boot EFI's option.\n\nWould you like to reboot?")
+            else:
+                popup_message = wx.MessageDialog(self.frame,f"OpenCore has finished installing to disk.\n\nYou can eject the drive, insert it into the {self.constants.custom_model}, reboot, hold the Option key and select OpenCore/Boot EFI's option.", "Success", wx.OK)
+                popup_message.ShowModal()
+
+    def check_if_new_patches_needed(self, patches):
+        # Check if there's any new patches for the user to install
+        # Newer users will assume the root patch menu will present missing patches.
+        # Thus we'll need to see if the exact same OCLP build was used already
+        if self.constants.commit_info[0] in ["Running from source", "Built from source"]:
+            return True
+
+        if self.constants.computer.oclp_sys_url != self.constants.commit_info[2]:
+            # If commits are different, assume patches are as well
+            return True
+
+        oclp_plist = "/System/Library/CoreServices/OpenCore-Legacy-Patcher.plist"
+        if not Path(oclp_plist).exists():
+            # If it doesn't exist, no patches were ever installed
+            # ie. all patches applicable
+            return True
+
+        oclp_plist_data = plistlib.load(open(oclp_plist, "rb"))
+        for patch in patches:
+            if (not patch.startswith("Settings") and not patch.startswith("Validation") and patches[patch] is True):
+                # Patches should share the same name as the plist key
+                # See sys_patch_dict.py for more info
+                patch_installed = False
+                for key in oclp_plist_data:
+                    if "Display Name" not in oclp_plist_data[key]:
+                        continue
+                    if oclp_plist_data[key]["Display Name"] == patch:
+                        patch_installed = True
+                        break
+
+                if patch_installed is False:
+                    print(f"- Patch {patch} not installed")
+                    return True
+
+        print("- No new patches detected for system")
+        return False
+
 
     def root_patch_menu(self, event=None):
         # Define Menu
@@ -912,21 +1063,38 @@ class wx_python_gui:
             print("- No applicable patches available")
             patches = []
 
+        # Check if OCLP has already applied the same patches
+        no_new_patches = False
+        if patches:
+            no_new_patches = not self.check_if_new_patches_needed(patches)
+
         i = 0
         if patches:
-            for patch in patches:
-                # Add Label for each patch
-                if (not patch.startswith("Settings") and not patch.startswith("Validation") and patches[patch] is True):
-                    print(f"- Adding patch: {patch} - {patches[patch]}")
-                    self.patch_label = wx.StaticText(self.frame_modal, label=f"- {patch}")
-                    self.patch_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
-                    self.patch_label.SetPosition(
-                        wx.Point(
-                            self.subheader.GetPosition().x,
-                            self.subheader.GetPosition().y + self.subheader.GetSize().height + 3 + i
+            if no_new_patches is False:
+                for patch in patches:
+                    # Add Label for each patch
+                    if (not patch.startswith("Settings") and not patch.startswith("Validation") and patches[patch] is True):
+                        print(f"- Adding patch: {patch} - {patches[patch]}")
+                        self.patch_label = wx.StaticText(self.frame_modal, label=f"- {patch}")
+                        self.patch_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
+                        self.patch_label.SetPosition(
+                            wx.Point(
+                                self.subheader.GetPosition().x,
+                                self.subheader.GetPosition().y + self.subheader.GetSize().height + 3 + i
+                            )
                         )
+                        i = i + self.patch_label.GetSize().height + 3
+            else:
+                self.patch_label = wx.StaticText(self.frame_modal, label=f"All applicable patches already installed")
+                self.patch_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
+                self.patch_label.SetPosition(
+                    wx.Point(
+                        self.subheader.GetPosition().x,
+                        self.subheader.GetPosition().y + self.subheader.GetSize().height + 3 + i
                     )
-                    i = i + self.patch_label.GetSize().height + 3
+                )
+                i = i + self.patch_label.GetSize().height + 3
+                self.patch_label.Centre(wx.HORIZONTAL)
             if patches["Validation: Patching Possible"] is False:
                 self.patch_label = wx.StaticText(self.frame_modal, label="Cannot Patch due to following reasons:")
                 self.patch_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD))
@@ -994,6 +1162,8 @@ class wx_python_gui:
 
         # Start Root Patching
         self.start_root_patching = wx.Button(self.frame_modal, label="Start Root Patching", size=(170, -1))
+        if no_new_patches is True:
+            self.start_root_patching.Label = "Reinstall Root Patches"
         self.start_root_patching.SetPosition(
             wx.Point(
                 self.patch_label.GetPosition().x,
@@ -1091,6 +1261,8 @@ class wx_python_gui:
             self.pulse_alternative(self.progress_bar)
             wx.GetApp().Yield()
 
+        self.progress_bar.Hide()
+
         # Download resources
         sys.stdout=menu_redirect.RedirectLabel(self.developer_note)
         download_result, link = sys_patch_download.grab_patcher_support_pkg(self.constants).download_files()
@@ -1100,7 +1272,7 @@ class wx_python_gui:
             # Create popup window to inform user of error
             self.popup = wx.MessageDialog(
                 self.frame_modal,
-                "A problem occured trying to download PatcherSupportPkg binaries\n\nIf you continue to have this error, download an Offline build from Github\nThese builds don't require a network connection to root patch",
+                "A problem occurred trying to download PatcherSupportPkg binaries\n\nIf you continue to have this error, download an Offline build from Github\nThese builds don't require a network connection to root patch",
                 "Network Error",
                 wx.YES_NO | wx.ICON_ERROR
             )
@@ -1110,6 +1282,28 @@ class wx_python_gui:
                 webbrowser.open(self.constants.repo_link_latest)
             self.main_menu()
 
+        if self.patches["Settings: Kernel Debug Kit missing"] is True:
+            # Download KDK (if needed)
+            self.subheader.SetLabel("Downloading Kernel Debug Kit")
+            self.subheader.Centre(wx.HORIZONTAL)
+            self.developer_note.SetLabel("Starting shortly")
+
+            sys.stdout=menu_redirect.RedirectLabel(self.developer_note)
+            kdk_result, error_msg, detected_build = kdk_handler.kernel_debug_kit_handler(self.constants).download_kdk(self.constants.detected_os_version, self.constants.detected_os_build)
+            sys.stdout=sys.__stdout__
+
+            if kdk_result is False:
+                # Create popup window to inform user of error
+                self.popup = wx.MessageDialog(
+                    self.frame,
+                    f"A problem occurred trying to download the Kernel Debug Kit:\n\n{error_msg}",
+                    "Kernel Debug Kit",
+                    wx.ICON_ERROR
+                )
+                self.popup.ShowModal()
+                self.finished_auto_patch = True
+                self.main_menu()
+
         self.reset_frame_modal()
         self.frame_modal.SetSize(-1, self.WINDOW_HEIGHT_MAIN)
 
@@ -1176,37 +1370,40 @@ class wx_python_gui:
         try:
             sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, self.patches).start_patch()
         except Exception as e:
-            self.text_box.AppendText(f"- An internal error occured while running the Root Patcher:\n{str(e)}")
+            self.text_box.AppendText(f"- An internal error occurred while running the Root Patcher:\n{str(e)}")
             pass
         sys.stdout = self.stock_stdout
         sys.stderr = self.stock_stderr
-        if self.constants.root_patcher_succeded is True:
+        if self.constants.root_patcher_succeeded is True:
             print("- Root Patcher finished successfully")
             if self.constants.needs_to_open_preferences is True:
-                # Create dialog box to open System Preferences -> Security and Privacy
-                self.popup = wx.MessageDialog(
-                    self.frame_modal,
-                    "We just finished installing the patches to your Root Volume!\n\nHowever, Apple requires users to manually approve the kernel extensions installed before they can be used next reboot.\n\nWould you like to open System Preferences?",
-                    "Open System Preferences?",
-                    wx.YES_NO | wx.ICON_INFORMATION
-                )
-                self.popup.SetYesNoLabels("Open System Preferences", "Ignore")
-                answer = self.popup.ShowModal()
-                if answer == wx.ID_YES:
-                    output =subprocess.run(
-                        [
-                            "osascript", "-e",
-                            'tell app "System Preferences" to activate',
-                            "-e", 'tell app "System Preferences" to reveal anchor "General" of pane id "com.apple.preference.security"',
-                        ],
-                        stdout=subprocess.PIPE,
-                        stderr=subprocess.PIPE
+                if self.constants.detected_os >= os_data.os_data.ventura:
+                    self.reboot_system(message="Root Patcher finished successfully!\nIf you were prompted to open System Settings to authorize new kexts, this can be ignored. Your system is ready once restarted.\n\nWould you like to reboot now?")
+                else:
+                    # Create dialog box to open System Preferences -> Security and Privacy
+                    self.popup = wx.MessageDialog(
+                        self.frame_modal,
+                        "We just finished installing the patches to your Root Volume!\n\nHowever, Apple requires users to manually approve the kernel extensions installed before they can be used next reboot.\n\nWould you like to open System Preferences?",
+                        "Open System Preferences?",
+                        wx.YES_NO | wx.ICON_INFORMATION
                     )
-                    if output.returncode != 0:
-                        # Some form of fallback if unaccelerated state errors out
-                        subprocess.run(["open", "-a", "System Preferences"])
-                    time.sleep(5)
-                    self.OnCloseFrame(None)
+                    self.popup.SetYesNoLabels("Open System Preferences", "Ignore")
+                    answer = self.popup.ShowModal()
+                    if answer == wx.ID_YES:
+                        output =subprocess.run(
+                            [
+                                "osascript", "-e",
+                                'tell app "System Preferences" to activate',
+                                "-e", 'tell app "System Preferences" to reveal anchor "General" of pane id "com.apple.preference.security"',
+                            ],
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE
+                        )
+                        if output.returncode != 0:
+                            # Some form of fallback if unaccelerated state errors out
+                            subprocess.run(["open", "-a", "System Preferences"])
+                        time.sleep(5)
+                        self.OnCloseFrame(None)
             else:
                 self.reboot_system(message="Root Patcher finished successfully\nWould you like to reboot now?")
         self.return_to_main_menu.Enable()
@@ -1286,11 +1483,11 @@ class wx_python_gui:
         try:
             sys_patch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants, self.patches).start_unpatch()
         except Exception as e:
-            self.text_box.AppendText(f"- An internal error occured while running the Root Patcher:\n{str(e)}")
+            self.text_box.AppendText(f"- An internal error occurred while running the Root Patcher:\n{str(e)}")
             pass
         sys.stdout = self.stock_stdout
         sys.stderr = self.stock_stderr
-        if self.constants.root_patcher_succeded is True:
+        if self.constants.root_patcher_succeeded is True:
             print("- Root Patcher finished successfully")
             self.reboot_system(message="Root Patcher finished successfully\nWould you like to reboot now?")
         self.return_to_main_menu.Enable()
@@ -1395,7 +1592,7 @@ class wx_python_gui:
         # Download installer catalog
         if ias is None:
             def ia():
-                self.available_installers = installer.list_downloadable_macOS_installers(self.constants.payload_path, "PublicSeed")
+                self.available_installers = installer.list_downloadable_macOS_installers(self.constants.payload_path, "DeveloperSeed")
 
             print("- Downloading installer catalog...")
             thread_ia = threading.Thread(target=ia)
@@ -1435,7 +1632,7 @@ class wx_python_gui:
             if ias is None:
                 available_installers = installer.only_list_newest_installers(available_installers)
             for app in available_installers:
-                print(f"macOS {available_installers[app]['Version']} ({available_installers[app]['Build']} - {utilities.human_fmt(available_installers[app]['Size'])} - {available_installers[app]['Source']}) - {available_installers[app]['Variant']}")
+                print(f"macOS {available_installers[app]['Version']} ({available_installers[app]['Build']}):\n  - Size: {utilities.human_fmt(available_installers[app]['Size'])}\n  - Source: {available_installers[app]['Source']}\n  - Variant: {available_installers[app]['Variant']}\n  - Link: {available_installers[app]['Link']}\n")
                 if available_installers[app]['Variant'] in ["DeveloperSeed" , "PublicSeed"]:
                     extra = " Beta"
                 else:
@@ -1462,7 +1659,7 @@ class wx_python_gui:
             self.install_selection.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD))
             self.install_selection.Centre(wx.HORIZONTAL)
 
-        self.load_all_installers = wx.Button(self.frame_modal, label="Reload with all installers")
+        self.load_all_installers = wx.Button(self.frame_modal, label="Show older installers")
         self.load_all_installers.SetPosition(
             wx.Point(
                 self.install_selection.GetPosition().x,
@@ -1491,6 +1688,37 @@ class wx_python_gui:
         self.grab_installer_data(ias=ias)
 
     def download_macos_click(self, app_dict):
+        # Unsupported Models include:
+        #   - USB 1.1 machines (Penryn, MacPro3,1-5,1)
+        #   - Non-Metal GPUs
+        model = self.constants.custom_model or self.constants.computer.real_model
+        if model in model_array.LegacyGPU or model in ["MacPro3,1", "MacPro4,1", "MacPro5,1"]:
+            try:
+                app_major = app_dict['Version'].split(".")[0]
+                if float(app_major) > self.constants.os_support:
+                    # Throw pop up warning OCLP does not support this OS
+                    os =  os_data.os_conversion.convert_kernel_to_marketing_name(os_data.os_conversion.os_to_kernel(app_major))
+                    dlg = wx.MessageDialog(self.frame_modal, f"OpenCore Legacy Patcher currently does not support macOS {os} on your machine ({model}).\n\nThe newest version we officially support is macOS {os_data.os_conversion.convert_kernel_to_marketing_name(os_data.os_conversion.os_to_kernel(str(self.constants.os_support)))}. For more information, see the associated Ventura Github Issue.\n\nWould you still want to continue downloading macOS {os}?", "Unsupported OS", style=wx.YES_NO | wx.CANCEL | wx.ICON_QUESTION)
+                    dlg.SetYesNoCancelLabels("View Github Issue", "Download Anyways", "Cancel")
+                    result = dlg.ShowModal()
+                    if result == wx.ID_YES:
+                        webbrowser.open("https://github.com/dortania/OpenCore-Legacy-Patcher/issues/998")
+                        return
+                    elif result == wx.ID_NO:
+                        pass
+                    else:
+                        return
+            except ValueError:
+                pass
+
+        # Ensure we have space to both download and extract the installer
+        host_space = utilities.get_free_space()
+        needed_space = app_dict['Size'] * 2
+        if host_space < needed_space:
+            dlg = wx.MessageDialog(self.frame_modal, f"You do not have enough free space to download and extract this installer. Please free up some space and try again\n\n{utilities.human_fmt(host_space)} available vs {utilities.human_fmt(needed_space)} required", "Insufficient Space", wx.OK | wx.ICON_WARNING)
+            dlg.ShowModal()
+            return
+
         self.frame.DestroyChildren()
         installer_name = f"macOS {app_dict['Version']} ({app_dict['Build']})"
 
@@ -1586,7 +1814,7 @@ class wx_python_gui:
         wx.App.Get().Yield()
         integrity_path = Path(Path(self.constants.payload_path) / Path(apple_integrity_file_link.split("/")[-1]))
         if utilities.download_file(apple_integrity_file_link, integrity_path, verify_checksum=False):
-            # If we're unable to download the integrity file immediately after downloading the IA, there's a legitmate issue
+            # If we're unable to download the integrity file immediately after downloading the IA, there's a legitimate issue
             # on Apple's end.
             # Fail gracefully and just head to installing the IA.
             utilities.disable_sleep_while_running()
@@ -1650,7 +1878,7 @@ class wx_python_gui:
         self.header.SetFont(wx.Font(18, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD))
         self.header.Centre(wx.HORIZONTAL)
         # Subheader: Installers found in /Applications
-        self.subheader = wx.StaticText(self.frame, label="Installers found in Applications folder")
+        self.subheader = wx.StaticText(self.frame, label="Searching for Installers in /Applications")
         self.subheader.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
         self.subheader.SetPosition(
             wx.Point(
@@ -1660,12 +1888,46 @@ class wx_python_gui:
         )
         self.subheader.Centre(wx.HORIZONTAL)
 
+        self.available_installers = None
+
+        # Spawn thread to get list of installers
+        def get_installers():
+            self.available_installers = installer.list_local_macOS_installers()
+
+        thread_get_installers = threading.Thread(target=get_installers)
+        thread_get_installers.start()
+
+        # Progress bar
+        self.progress_bar = wx.Gauge(self.frame, range=100, size=(self.WINDOW_WIDTH_MAIN - 50, -1))
+        self.progress_bar.SetPosition(
+            wx.Point(
+                self.header.GetPosition().x,
+                self.subheader.GetPosition().y + self.subheader.GetSize().height + 10
+            )
+        )
+        self.progress_bar.Centre(wx.HORIZONTAL)
+        self.progress_bar.Pulse()
+
+        # Set window size
+        self.frame.SetSize(-1, self.progress_bar.GetPosition().y + self.progress_bar.GetSize().height + 40)
+
+        while thread_get_installers.is_alive():
+            self.pulse_alternative(self.progress_bar)
+            wx.App.Get().Yield()
+
+        # Remove progress bar
+        self.progress_bar.Destroy()
+
+        self.subheader.SetLabel("Installers found in Applications folder")
+        self.subheader.Centre(wx.HORIZONTAL)
+
+        available_installers = self.available_installers
+
         i = -7
-        available_installers = installer.list_local_macOS_installers()
         if available_installers:
-            print("Installer found")
+            print("Installer(s) found:")
             for app in available_installers:
-                print(f"{available_installers[app]['Short Name']}: {available_installers[app]['Version']} ({available_installers[app]['Build']})")
+                print(f"- {available_installers[app]['Short Name']}: {available_installers[app]['Version']} ({available_installers[app]['Build']})")
                 self.install_selection = wx.Button(self.frame, label=f"{available_installers[app]['Short Name']}: {available_installers[app]['Version']} ({available_installers[app]['Build']})", size=(320, 30))
                 i = i + 25
                 self.install_selection.SetPosition(
@@ -1734,12 +1996,12 @@ class wx_python_gui:
         self.usb_selection_label.Centre(wx.HORIZONTAL)
 
         i = -15
-        availible_disks = installer.list_disk_to_format()
-        if availible_disks:
+        available_disks = installer.list_disk_to_format()
+        if available_disks:
             print("Disks found")
-            for disk in availible_disks:
-                print(f"{disk}: {availible_disks[disk]['name']} - {availible_disks[disk]['size']}")
-                self.usb_selection = wx.Button(self.frame, label=f"{disk} - {availible_disks[disk]['name']} - {utilities.human_fmt(availible_disks[disk]['size'])}", size=(300, 30))
+            for disk in available_disks:
+                print(f"{disk}: {available_disks[disk]['name']} - {available_disks[disk]['size']}")
+                self.usb_selection = wx.Button(self.frame, label=f"{disk} - {available_disks[disk]['name']} - {utilities.human_fmt(available_disks[disk]['size'])}", size=(300, 30))
                 i = i + 25
                 self.usb_selection.SetPosition(
                     wx.Point(
@@ -1747,7 +2009,7 @@ class wx_python_gui:
                         self.usb_selection_label.GetPosition().y + self.usb_selection_label.GetSize().height + i
                     )
                 )
-                self.usb_selection.Bind(wx.EVT_BUTTON, lambda event, temp=disk: self.format_usb_progress(availible_disks[temp]['identifier'], installer_name, installer_path))
+                self.usb_selection.Bind(wx.EVT_BUTTON, lambda event, temp=disk: self.format_usb_progress(available_disks[temp]['identifier'], installer_name, installer_path))
                 self.usb_selection.Centre(wx.HORIZONTAL)
         else:
             print("No disks found")
@@ -1829,9 +2091,8 @@ class wx_python_gui:
             20
         )
         self.progress_bar.Centre(wx.HORIZONTAL)
-        self.progress_bar.SetValue(0)
 
-        self.progress_label = wx.StaticText(self.frame, label="Bytes Written: 0")
+        self.progress_label = wx.StaticText(self.frame, label="Preparing files, beginning shortly...")
         self.progress_label.SetFont(wx.Font(12, wx.DEFAULT, wx.NORMAL, wx.NORMAL))
         self.progress_label.SetPosition(
             wx.Point(
@@ -1860,8 +2121,19 @@ class wx_python_gui:
         print("- Creating installer.sh script")
         print(f"- Disk: {disk}")
         print(f"- Installer: {installer_path}")
-        if installer.generate_installer_creation_script(self.constants.installer_sh_path, installer_path, disk):
-            print("- Sucessfully generated creation script")
+
+        self.prepare_script_thread = threading.Thread(target=self.prepare_script, args=(installer_path,disk))
+        self.prepare_script_thread.start()
+        self.progress_bar.Pulse()
+
+        while self.prepare_script_thread.is_alive():
+            self.pulse_alternative(self.progress_bar)
+            wx.GetApp().Yield()
+
+        if self.prepare_result is True:
+            self.progress_label.SetLabel("Bytes Written: 0")
+            self.progress_label.Centre(wx.HORIZONTAL)
+            print("- Successfully generated creation script")
             print("- Starting creation script as admin")
             wx.GetApp().Yield()
             time.sleep(1)
@@ -1872,6 +2144,7 @@ class wx_python_gui:
             self.download_thread = threading.Thread(target=self.download_and_unzip_pkg)
             self.download_thread.start()
             default_output = float(utilities.monitor_disk_output(disk))
+            self.progress_bar.SetValue(0)
             while True:
                 time.sleep(0.1)
                 output = float(utilities.monitor_disk_output(disk))
@@ -1899,30 +2172,37 @@ class wx_python_gui:
                         self.constants.host_is_hackintosh is True
                     )
                 ):
-                    popup_message = wx.MessageDialog(self.frame, "Sucessfully created a macOS installer!", "Success", wx.OK)
+                    popup_message = wx.MessageDialog(self.frame, "Successfully created a macOS installer!", "Success", wx.OK)
                     popup_message.ShowModal()
                 else:
                     self.dialog = wx.MessageDialog(
                         parent=self.frame,
                         message="Would you like to continue and Install OpenCore to this disk?",
-                        caption="Sucessfully created the macOS installer!",
+                        caption="Successfully created the macOS installer!",
                         style=wx.YES_NO | wx.ICON_QUESTION
                     )
                     self.dialog.SetYesNoLabels("Install OpenCore to disk", "Skip")
-                    responce = self.dialog.ShowModal()
-                    if responce == wx.ID_YES:
+                    response = self.dialog.ShowModal()
+                    if response == wx.ID_YES:
                         self.constants.start_build_install = True
                         self.build_install_menu()
         else:
             print("- Failed to create installer script")
+            self.progress_label.SetLabel("Failed to copy files to tmp directory")
+            self.progress_label.Centre(wx.HORIZONTAL)
+            popup_message = wx.MessageDialog(self.frame, "Failed to prepare the base files for installer creation.\n\nPlease ensure you have 20GB~ free on-disk before starting to ensure the installer has enough room to work.", "Error", wx.OK)
+            popup_message.ShowModal()
         self.return_to_main_menu.Enable()
 
+    def prepare_script(self, installer_path, disk):
+        self.prepare_result = installer.generate_installer_creation_script(self.constants.payload_path, installer_path, disk)
+
     def start_script(self):
         utilities.disable_sleep_while_running()
         args = [self.constants.oclp_helper_path, "/bin/sh", self.constants.installer_sh_path]
         output, error, returncode = run.Run()._stream_output(comm=args)
         if "Install media now available at" in output:
-            print("- Sucessfully created macOS installer")
+            print("- Successfully created macOS installer")
             while self.download_thread.is_alive():
                 # wait for download_thread to finish
                 # though highly unlikely this thread is still alive (flashing an Installer will take a while)
@@ -1944,12 +2224,9 @@ class wx_python_gui:
         #   - When running from source/unable to find on Github, use the nightly.link variant
         #   - If nightly also fails, fall back to the manually uploaded variant
         link = self.constants.installer_pkg_url
-        if not utilities.validate_link(link):
+        if utilities.validate_link(link) is False:
             print("- Stock Install.pkg is missing on Github, falling back to Nightly")
             link = self.constants.installer_pkg_url_nightly
-            if not utilities.validate_link(link):
-                print("- Nightly Install.pkg is missing on Github, exiting")
-                return
 
         if link.endswith(".zip"):
             path = self.constants.installer_pkg_zip_path
@@ -1982,7 +2259,7 @@ class wx_python_gui:
         # Define Menu
         # - Header: Settings
         # - Dropdown: Model
-        # - Chechboxes:
+        # - Checkboxes:
         #   - Verbose
         #   - Kext Debug
         #   - OpenCore Debug
@@ -2162,16 +2439,31 @@ class wx_python_gui:
         if user_choice == self.computer.real_model:
             print(f"Using Real Model: {user_choice}")
             self.constants.custom_model = None
-            defaults.generate_defaults.probe(self.computer.real_model, True, self.constants)
+            defaults.generate_defaults(self.computer.real_model, True, self.constants)
         else:
             print(f"Using Custom Model: {user_choice}")
             self.constants.custom_model = user_choice
-            defaults.generate_defaults.probe(self.constants.custom_model, False, self.constants)
+            defaults.generate_defaults(self.constants.custom_model, False, self.constants)
         # Reload Settings
         self.settings_menu(None)
 
     def allow_native_models_click(self, event=None):
         if self.checkbox_allow_native_models.GetValue():
+            # Throw a prompt warning about this
+            dlg = wx.MessageDialog(self.frame_modal, "This option should only be used if your Mac natively supports the OSes you wish to run.\n\nIf you are currently running an unsupported OS, this option will break booting. Only toggle for enabling OS features on a native Mac.\n\nAre you certain you want to continue?", "Warning", wx.YES_NO | wx.ICON_WARNING)
+            if dlg.ShowModal() == wx.ID_NO:
+                self.checkbox_allow_native_models.SetValue(False)
+                return
+            # If the system is running an unsupported OS, throw a second warning
+            if self.constants.computer.real_model in smbios_data.smbios_dictionary:
+                if self.constants.detected_os > smbios_data.smbios_dictionary[self.constants.computer.real_model]["Max OS Supported"]:
+                    chassis_type = "aluminum"
+                    if self.constants.computer.real_model in ["MacBook4,1", "MacBook5,2", "MacBook6,1", "MacBook7,1"]:
+                        chassis_type = "plastic"
+                    dlg = wx.MessageDialog(self.frame_modal, f"This model, {self.constants.computer.real_model}, does not natively support macOS {os_data.os_conversion.kernel_to_os(self.constants.detected_os)}, {os_data.os_conversion.convert_kernel_to_marketing_name(self.constants.detected_os)}. The last native OS was macOS {os_data.os_conversion.kernel_to_os(smbios_data.smbios_dictionary[self.constants.computer.real_model]['Max OS Supported'])}, {os_data.os_conversion.convert_kernel_to_marketing_name(smbios_data.smbios_dictionary[self.constants.computer.real_model]['Max OS Supported'])}\n\nToggling this option will break booting on this OS. Are you absolutely certain this is desired?\n\nYou may end up with a nice {chassis_type} brick 🧱", "Are you certain?", wx.YES_NO | wx.ICON_WARNING)
+                    if dlg.ShowModal() == wx.ID_NO:
+                        self.checkbox_allow_native_models.SetValue(False)
+                        return
             print("Allow Native Models")
             self.constants.allow_oc_everywhere = True
             self.constants.serial_settings = "None"
@@ -2263,20 +2555,48 @@ class wx_python_gui:
         self.gpu_dropdown.SetSelection(0)
         self.gpu_dropdown.SetPosition(wx.Point(
             self.label_model.GetPosition().x,
-            self.label_model.GetPosition().y + self.label_model.GetSize().height / 1.5))
+            int(self.label_model.GetPosition().y + self.label_model.GetSize().height / 1.5)))
         self.gpu_dropdown.Bind(wx.EVT_CHOICE, self.gpu_selection_click)
         self.gpu_dropdown.Centre(wx.HORIZONTAL)
         self.gpu_dropdown.SetToolTip(wx.ToolTip("Configures MXM GPU Vendor logic on pre-built models\nIf you are not using MXM iMacs, please leave this setting as is."))
-        if self.computer.real_model not in ["iMac10,1", "iMac11,1", "iMac11,2", "iMac11,3", "iMac12,1", "iMac12,2"]:
+        models = ["iMac10,1", "iMac11,1", "iMac11,2", "iMac11,3", "iMac12,1", "iMac12,2"]
+        if (not self.constants.custom_model and self.computer.real_model not in models) or (self.constants.custom_model and self.constants.custom_model not in models):
             self.gpu_dropdown.Disable()
 
+        # OpenCore Picker Timeout (using wxSpinCtrl)
+        # Label: Picker Timeout
+        self.label_timeout = wx.StaticText(self.frame_modal, label="Picker Timeout (seconds):", style=wx.ALIGN_CENTRE)
+        self.label_timeout.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
+        self.label_timeout.SetPosition(wx.Point(0, self.gpu_dropdown.GetPosition().y + self.gpu_dropdown.GetSize().height + 2))
+        self.label_timeout.SetSize(wx.Size(self.frame_modal.GetSize().width, 30))
+        self.label_timeout.Centre(wx.HORIZONTAL)
+
+        # Picker Timeout
+        self.timeout_spinner = wx.SpinCtrl(self.frame_modal, value=f"{self.constants.oc_timeout}", min=0, max=60)
+        self.timeout_spinner.SetPosition(wx.Point(
+            self.label_timeout.GetPosition().x,
+            int(self.label_timeout.GetPosition().y + self.label_timeout.GetSize().height / 2)))
+        self.timeout_spinner.Bind(wx.EVT_SPINCTRL, self.timeout_spinner_click)
+        self.timeout_spinner.Centre(wx.HORIZONTAL)
+
+        # AMD GOP Injection
+        self.set_gop_injection = wx.CheckBox(self.frame_modal, label="AMD GOP Injection")
+        self.set_gop_injection.SetPosition(wx.Point(
+            30,
+            self.timeout_spinner.GetPosition().y + self.timeout_spinner.GetSize().height + 5))
+        self.set_gop_injection.SetValue(self.constants.gop_injection)
+        self.set_gop_injection.Bind(wx.EVT_CHECKBOX, self.gop_injection_checkbox_click)
+        models = ["iMac10,1", "iMac11,1", "iMac11,2", "iMac11,3", "iMac12,1", "iMac12,2", "MacPro3,1", "MacPro4,1", "MacPro5,1", "Xserve2,1", "Xserve3,1"]
+        if (not self.constants.custom_model and self.computer.real_model not in models) or (self.constants.custom_model and self.constants.custom_model not in models):
+            self.set_gop_injection.Disable()
+
         # Disable Thunderbolt
         self.disable_thunderbolt_checkbox = wx.CheckBox(self.frame_modal, label="Disable Thunderbolt")
         self.disable_thunderbolt_checkbox.SetValue(self.constants.disable_tb)
         self.disable_thunderbolt_checkbox.Bind(wx.EVT_CHECKBOX, self.disable_tb_click)
         self.disable_thunderbolt_checkbox.SetPosition(wx.Point(
-            30,
-            self.gpu_dropdown.GetPosition().y + self.gpu_dropdown.GetSize().height + 5))
+            self.set_gop_injection.GetPosition().x,
+            self.set_gop_injection.GetPosition().y + self.set_gop_injection.GetSize().height))
         self.disable_thunderbolt_checkbox.SetToolTip(wx.ToolTip("Disables Thunderbolt support on MacBookPro11,x\nMainly applicable for systems that cannot boot with Thunderbolt enabled"))
         if not self.constants.custom_model and not self.computer.real_model.startswith("MacBookPro11"):
             self.disable_thunderbolt_checkbox.Disable()
@@ -2290,6 +2610,7 @@ class wx_python_gui:
         self.set_terascale_accel_checkbox.SetToolTip(wx.ToolTip("This option will determine whether TeraScale 2 acceleration is available during Root Volume patching.\nOnly applicable if your system has a AMD TeraScale 2 GPU (ie. MacBookPro8,2/3)"))
         if self.computer.real_model not in ["MacBookPro8,2", "MacBookPro8,3"]:
             self.set_terascale_accel_checkbox.Disable()
+            self.set_terascale_accel_checkbox.SetValue(False)
 
         # Force Web Drivers in Tesla/Kepler
         self.force_web_drivers_checkbox = wx.CheckBox(self.frame_modal, label="Force Web Drivers")
@@ -2326,7 +2647,7 @@ class wx_python_gui:
         self.disable_battery_throttling_checkbox.SetPosition(wx.Point(
             self.hibernation_checkbox.GetPosition().x,
             self.hibernation_checkbox.GetPosition().y + self.hibernation_checkbox.GetSize().height))
-        self.disable_battery_throttling_checkbox.SetToolTip(wx.ToolTip("This will forcefully disable MSR Power Control on Arrendale and newer Macs\nMainly applicable for systems with severe throttling due to missing battery or display"))
+        self.disable_battery_throttling_checkbox.SetToolTip(wx.ToolTip("This will forcefully disable MSR Power Control on Arrandale and newer Macs\nMainly applicable for systems with severe throttling due to missing battery or display"))
 
         # Disable XCPM
         self.disable_xcpm_checkbox = wx.CheckBox(self.frame_modal, label="Disable XCPM")
@@ -2387,16 +2708,47 @@ class wx_python_gui:
         if self.computer.third_party_sata_ssd is False and not self.constants.custom_model:
             self.set_enhanced_3rd_party_ssd_checkbox.Disable()
 
+        # Disable Library Validation
+        self.disable_library_validation_checkbox = wx.CheckBox(self.frame_modal, label="Disable Library Validation")
+        self.disable_library_validation_checkbox.SetValue(self.constants.disable_cs_lv)
+        self.disable_library_validation_checkbox.Bind(wx.EVT_CHECKBOX, self.disable_library_validation_click)
+        self.disable_library_validation_checkbox.SetPosition(wx.Point(
+            self.set_enhanced_3rd_party_ssd_checkbox.GetPosition().x,
+            self.set_enhanced_3rd_party_ssd_checkbox.GetPosition().y + self.set_enhanced_3rd_party_ssd_checkbox.GetSize().height
+        ))
+
+        # Disable AMFI
+        self.disable_amfi_checkbox = wx.CheckBox(self.frame_modal, label="Disable AMFI")
+        self.disable_amfi_checkbox.SetValue(self.constants.disable_amfi)
+        self.disable_amfi_checkbox.Bind(wx.EVT_CHECKBOX, self.disable_amfi_click)
+        self.disable_amfi_checkbox.SetPosition(wx.Point(
+            self.disable_library_validation_checkbox.GetPosition().x,
+            self.disable_library_validation_checkbox.GetPosition().y + self.disable_library_validation_checkbox.GetSize().height
+        ))
+        if self.constants.disable_cs_lv is False:
+            self.disable_amfi_checkbox.Disable()
+
+
+        # Delete Unused KDKs during patching
+        self.delete_unused_kdks_checkbox = wx.CheckBox(self.frame_modal, label="Delete Unused KDKs")
+        self.delete_unused_kdks_checkbox.SetValue(self.constants.should_nuke_kdks)
+        self.delete_unused_kdks_checkbox.Bind(wx.EVT_CHECKBOX, self.delete_unused_kdks_click)
+        self.delete_unused_kdks_checkbox.SetPosition(wx.Point(
+            self.disable_amfi_checkbox.GetPosition().x,
+            self.disable_amfi_checkbox.GetPosition().y + self.disable_amfi_checkbox.GetSize().height
+        ))
+        self.delete_unused_kdks_checkbox.SetToolTip(wx.ToolTip("This will delete unused KDKs during root patching.\nThis will save space on your drive, however can be disabled if you wish to keep KDKs installed."))
+
+
         # Set Ignore App Updates
         self.set_ignore_app_updates_checkbox = wx.CheckBox(self.frame_modal, label="Ignore App Updates")
         self.set_ignore_app_updates_checkbox.SetValue(self.constants.ignore_updates)
         self.set_ignore_app_updates_checkbox.Bind(wx.EVT_CHECKBOX, self.set_ignore_app_updates_click)
         self.set_ignore_app_updates_checkbox.SetPosition(wx.Point(
-            self.set_enhanced_3rd_party_ssd_checkbox.GetPosition().x,
-            self.set_enhanced_3rd_party_ssd_checkbox.GetPosition().y + self.set_enhanced_3rd_party_ssd_checkbox.GetSize().height))
+            self.delete_unused_kdks_checkbox.GetPosition().x,
+            self.delete_unused_kdks_checkbox.GetPosition().y + self.delete_unused_kdks_checkbox.GetSize().height))
         self.set_ignore_app_updates_checkbox.SetToolTip(wx.ToolTip("This will set whether OpenCore will ignore App Updates on launch.\nEnable this option if you do not want to be prompted for App Updates"))
 
-
         # Button: Developer Debug Info
         self.debug_button = wx.Button(self.frame_modal, label="Developer Debug Info")
         self.debug_button.Bind(wx.EVT_BUTTON, self.additional_info_menu)
@@ -2418,6 +2770,36 @@ class wx_python_gui:
         self.frame_modal.SetSize(wx.Size(-1, self.return_to_main_menu_button.GetPosition().y + self.return_to_main_menu_button.GetSize().height + 40))
         self.frame_modal.ShowWindowModal()
 
+    def timeout_spinner_click(self, event):
+        self.constants.oc_timeout = self.timeout_spinner.GetValue()
+
+    def delete_unused_kdks_click(self, event):
+        if self.delete_unused_kdks_checkbox.GetValue() is True:
+            print("Nuke KDKs enabled")
+            self.constants.should_nuke_kdks = True
+        else:
+            print("Nuke KDKs disabled")
+            self.constants.should_nuke_kdks = False
+        global_settings.global_settings().write_property("ShouldNukeKDKs", self.constants.should_nuke_kdks)
+
+    def disable_library_validation_click(self, event):
+        if self.disable_library_validation_checkbox.GetValue():
+            print("Disable Library Validation")
+            self.disable_amfi_checkbox.Enable()
+            self.constants.disable_cs_lv = True
+        else:
+            print("Enable Library Validation")
+            self.disable_amfi_checkbox.Disable()
+            self.constants.disable_cs_lv = False
+
+    def disable_amfi_click(self, event):
+        if self.disable_amfi_checkbox.GetValue():
+            print("Disable AMFI")
+            self.constants.disable_amfi = True
+        else:
+            print("Enable AMFI")
+            self.constants.disable_amfi = False
+
     def set_ignore_app_updates_click(self, event):
         self.constants.ignore_updates = self.set_ignore_app_updates_checkbox.GetValue()
         if self.constants.ignore_updates is True:
@@ -2473,6 +2855,14 @@ class wx_python_gui:
             print("Content Caching Disabled")
             self.constants.set_content_caching = False
 
+    def gop_injection_checkbox_click(self, event=None):
+        if self.set_gop_injection.GetValue():
+            print("GOP Injection Enabled")
+            self.constants.gop_injection = True
+        else:
+            print("GOP Injection Disabled")
+            self.constants.gop_injection = False
+
     def disable_tb_click(self, event=None):
         if self.disable_thunderbolt_checkbox.GetValue():
             print("Disable Thunderbolt Enabled")
@@ -2660,6 +3050,8 @@ class wx_python_gui:
         self.smbios_model_dropdown.SetStringSelection(self.constants.override_smbios)
         self.smbios_model_dropdown.Bind(wx.EVT_CHOICE, self.smbios_model_click)
         self.smbios_model_dropdown.Center(wx.HORIZONTAL)
+        if self.smbios_dropdown.GetStringSelection() == "None":
+            self.smbios_model_dropdown.Disable()
 
         # Label: Custom Serial Number
         self.smbios_serial_label = wx.StaticText(self.frame_modal, label="Custom Serial Number")
@@ -2742,6 +3134,10 @@ class wx_python_gui:
         self.constants.custom_board_serial_number = self.smbios_board_serial_textbox.GetValue()
 
     def generate_new_serials_clicked(self, event):
+        # Throw pop up warning about misusing this feature
+        dlg = wx.MessageDialog(self.frame_modal, "Please take caution when using serial spoofing. This should only be used on machines that were legally obtained and require reserialization.\n\nNote: new serials are only overlayed through OpenCore and are not permanently installed into ROM.\n\nMisuse of this setting can break power management and other aspects of the OS if the system does not need spoofing\n\nDortania does not condone the use of our software on stolen devices.\n\nAre you certain you want to continue?", "Warning", wx.YES_NO | wx.ICON_WARNING)
+        if dlg.ShowModal() == wx.ID_NO:
+            return
         macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {self.constants.custom_model or self.computer.real_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         macserial_output = macserial_output.stdout.decode().strip().split(" | ")
         if len(macserial_output) == 2:
@@ -2760,9 +3156,19 @@ class wx_python_gui:
             self.constants.allow_native_spoofs = False
 
     def smbios_spoof_level_click(self, event=None):
+        # Throw pop up warning about misusing this feature
         selection = self.smbios_dropdown.GetStringSelection()
+        if selection != "None":
+            dlg = wx.MessageDialog(self.frame_modal, "This option should only be used when you need to change the machine's SMBIOS data.\n\nMisuse of this option can break OS functionality. Only use if you absolutely understand the need for this setting\n\nAre you certain you want to continue?", "Warning", wx.YES_NO | wx.ICON_WARNING)
+            if dlg.ShowModal() == wx.ID_NO:
+                self.smbios_dropdown.SetStringSelection(self.constants.serial_settings)
+                return
         print(f"SMBIOS Spoof Level: {selection}")
         self.constants.serial_settings = selection
+        if selection == "None":
+            self.smbios_model_dropdown.Disable()
+        else:
+            self.smbios_model_dropdown.Enable()
 
     def smbios_model_click(self, event=None):
         selection = self.smbios_model_dropdown.GetStringSelection()
@@ -2908,9 +3314,9 @@ class wx_python_gui:
         self.configure_sip_title.SetFont(wx.Font(18, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD))
         self.configure_sip_title.Center(wx.HORIZONTAL)
 
-        # Label: Flip indivdual bits corresponding to XNU's csr.h
+        # Label: Flip individual bits corresponding to XNU's csr.h
         # If you're unfamiliar with how SIP works, do not touch this menu
-        self.sip_label = wx.StaticText(self.frame_modal, label="Flip indivdual bits corresponding to")
+        self.sip_label = wx.StaticText(self.frame_modal, label="Flip individual bits corresponding to")
         self.sip_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
         self.sip_label.SetPosition(
             wx.Point(-1, self.configure_sip_title.GetPosition().y + self.configure_sip_title.GetSize().height + 10)
@@ -2939,7 +3345,7 @@ class wx_python_gui:
         elif self.constants.sip_status is True:
             self.sip_value = 0x00
         else:
-            self.sip_value = 0x802
+            self.sip_value = 0x803
 
         self.sip_label_2 = wx.StaticText(self.frame_modal, label=f"Currently configured SIP: {hex(self.sip_value)}")
         self.sip_label_2.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD))
@@ -2955,21 +3361,21 @@ class wx_python_gui:
         )
         self.sip_label_2_2.Center(wx.HORIZONTAL)
 
-        self.sip_label_3 = wx.StaticText(self.frame_modal, label="For older Macs requiring root patching, we set SIP to\n be partially disabled (0x802) to allow root patching.")
+        self.sip_label_3 = wx.StaticText(self.frame_modal, label="For older Macs requiring root patching, we set SIP to\n be partially disabled (0x803) to allow root patching.")
         self.sip_label_3.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
         self.sip_label_3.SetPosition(
             wx.Point(self.sip_label_2_2.GetPosition().x, self.sip_label_2_2.GetPosition().y + self.sip_label_2_2.GetSize().height + 10)
         )
         self.sip_label_3.Center(wx.HORIZONTAL)
 
-        self.sip_label_4 = wx.StaticText(self.frame_modal, label="This value (0x802) corresponds to the following bits in csr.h:")
+        self.sip_label_4 = wx.StaticText(self.frame_modal, label="This value (0x803) corresponds to the following bits in csr.h:")
         self.sip_label_4.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
         self.sip_label_4.SetPosition(
             wx.Point(self.sip_label_3.GetPosition().x, self.sip_label_3.GetPosition().y + self.sip_label_3.GetSize().height + 5)
         )
         self.sip_label_4.Center(wx.HORIZONTAL)
 
-        self.sip_label_5 = wx.StaticText(self.frame_modal, label="   0x2     - CSR_ALLOW_UNRESTRICTED_FS\n   0x800 - CSR_ALLOW_UNAUTHENTICATED_ROOT")
+        self.sip_label_5 = wx.StaticText(self.frame_modal, label="      0x1  - CSR_ALLOW_UNTRUSTED_KEXTS\n      0x2  - CSR_ALLOW_UNRESTRICTED_FS\n   0x800 - CSR_ALLOW_UNAUTHENTICATED_ROOT")
         self.sip_label_5.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
         self.sip_label_5.SetPosition(
             wx.Point(self.sip_label_4.GetPosition().x, self.sip_label_4.GetPosition().y + self.sip_label_4.GetSize().height + 7)
@@ -3023,7 +3429,7 @@ OpenCore Legacy Patcher by default knows the most ideal
         if hex(self.sip_value) == "0x0":
             self.constants.custom_sip_value = None
             self.constants.sip_status = True
-        elif hex(self.sip_value) == "0x802":
+        elif hex(self.sip_value) == "0x803":
             self.constants.custom_sip_value = None
             self.constants.sip_status = False
         else:
@@ -3054,7 +3460,7 @@ OpenCore Legacy Patcher by default knows the most ideal
         self.subheader_2.SetSize(wx.Size(self.frame_modal.GetSize().width, 30))
         self.subheader_2.Centre(wx.HORIZONTAL)
 
-        # Label: Set FeatreUnlock status
+        # Label: Set FeatureUnlock status
         self.feature_unlock_label = wx.StaticText(self.frame_modal, label="Feature Unlock Status:", style=wx.ALIGN_CENTRE)
         self.feature_unlock_label.SetFont(wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL))
         self.feature_unlock_label.SetPosition(wx.Point(0, self.subheader_2.GetPosition().y + self.subheader_2.GetSize().height -5))

payloads/ACPI/Source/SSDT-CPBG.dsl

@@ -1,9 +1,9 @@
-/* Disable the non-existant Co-processor Bridge found on Arrendale, Lynnfield and Clarkdale Macs.
+/* Disable the non-existent Co-processor Bridge found on Arrandale, Lynnfield and Clarkdale Macs.
  * IOPCIFamily in macOS 11.0 up-to 11.2 was unable to handle ACPI probing when device was not present,
- * therefore kernel panicing the machine.
+ * therefore kernel panicking the machine.
  *
  * This SSDT reports the device as disabled avoiding the probing.
- * Not required for macOS 11.2 and newer, however recommended to alliviate pottential issues
+ * Not required for macOS 11.2 and newer, however recommended to alleviate potential issues
  */
 DefinitionBlock ("", "SSDT", 2, "DRTNIA", "CPBGoff", 0x00001000)
 {

payloads/ACPI/Source/SSDT-DGPU.dsl

@@ -4,15 +4,15 @@
  * hardware modifications.
  *
  * Notes:
- *       - SSDT must be used in conjuction with '_INI' to 'XINI' patch
+ *       - SSDT must be used in conjunction with '_INI' to 'XINI' patch
  *         to reroute PCI0 initialization.
- * 
+ *
  *       - AMD drivers in macOS may still attempt to attach and kernel
  *         panic. Disable the dGPU with class-code/device-id spoof or
  *         with '-wegnoegpu'.
  *
  *       - dGPU will reactivate with sleep-wake, additional process
- *         is needed to disable the dGPU. 
+ *         is needed to disable the dGPU.
  *         - ie. AMDGPUWakeHandler.kext for macOS
  *
  * Ref:
@@ -30,13 +30,13 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "dGPU_OFF", 0x00001000)
         OperationRegion (IOGP, SystemIO, 0x0700, 0x51)
         Field (IOGP, ByteAcc, NoLock, Preserve)
         {
-            Offset (0x10), 
-            P710,   8, 
-            Offset (0x28), 
-            P728,   8, 
-            Offset (0x40), 
-            P740,   8, 
-            Offset (0x50), 
+            Offset (0x10),
+            P710,   8,
+            Offset (0x28),
+            P728,   8,
+            Offset (0x40),
+            P740,   8,
+            Offset (0x50),
             P750,   8
         }
 
@@ -90,7 +90,7 @@ DefinitionBlock ("", "SSDT", 2, "DRTNIA", "dGPU_OFF", 0x00001000)
                     Store (0x07D9, OSYS)
                 }
             }
-            
+
             // Disables dGPU
             Store ("Requesting dGPU power off", Debug)
             P728 = One  // Switch select

payloads/ACPI/Source/SSDT-PCI.dsl

@@ -1,6 +1,6 @@
 /* Removes PCI0's 32-bit Allocation Limitation to resolve PCIe device support on Sandy and
  * Ivy Bridge Macs, mainly applicable for Audio and eGPU support.
- * BUF0 to BUF1 patch required to override exisiting BuffObj in DSDT.
+ * BUF0 to BUF1 patch required to override existing BuffObj in DSDT.
  *
  * Source:
  * https://egpu.io/forums/pc-setup/fix-dsdt-override-to-correct-error-12/

payloads/Config/config.plist

@@ -19,7 +19,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>Comment</key>
-				<string>Patch CPBG for Arrendale, Lynnfield and Clarkdale</string>
+				<string>Patch CPBG for Arrandale, Lynnfield and Clarkdale</string>
 				<key>Path</key>
 				<string>SSDT-CPBG.aml</string>
 			</dict>
@@ -663,6 +663,42 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>Intel 80003ES2LAN Ethernet Patch</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>BundlePath</key>
+				<string>Intel82574L.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/Intel82574L</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>Intel 82574L Ethernet Patch</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>BundlePath</key>
+				<string>AppleIntel8254XEthernet.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleIntel8254XEthernet</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -1233,12 +1269,30 @@
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/NoAVXFSCompressionTypeZlib</string>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>21.99.99</string>
 				<key>MinKernel</key>
 				<string>21.5.0</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>NoAVXFSCompressionTypeZlib-AVXpel.kext</string>
+				<key>Comment</key>
+				<string>Work-around 13.0+ Zlib kernel panic</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/NoAVXFSCompressionTypeZlib</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -1267,7 +1321,205 @@
 				<key>Enabled</key>
 				<false/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/AppleUSBTopCase</string>
+				<string></string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCButtons.kext</string>
+				<key>Comment</key>
+				<string>AppleUSBTCButtons</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBTCButtons</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyboard.kext</string>
+				<key>Comment</key>
+				<string>AppleUSBTCKeyboard</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBTCKeyboard</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyEventDriver.kext</string>
+				<key>Comment</key>
+				<string>AppleUSBTCKeyEventDriver</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBTCKeyEventDriver</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>USB1.1-Injector.kext/Contents/PlugIns/AppleUSBOHCI.kext</string>
+				<key>Comment</key>
+				<string>USB1.1 - AppleUSBOHCI</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBOHCI</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>USB1.1-Injector.kext/Contents/PlugIns/AppleUSBOHCIPCI.kext</string>
+				<key>Comment</key>
+				<string>USB1.1 - AppleUSBOHCIPCI</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBOHCIPCI</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>USB1.1-Injector.kext/Contents/PlugIns/AppleUSBUHCI.kext</string>
+				<key>Comment</key>
+				<string>USB1.1 - AppleUSBUHCI</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBUHCI</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>USB1.1-Injector.kext/Contents/PlugIns/AppleUSBUHCIPCI.kext</string>
+				<key>Comment</key>
+				<string>USB1.1 - AppleUSBUHCIPCI</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBUHCIPCI</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>CryptexFixup.kext</string>
+				<key>Comment</key>
+				<string>CryptexFixup</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/CryptexFixup</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>20.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleIntelCPUPowerManagement.kext</string>
+				<key>Comment</key>
+				<string>Legacy Power Management (pre-XCPM)</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleIntelCPUPowerManagement</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleIntelCPUPowerManagementClient.kext</string>
+				<key>Comment</key>
+				<string>Legacy Power Management (pre-XCPM) Helper</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleIntelCPUPowerManagementClient</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>MonteAHCIPort.kext</string>
+				<key>Comment</key>
+				<string>MonteAHCIPort</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/MonteAHCIPort</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -1511,7 +1763,7 @@
 				<key>Base</key>
 				<string></string>
 				<key>Comment</key>
-				<string>Reroute kern.hv_vmm_present patch (2)</string>
+				<string>Reroute kern.hv_vmm_present patch (2) Legacy</string>
 				<key>Count</key>
 				<integer>1</integer>
 				<key>Enabled</key>
@@ -1525,7 +1777,7 @@
 				<key>Mask</key>
 				<data></data>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>21.99.99</string>
 				<key>MinKernel</key>
 				<string>20.4.0</string>
 				<key>Replace</key>
@@ -1535,6 +1787,36 @@
 				<key>Skip</key>
 				<integer>0</integer>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string></string>
+				<key>Comment</key>
+				<string>Reroute kern.hv_vmm_present patch (2) Ventura</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>Ym9vdCBzZXNzaW9uIFVVSUQAaHZfdm1tX3ByZXNlbnQA</data>
+				<key>Identifier</key>
+				<string>kernel</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>Replace</key>
+				<data>Ym9vdCBzZXNzaW9uIFVVSUQAZGlyZWN0X2hhbmRvZmYA</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -1565,6 +1847,66 @@
 				<key>Skip</key>
 				<integer>0</integer>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>_authenticate_root_hash</string>
+				<key>Comment</key>
+				<string>Disable Root Hash validation</string>
+				<key>Count</key>
+				<integer>0</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data></data>
+				<key>Identifier</key>
+				<string>com.apple.filesystems.apfs</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>Replace</key>
+				<data>uAAAAADD</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>__ZL22_vnode_check_signatureP5vnodeP5labeliP7cs_blobPjS5_ijPPcPm</string>
+				<key>Comment</key>
+				<string>Disable _csr_check() in _vnode_check_signature</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>AQAAAOgAAAAAhcB1</data>
+				<key>Identifier</key>
+				<string>com.apple.driver.AppleMobileFileIntegrity</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data>//////8AAAAA////</data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>Replace</key>
+				<data>AQAAALgBAAAAhcB1</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
 		</array>
 		<key>Quirks</key>
 		<dict>
@@ -1652,7 +1994,7 @@
 			<key>PollAppleHotKeys</key>
 			<true/>
 			<key>ShowPicker</key>
-			<true/>
+			<string>SkipOnHibernateWake</string>
 			<key>TakeoffDelay</key>
 			<integer>0</integer>
 			<key>Timeout</key>
@@ -1681,12 +2023,8 @@
 		<array/>
 		<key>Security</key>
 		<dict>
-			<key>AllowNvramReset</key>
-			<true/>
 			<key>AllowSetDefault</key>
 			<true/>
-			<key>AllowToggleSip</key>
-			<false/>
 			<key>ApECID</key>
 			<integer>0</integer>
 			<key>AuthRestart</key>
@@ -1767,6 +2105,8 @@
 				<false/>
 				<key>TextMode</key>
 				<false/>
+				<key>FullNvramAccess</key>
+				<false/>
 			</dict>
 			<dict>
 				<key>Arguments</key>
@@ -1787,6 +2127,8 @@
 				<false/>
 				<key>TextMode</key>
 				<true/>
+				<key>FullNvramAccess</key>
+				<false/>
 			</dict>
 		</array>
 	</dict>
@@ -1840,8 +2182,6 @@
 			<key>FA4CE28D-B62F-4C99-9CC3-6815686E30F9</key>
 			<array/>
 		</dict>
-		<key>LegacyEnable</key>
-		<false/>
 		<key>LegacyOverwrite</key>
 		<false/>
 		<key>LegacySchema</key>
@@ -2021,6 +2361,12 @@
 			<integer>0</integer>
 			<key>KeySubsequentDelay</key>
 			<integer>5</integer>
+			<key>PointerDwellClickTimeout</key>
+			<integer>0</integer>
+			<key>PointerDwellDoubleClickTimeout</key>
+			<integer>0</integer>
+			<key>PointerDwellRadius</key>
+			<integer>0</integer>
 			<key>PointerPollMask</key>
 			<integer>-1</integer>
 			<key>PointerPollMax</key>
@@ -2072,6 +2418,8 @@
 				<false/>
 				<key>Arguments</key>
 				<string></string>
+				<key>LoadEarly</key>
+				<false/>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -2082,6 +2430,8 @@
 				<false/>
 				<key>Arguments</key>
 				<string></string>
+				<key>LoadEarly</key>
+				<false/>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -2092,6 +2442,8 @@
 				<false/>
 				<key>Arguments</key>
 				<string></string>
+				<key>LoadEarly</key>
+				<false/>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -2102,6 +2454,8 @@
 				<false/>
 				<key>Arguments</key>
 				<string></string>
+				<key>LoadEarly</key>
+				<false/>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -2112,6 +2466,8 @@
 				<false/>
 				<key>Arguments</key>
 				<string></string>
+				<key>LoadEarly</key>
+				<false/>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -2122,6 +2478,8 @@
 				<false/>
 				<key>Arguments</key>
 				<string></string>
+				<key>LoadEarly</key>
+				<false/>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -2132,6 +2490,32 @@
 				<false/>
 				<key>Arguments</key>
 				<string></string>
+				<key>LoadEarly</key>
+				<false/>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string></string>
+				<key>Path</key>
+				<string>ResetNvramEntry.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+				<key>LoadEarly</key>
+				<false/>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string></string>
+				<key>Path</key>
+				<string>AMDGOP.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+				<key>LoadEarly</key>
+				<false/>
 			</dict>
 		</array>
 		<key>Input</key>

payloads/InstallPackage/AutoPkg-Assets-Setup.pkgproj

@@ -583,6 +583,43 @@
 				<key>SHARED_SETTINGS_FOR_ALL_APPAREANCES</key>
 				<true/>
 			</dict>
+			<key>INSTALLATION TYPE</key>
+			<dict>
+				<key>HIERARCHIES</key>
+				<dict>
+					<key>INSTALLER</key>
+					<dict>
+						<key>LIST</key>
+						<array>
+							<dict>
+								<key>CHILDREN</key>
+								<array/>
+								<key>DESCRIPTION</key>
+								<array/>
+								<key>OPTIONS</key>
+								<dict>
+									<key>HIDDEN</key>
+									<false/>
+									<key>STATE</key>
+									<integer>1</integer>
+								</dict>
+								<key>PACKAGE_UUID</key>
+								<string>4312D78E-7981-41F2-A0E9-5C7E11AC61C5</string>
+								<key>TITLE</key>
+								<array/>
+								<key>TYPE</key>
+								<integer>0</integer>
+								<key>UUID</key>
+								<string>B3E23E4E-EF8D-4C21-933E-03C8187D415B</string>
+							</dict>
+						</array>
+						<key>REMOVED</key>
+						<dict/>
+					</dict>
+				</dict>
+				<key>MODE</key>
+				<integer>0</integer>
+			</dict>
 			<key>INSTALLATION_STEPS</key>
 			<array>
 				<dict>
@@ -645,7 +682,19 @@
 			<key>INTRODUCTION</key>
 			<dict>
 				<key>LOCALIZATIONS</key>
-				<array/>
+				<array>
+					<dict>
+						<key>LANGUAGE</key>
+						<string>English</string>
+						<key>VALUE</key>
+						<dict>
+							<key>PATH</key>
+							<string>intro.txt</string>
+							<key>PATH_TYPE</key>
+							<integer>1</integer>
+						</dict>
+					</dict>
+				</array>
 			</dict>
 			<key>LICENSE</key>
 			<dict>
@@ -659,6 +708,11 @@
 				<key>LOCALIZATIONS</key>
 				<array/>
 			</dict>
+			<key>SUMMARY</key>
+			<dict>
+				<key>LOCALIZATIONS</key>
+				<array/>
+			</dict>
 			<key>TITLE</key>
 			<dict>
 				<key>LOCALIZATIONS</key>
@@ -675,7 +729,65 @@
 		<key>PROJECT_REQUIREMENTS</key>
 		<dict>
 			<key>LIST</key>
-			<array/>
+			<array>
+				<dict>
+					<key>BEHAVIOR</key>
+					<integer>3</integer>
+					<key>DICTIONARY</key>
+					<dict>
+						<key>IC_REQUIREMENT_FILES_CONDITION</key>
+						<integer>1</integer>
+						<key>IC_REQUIREMENT_FILES_DISK_TYPE</key>
+						<integer>0</integer>
+						<key>IC_REQUIREMENT_FILES_LIST</key>
+						<array>
+							<string>/System/Library/CoreServices/OpenCore-Legacy-Patcher.plist</string>
+						</array>
+						<key>IC_REQUIREMENT_FILES_SELECTOR</key>
+						<integer>0</integer>
+					</dict>
+					<key>IC_REQUIREMENT_CHECK_TYPE</key>
+					<integer>1</integer>
+					<key>IDENTIFIER</key>
+					<string>fr.whitebox.Packages.requirement.files</string>
+					<key>MESSAGE</key>
+					<array>
+						<dict>
+							<key>LANGUAGE</key>
+							<string>English</string>
+							<key>VALUE</key>
+							<string>AutoPkg-Assets.pkg should never be used by end-users manually, please use the OpenCore-Patcher.app listed on Github</string>
+						</dict>
+					</array>
+					<key>NAME</key>
+					<string>Files</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+				<dict>
+					<key>BEHAVIOR</key>
+					<integer>3</integer>
+					<key>DICTIONARY</key>
+					<dict>
+						<key>IC_REQUIREMENT_OS_DISK_TYPE</key>
+						<integer>0</integer>
+						<key>IC_REQUIREMENT_OS_DISTRIBUTION_TYPE</key>
+						<integer>0</integer>
+						<key>IC_REQUIREMENT_OS_MINIMUM_VERSION</key>
+						<integer>110000</integer>
+					</dict>
+					<key>IC_REQUIREMENT_CHECK_TYPE</key>
+					<integer>1</integer>
+					<key>IDENTIFIER</key>
+					<string>fr.whitebox.Packages.requirement.os</string>
+					<key>MESSAGE</key>
+					<array/>
+					<key>NAME</key>
+					<string>Operating System</string>
+					<key>STATE</key>
+					<true/>
+				</dict>
+			</array>
 			<key>RESOURCES</key>
 			<array/>
 			<key>ROOT_VOLUME_ONLY</key>

payloads/InstallPackage/intro.txt

@@ -0,0 +1,7 @@
+DO NOT RUN AUTOPKG-ASSETS MANUALLY!
+
+THIS CAN BREAK YOUR SYSTEM'S INSTALL!
+
+This package should only ever be invoked by the Patcher itself, never downloaded or run by the user. Download the OpenCore-Patcher.app on the Github Repository.
+
+https://github.com/dortania/OpenCore-Legacy-Patcher/releases/

payloads/Kexts/Acidanthera/BlueToolFixup.patch

@@ -1,40 +0,0 @@
-diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp
-index a6e3c69..5e8a424 100644
---- a/BrcmPatchRAM/BlueToolFixup.cpp
-+++ b/BrcmPatchRAM/BlueToolFixup.cpp
-@@ -48,6 +48,27 @@ bool BlueToolFixup::start(IOService *provider) {
- static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate";
- static const uint8_t kSkipUpdateFilePathPatched[]  = "/System/Library/CoreServices/boot.efi";
- 
-+
-+// Workaround 12.4 Beta 3+ bug where macOS may detect the Bluetooth chipset twice
-+// Once as internal, and second as an external dongle:
-+// 'ERROR -- Third Party Dongle has the same address as the internal module'
-+// Applicable for BCM2046 and BCM2070 chipsets (BT2.1)
-+static const uint8_t kSkipAddressCheckOriginal[] =
-+{
-+    0x48, 0x89, 0xF3,             // mov    rbx, rsi
-+    0xE8, 0xE3, 0xF3, 0xFE, 0xFF, // call   sub_1000c5bc6
-+    0x85, 0xC0,                   // test   eax, eax
-+    0x74, 0x1D,                   // je     loc_1000d6804
-+};
-+
-+static const uint8_t kSkipAddressCheckPatched[] =
-+{
-+    0x48, 0x89, 0xF3,             // mov        rbx, rsi
-+    0xE8, 0xE3, 0xF3, 0xFE, 0xFF, // call       sub_1000c5bc6
-+    0x85, 0xC0,                   // test       eax, eax
-+    0x72, 0x1D,                   // jb short   loc_1000d6804
-+};
-+
- static const uint8_t kVendorCheckOriginal[] =
- {
-     0x81, 0xFA,              // cmp edx
-@@ -131,6 +152,7 @@ static void patched_cs_validate_page(vnode_t vp, memory_object_t pager, memory_o
-         }
-         else if (strcmp(path + dirLength, "bluetoothd") == 0) {
-             searchAndPatch(data, PAGE_SIZE, path, kVendorCheckOriginal, kVendorCheckPatched);
-+            searchAndPatch(data, PAGE_SIZE, path, kSkipAddressCheckOriginal, kSkipAddressCheckPatched);
-             searchAndPatch(data, PAGE_SIZE, path, kBadChipsetCheckOriginal, kBadChipsetCheckPatched);
-             if (shouldPatchBoardId)
-                 searchAndPatch(data, PAGE_SIZE, path, boardIdsWithUSBBluetooth[0], kBoardIdSize, BaseDeviceInfo::get().boardIdentifier, kBoardIdSize);

payloads/Kexts/Acidanthera/RestrictEvents-MBP91.patch

@@ -1,12 +0,0 @@
-diff --git a/RestrictEvents/RestrictEvents.cpp b/RestrictEvents/RestrictEvents.cpp
-index 27562f0..66365a3 100644
---- a/RestrictEvents/RestrictEvents.cpp
-+++ b/RestrictEvents/RestrictEvents.cpp
-@@ -61,6 +61,7 @@ struct RestrictEventsPolicy {
- 		static const char *procBlacklist[] {
- 			"/System/Library/CoreServices/ExpansionSlotNotification",
- 			"/System/Library/CoreServices/MemorySlotNotification",
-+			"/usr/libexec/displaypolicyd",
- 		};
- 
- 		char pathbuf[MAXPATHLEN];