Avoid patching Metal and non-metal together

Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/501

.flake8

@@ -1,4 +1,4 @@
 [flake8]
-ignore = E501
+extend-ignore = E501, E203
 per-file-ignores =
     Resources/Constants.py:E704

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help notify of issues
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the issue is. 
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Open app or .command '...'
-2. Enter '....'
-3. See error
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Build Folder**
-If applicable, add the generated OpenCore Build to help explain your problem.
-
-**Hardware (please complete the following information):**
- - OS Running (ie. macOS 10.15.7, Catalina)
- - OS Patching (ie. macOS 11.2.3, Big Sur)
- - Model Patching (ie. MacPro5,1)
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,143 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: dropdown
+    id: machine
+    attributes:
+      label: Machine Model
+      description: What model was being patched?
+      options:
+        - MacBook4,1
+        - MacBook5,1
+        - MacBook5,2
+        - MacBook6,1
+        - MacBook7,1
+        - MacBook8,1
+        - MacBookAir2,1
+        - MacBookAir3,1
+        - MacBookAir3,2
+        - MacBookAir4,1
+        - MacBookAir4,2
+        - MacBookAir5,1
+        - MacBookAir5,2
+        - MacBookAir6,1
+        - MacBookAir6,2
+        - MacBookPro4,1
+        - MacBookPro5,1
+        - MacBookPro5,2
+        - MacBookPro5,3
+        - MacBookPro5,4
+        - MacBookPro5,5
+        - MacBookPro6,1
+        - MacBookPro6,2
+        - MacBookPro7,1
+        - MacBookPro8,1
+        - MacBookPro8,2
+        - MacBookPro8,3
+        - MacBookPro9,1
+        - MacBookPro9,2
+        - MacBookPro10,1
+        - MacBookPro10,2
+        - MacBookPro11,1
+        - MacBookPro11,2
+        - MacBookPro11,3
+        - Macmini3,1
+        - Macmini4,1
+        - Macmini5,1
+        - Macmini5,2
+        - Macmini5,3
+        - Macmini6,1
+        - Macmini6,2
+        - iMac7,1
+        - iMac8,1
+        - iMac9,1
+        - iMac10,1
+        - iMac11,1
+        - iMac11,2
+        - iMac11,3
+        - iMac12,1
+        - iMac12,2
+        - iMac13,1
+        - iMac13,2
+        - iMac13,3
+        - iMac14,1
+        - iMac14,2
+        - iMac14,3
+        - iMac14,4
+        - iMac15,1
+        - MacPro3,1
+        - MacPro4,1
+        - MacPro5,1
+        - Xserve2,1
+        - Xserve3,1
+        - Other/Non-Applicable
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Application Version
+      description: What build version of our software are you running?
+      options:
+        - Latest Build (nightly)
+        - Latest Release
+    validations:
+      required: true
+  - type: dropdown
+    id: variant
+    attributes:
+      label: Application Variant
+      description: What variant of our software are you running?
+      options:
+        - GUI (Graphical User Interface)
+        - TUI (Text User Interface)
+        - CLI (Command Line Interface)
+        - Other/Non-Applicable
+    validations:
+      required: true
+  - type: dropdown
+    id: os-version
+    attributes:
+      label: What versions of macOS are you seeing the problem on?
+      multiple: true
+      options:
+        - macOS 12, Monterey
+        - macOS 11, Big Sur
+        - macOS 10.15, Catalina
+        - macOS 10.14, Mojave
+        - macOS 10.13, High Sierra
+        - macOS 10.12, Sierra
+        - macOS 10.11, El Capitan
+        - Other/Non-Applicable
+    validations:
+      required: true
+  - type: dropdown
+    id: where-issue
+    attributes:
+      label: Where does this issue happen?
+      multiple: true
+      options:
+        - Between booting macOS and Login Screen
+        - Within macOS (Before Logging in)
+        - Within macOS (After Logging in)
+        - Other/Non-Applicable
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What is the Isssue?
+      description: Additionally, explain what you expected to happen?
+      value: "Please clearly explain the issue"
+    validations:
+      required: true
+  - type: textarea
+    id: extra-info
+    attributes:
+      label: Any Additional Information

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

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

@@ -0,0 +1,33 @@
+name: CI - Build Offline TUI
+
+on:
+  push:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Build Offline TUI
+    runs-on: x86_64_mojave
+    steps:
+      - uses: actions/checkout@v2
+      - run: python3 create-offline-build.py
+      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/pyinstaller OpenCore-Patcher.spec
+      - run: ./after_pyinstaller.sh
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
+      - run: cd dist; zip -r ../OpenCore-Patcher-TUI-Offline.app.zip OpenCore-Patcher.app
+      - name: Upload App to Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenCore-Patcher-TUI-Offline.app
+          path: OpenCore-Patcher-TUI-Offline.app.zip
+
+      - name: Upload to Release
+        if: github.event_name == 'release'
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: OpenCore-Patcher-TUI.app.zip
+          tag: ${{ github.ref }}
+          file_glob: true

.github/workflows/build-app.yml

@@ -0,0 +1,34 @@
+name: CI - Build TUI
+
+on:
+  push:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Build TUI
+    runs-on: x86_64_mojave
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/pyinstaller OpenCore-Patcher.spec
+      - run: ./after_pyinstaller.sh
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
+      - run: cd dist; zip -r ../OpenCore-Patcher-TUI.app.zip OpenCore-Patcher.app
+      - run: ./../sign-tui.sh
+      - name: Upload App to Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenCore-Patcher-TUI.app
+          path: OpenCore-Patcher-TUI.app.zip
+
+      - name: Upload to Release
+        if: github.event_name == 'release'
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: OpenCore-Patcher-TUI.app.zip
+          tag: ${{ github.ref }}
+          file_glob: true

.github/workflows/build-gui.yml

@@ -0,0 +1,50 @@
+name: CI - Build GUI
+
+on:
+  push:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Build GUI
+    runs-on: x86_64_mojave
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: /Library/Frameworks/Python.framework/Versions/3.9/bin/pyinstaller OCLP-CLI.spec
+      - run: cd dist; cp OCLP-CLI ../; cd ..
+      - run: zip OCLP-CLI.zip OCLP-CLI
+      - name: Download latest nightly OCLP-GUI
+        run: curl -S -L https://nightly.link/dortania/OCLP-GUI/workflows/build-app/master/OpenCore-Patcher-GUI.app.zip --output ./OpenCore-Patcher-GUI.app.zip
+      - run: unzip -o OpenCore-Patcher-GUI.app.zip
+      - run: unzip OpenCore-Patcher-GUI.app.zip; rm OpenCore-Patcher-GUI.app.zip
+      - name: Merge new GUI
+        run: cp OCLP-CLI OpenCore\ Patcher.app/Contents/Resources/
+      - run: python3 merge_gui.py
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements entitlements.plist -o runtime "OpenCore Patcher.app/Contents/Resources/OCLP-CLI"'
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements entitlements.plist -o runtime "OpenCore Patcher.app/Contents/Resources/oclpd"'
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements entitlements.plist -o runtime "OpenCore Patcher.app"'
+      - run: ditto -c -k --sequesterRsrc --keepParent OpenCore\ Patcher.app OpenCore-Patcher-GUI.app.zip
+      - run: ./../sign-gui.sh
+      - name: Upload GUI to Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenCore-Patcher-GUI.app
+          path: OpenCore-Patcher-GUI.app.zip
+      - name: Upload CLI to Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: OCLP-CLI
+          path: OCLP-CLI.zip
+      - name: Upload to Release
+        if: github.event_name == 'release'
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: OpenCore-Patcher-GUI.app.zip
+          tag: ${{ github.ref }}
+          file_glob: true
+      - name: Validate OpenCore
+        run: ./OCLP-CLI --validate

.github/workflows/build-site.yml

@@ -1,4 +1,4 @@
-name: Build/Test/Deploy
+name: CI - Build Site
 on:
   push:
     branches-ignore:

.github/workflows/main.yml

@@ -1,45 +0,0 @@
-name: CI
-
-on:
-  push:
-  workflow_dispatch:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    name: Build App
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v2
-
-      # - name: Install Python Dependencies
-      #   run: |
-      #     python3 -m pip install -U pip
-      #     pip3 install pyinstaller
-
-      - run: pyinstaller Opencore-Patcher.spec
-      - run: ./after_pyinstaller.sh
-      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --deep --timestamp --entitlements entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
-
-      - run: cd dist; zip ../OpenCore-Patcher.zip OpenCore-Patcher; zip -r ../OpenCore-Patcher.app.zip OpenCore-Patcher.app
-      - run: ./../sign-app.sh
-      - name: Upload Binary to Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: OpenCore-Patcher
-          path: OpenCore-Patcher.zip
-      - name: Upload App to Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: OpenCore-Patcher.app
-          path: OpenCore-Patcher.app.zip
-
-      - name: Upload to Release
-        if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: OpenCore-Patcher.app.zip
-          tag: ${{ github.ref }}
-          file_glob: true

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 OCLP-GUI.command
-/payloads/Apple-Binaries-OCLP-main
+/payloads/Apple
+/payloads/*.zip
 /payloads/__MACOSX
 /App
 /Build-Folder
@@ -8,6 +9,7 @@ OCLP-GUI.command
 /dist
 /.vscode
 __pycache__/
+*.kext
 *.py[cod]
 *$py.class
 /docs/.vuepress/dist

CHANGELOG.md

@@ -1,6 +1,308 @@
 # OpenCore Legacy Patcher changelog
 
+## 0.2.5
+
+- Implement Latebloom configuration via command line tool
+- Implement Root Volume backups in addition to APFS snapshot reversions
+  - Backups applicable to machines with sealed APFS snapshots
+- Allow Root Patching on Mojave and Catalina
+  - Currently experimental
+- Allow disabling of faulty Thunderbolt controllers on 2013-2014 MacBook Pros
+  - Currently limited to MacBookPro11,x
+- Set iMacPro1,1 SMBIOS for Mac Pro and Xserve models
+  - Allows for wider array of OS support (High Sierra+)
+- Use plist override for BCM943224 and BCM94331 support in Big Sur+
+  - Allows for older OS support through OpenCore
+- Increment Binaries:
+  - OpenCore 0.7.2 release
+  - Lilu 1.5.5 release
+  - AppleALC 1.6.3 release
+  - WhateverGreen 1.5.2 release
+  - FeatureUnlock 1.0.3 release
+  - PatcherSupportPkg 0.1.2 release
+- Allow iGPU/dGPU switching in Windows
+  - Applicable to MacBook Pros with Intel iGPU and Nvidia/AMD dGPU
+- Clean up Patcher Settings
+- Allow disabling of TeraScale 2 Acceleration during root volume patch
+  - Use for MacBookPro8,x with heavily degraded dGPUs
+- Add non-Metal Monterey Acceleration
+  - Currently supports:
+    - Intel Ironlake and Sandy Bridge
+    - Nvidia Tesla
+    - AMD TeraScale 1 and 2
+- Allow Trackpad gestures on MacBook4,1 and MacBook5,2
+  - System Preferences will not report settings however
+- Allow Root Volume Patched Systems to use FileVault 2
+  - Requires macOS 11.3 (20E232) or newer
+- Add offline TUI build
+  - Allows for root patching without network connection
+- Add Legacy Wireless support for Monterey
+  - Applicable for BCM94328, BCM94322 and Atheros chipsets
+- Add Legacy Bluetooth support for Monterey
+  - 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 FirmwareFeature upgrading to all Models
+  - Fixes Monterey Beta 7 installation issues
+- Add iMac7,1 USB map
+
+## 0.2.4
+
+- Fix BlessOverride typo
+- Fix Wake on WLAN typo
+- Fix Catalyst App crashing in macOS 11.5 (ie. Messages.app)
+- Increment Binaries
+  - PatcherSupportPkg 0.0.15 release
+- Implement Latebloom.kext support (v0.19)
+  - Work around macOS 11.3+ race condition on pre-Sandy Bridge Macs
+- Disable USB Map injection when unneeded
+
+## 0.2.3
+
+- Fix more IORegistry issues
+- Implement OpenCore GUI
+- Ensure symlinks are preserved
+- Enable TeraScale 2 patches by default on all models
+- Fix NightShift support for macOS Monterey
+- Add UniversalControl support
+  - Currently not enabled by Apple in macOS Monterey Beta 2/iOS 15 Beta 2
+- Add optional Wake in WLAN setting
+  - Note: enabling may create network instability
+- Increment Binaries
+  - OpenCore 0.7.1 release (07-05-2021)
+  - FeatureUnlock 1.0.3 rolling (07-07-2021)
+    - Previously known as SidecarFixup
+  - Lilu 1.5.4 release (07-05-2021)
+  - AppleALC 1.6.2 release
+  - WhateverGreen 1.6.2 release
+  - PatcherSupportPkg 0.0.13 release
+- Fix Intel HD4000 DRM Support in macOS Monterey (thanks EduCovas!)
+- Support optionally re-enabling iGPU in iMac14,x with dGPUs
+- Fix Windows scanning in OpenCore menu when Windows and macOS are stored on the same ESP
+
+## 0.2.2
+
+- Fix IORegistry issue
+- Fix Root Patch Failure on Nvidia Tesla GPUs
+
+## 0.2.1
+
+- Fix NVMe Crash on build
+
+## 0.2.0
+
+- Refactor device probe logic
+- Implement PatcherSupportPkg v0.0.10
+  - Reduces binary sizes depending on OS
+  - Deprecates Apple-Binaries-OCLP
+- Fix full screen and Airplay to Mac support for Intel HD4000 iGPUs in Monterey
+- Automatically set `CMIO_Unit_Input_ASC.DoNotUseOpenCL` on TeraScale 2 GPUs
+- Fix Country Code detection on Wireless Cards
+- Add Windows detection and prompt during installation
+- Fix Google Fonts rendering for Intel HD4000 iGPUs in Monterey
+- Increment Binaries
+  - Lilu 1.5.4 rolling (f69a972 - 06-20-2021)
+  - 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
+
+## 0.1.9
+
+- Fix incorrect AMFI and SIP detection
+
+## 0.1.8
+
+- Fix Kernel Panic in Big Sur and Monterey
+- Increment binaries:
+  - Lilu (1.5.4 rolling - 06-15-2021)
+
+## 0.1.7
+
+- Add FireWire Boot Support for Catalina and newer
+- Add NVMe firmware support for older models (ie. MacPro3,1)
+  - OpenCore must be stored on a bootable volume (ie. USB or SATA)
+- Fix Thunderbolt Ethernet support on MacBookAir4,x
+- Fix XHCI hangs on pre-2012 Machines
+  - XHCI boot support dropped due to instability
+- Add beta macOS Monterey Support
+  - Fix iMac13,x sleep support
+  - Add support for following models:
+    - iMac14,4
+    - iMac15,1
+    - MacBook8,1
+    - MacBookAir6,1
+    - MacBookAir6,2
+    - MacBookPro11,1
+    - MacBookPro11,2
+    - MacBookPro11,3
+- Increment binaries:
+  - OpenCore (0.7.0 release - 06-07-2021)
+  - AirportBrcmFixup (2.1.3 rolling - 06-08-2021)
+  - AppleALC (1.6.2 rolling - 06-08-2021)
+  - CPUFriend (1.2.4 rolling - 06-08-2021)
+  - Lilu (1.5.4 rolling - 06-11-2021)
+  - NVMeFix (1.0.9 rolling - 06-12-2021)
+  - WhateverGreen (1.5.1 rolling - 06-08-2021)
+  - RestrictEvents (1.0.3 rolling - 06-11-2021)
+  - Apple Binaries (0.0.18 release - 06-12-2021)
+  - MouSSE (0.95 release - 06-08-2021)
+  - SidecarFixup (1.0.2 rolling - 06-11-2021)
+- Fix SSE4,2 Emulation
+- Fix Sidecar and CPU renaming support in macOS Monterey
+- Add AirPlay support to older Models
+- Add Intel HD4000 Acceleration
+  - Big thanks to Jackluke, EduCovas, DhinakG, MykolaG!
+- Add DebugEnhancer for better macOS Monterey logs
+  - DebugEnhancer (1.0.3 rolling - 06-08-2021)
+- Add TeraScale 2 Graphics Acceleration to Big Sur
+  - User configurable, those prone to seizures are recommended to avoid or have another setup the machine due to initial colour strobing before forcing Million Colours on the display with SwitchResX or ResXtreme
+
+## 0.1.6
+
+- Add XHCI UEFI Driver for 3rd Party USB 3.0 Controllers
+  - Allows for Boot Support from OpenCore' Picker
+- Fix UEFI output on MacPro3,1 with PC GPUs
+- Increment binaries:
+  - OpenCore 4e0ff2d (0.7.0 rolling - 05-23-2021)
+  - Apple Binaries 59a52a3 (0.0.8 release - 05-24-2021)
+- Allow legacy macOS Booting
+- Fix Photos app distortion on legacy GPUs
+- Fix device tree renaming on Mac Pros and Xserves
+- Ensure no Acceleration Patches applied when no compatible GPU found
+- Allow custom SMBIOS overriding
+- Fix incorrectly setting CPU override for non-Minimal SMBIOS spoofs
+- Support Minimal SMBIOS spoofing on El Capitan era Macs
+- Fix GPU Switching on MacBookPro6,x
+
+## 0.1.5
+
+- Fix crashing when Wireless module not present
+- Add iMac10,1 default dGPU pathing
+- Add agdpmod=vit9696 to all Nvidia Metal iMacs
+  - Fixes external display support on Nvidia iMac12,x
+- Remove reliance on AppleBacklightFixup
+- Support space in path when downloading Root Patches
+- Enable PanicNoKextDump by default
+- Expand AppleGraphicsPowerManagement and AppleGraphicsDeviceControl Override support
+- Fix MacBookPro8,2/3 Brightness Control
+  - dGPU must be disabled via NVRAM or deMUXed
+- Increment binaries:
+  - Apple Binaries 478f6a6 (0.0.7 release - 05-16-2021)
+- Add SeedUtil option to Advanced Patcher Settings
+
+## 0.1.4
+
+- Fix Device Path formatting on 2012+ iMacs
+
+## 0.1.3
+
+- Fix internal PCIe devices reporting as external
+  - Opt for `built-in` when device path is detectable
+  - Innie 0ccd95e (1.3.0 release - 01-16-2021)
+- Fix MacBookPro5,4 audio support
+- Increment binaries
+  - AppleALC 58b57ee (1.6.1 rolling - 05-07-2021)
+  - Apple Binaries 74bd80f (0.0.6 release - 05-09-2021)
+- Support custom CPU names in About This Mac
+- Fix NightShift accidentally disabling on Minimal SMBIOS configs
+- Fix iMac9,1 audio support
+- Heavily expand Graphics ID list
+- Fix iMac7,1 and iMac8,1 audio support
+- Work-around Bluetooth Kernel Panic on Apple's Bluetooth 2.0 Controllers (USB 05AC:8206)
+  - Affects iMac7,1 and MacPro3,1
+- Fix iMac external display support
+- Fix NVMe properties not applying when OpenCore is installed
+
+## 0.1.2
+
+- Fix IDE support on 2008 era MacBooks, iMacs and Xserves
+- Fix reduced output speeds on BCM94360 series Wifi cards
+- Fix accidentally disabling non-existent iGPU in iMac11,2
+- Remove USB ACPI Patching requirement for Minimal SMBIOS setups
+- Probe hardware for Backlight pathing on iMac10,1, iMac11,x and iMac12,x with Metal GPUs
+- Add Windows UEFI Audio support to Sandy and Ivy Bridge Macs
+- Add 3rd Party NVMe Power Management Patches
+  - NVMeFix fafc52d (1.0.7 release - 05-03-2021)
+- Strip unused ACPI and Kernel entries during build
+- Allow native Macs to use OpenCore
+  - Better 3rd party NVMe support
+  - Better Wireless networking support
+- Fix MacBook6,1 audio support
+- Increment binaries
+  - OpenCore 65cc81b (0.6.9 release - 05-03-2021)
+  - Lilu c77722d (1.5.3 release - 05-03-2021)
+  - AppleALC 84850d0 (1.6.0 rolling - 04-30-2021)
+  - RestrictEvents 9e2bb0f (1.0.1 release - 05-03-2021)
+- Allow CPUFriend on all El-Capitan Era Macs
+- Fix UEFI 2.0 Application support on upgraded Nvidia GPUs
+- Add experimental Sidecar support
+  - Requires Mac with Metal Intel iGPU and the iPad to be directly plugged in, wireless highly unstable
+  - SidecarFixup efdf11c (1.0.0 release - 05-02-2021)
+
+## 0.1.1
+
+- Fix iMac11,3 GFX0 pathing
+- Add MouSSE support to iMac10,1 with Metal AMD GPU
+- Fix iMac11,1 and iMac11,3 Nvidia boot issues after PRAM reset
+- Fix DRM support on Nvidia-only configurations
+  - Support optional setting between DRM and QuickSync support on iMacs13,x and iMac14,x
+- Add public beta support for Legacy GPU Acceleration (v0.0.4)
+  - Note ATI/AMD TeraScale 2 unsupported (HD 5/6000)
+- Add better kmutil crash handling
+- Fix build crashing when no wifi card is present
+- Allow Legacy Acceleration Patches on Mac Pros and Xserves
+- Fix USB kernel panics on iMac7,1
+- Fix AppleALC support in Mojave
+- Fix TeraScale 1 GPU detection
+- Enable Graphics Acceleration on legacy GPUs by default
+- Fix incorrectly disabling SIP/SMB on Metal GPUs
+- Fix error output when rebuilding kernel cache fails
+- Fix Acceleration Linking for Intel Ironlake iGPUs
+
+## 0.1.0
+
+- Fix crash on iMacs with Metal GPUs
+
+## 0.0.23
+
+- Fix MacBookPro4,1 15" and 17" audio support
+- Fix iMac7,1 24" and iMac9,1 24" audio support
+- Fix Macmini4,1 audio support
+- Increment binaries
+  - AppleALC 1a3e5cb (1.6.0 rolling - 04-14-2021)
+- Enhance Wifi model detection
+- Hide OpenShell.efi by default
+- Add Brightness Control patches for legacy Nvidia, AMD and Intel GPUs
+  - Models with brightness control issues in Catalina partially supported
+- Add user configurable Bootstrap setting
+- Enhance GPU Detection logic
+- Increment AppleBackLightFixup v1.0.1
+  - Add panel type F10T9cde
+- Enhance HDMI audio support on Mac Pros and Xserves
+- Strip unused kext entries during build
+- Add gfxutil support for better DeviceProperty path detection
+- Add basic CLI support
+- Disable SIP and SecureBootModel by default on legacy GPUs
+
+## 0.0.22
+
+- Add ExFat support for models missing driver
+  - Aids BootCamp support for EFI based installs on 2010 and older Macs
+- Fix CPU Boosting on 2011 and older Macs
+- Add basic support for Xserve2,1
+- Add AppleALC support(99b3662 - 1.6.0 rolling - 04-09-2021), remove AppleHDA patching requirement
+- Add BCM94322 and BCM94321 chipset support
+
+## 0.0.21
+
+- Fix botched images in OpenCanopy
+- Add support for 3rd party OpenCore usage detection during building
+  - Mainly for users transitioning from Ausdauersportler's OpenCore configuration
+
 ## 0.0.20
+
 - Fix CPU Calculation on early MCP79 chipsets (ie. iMac9,1, MacBook5,x)
 - Increment binaries
   - OpenCore c528597 (0.6.8 release - 2021-04-05)
@@ -16,6 +318,7 @@
 - Fix Mac Pro and Xserve output issues
 
 ## 0.0.19
+
 - Add SMC-Spoof.kext to avoid triggering `smcupdater`
 - Add Root Volume patching for older machines
   - AppleHDA Patch for 2011 and older (Excluding MacPro4,1+)
@@ -34,6 +337,7 @@
 - Fix Broadcom Ethernet on older 2009-2011 Macs
 
 ## 0.0.18
+
 - Disable Vault by default due to breaking installations
 - Move BOOTx64.efi to System/Library/CoreServices/ to support GPT BootCamp installs
 - Disable verbose by default, still configurable by end-user
@@ -44,12 +348,14 @@
 - Add custom drive icons for external drives
 
 ## 0.0.17
+
 - Fix build detection breaking on older OS
 
 ## 0.0.16
+
 - Move Serial selection to Patcher Settings
 - Add new SMBIOS patching options:
-  - Minimal:  Only update board ID and BIOSVersion, keep original serials
+  - Minimal: Only update board ID and BIOSVersion, keep original serials
   - Moderate: Update entire SMBIOS, keep original serials
   - Advanced: Update entire SMBIOS, generate new serials
 - Fix crash on MacBookPro4,1
@@ -65,12 +371,14 @@
 - Enable `amfi_get_out_of_my_way=1` when SIP is disabled
 
 ## 0.0.15
+
 - Add user-configurable OpenCore DEBUG builds
 - Add user-configurable Wifi and GPU patches
 - Fix ThirdPartyDrives model detection
 - Add HW_BID injection to fix boot.efi error
 
 ## 0.0.14
+
 - Enable ThirdPartyDrives to aid with hibernation on 3rd party SATA drives
 - Increment OpenCore 7bb41aa (0.6.8 rolling, 2021-03-06)
 - Add ForceBooterSignature to resolve hibernation issues
@@ -79,70 +387,83 @@
 - Add GopPassThrough quirk for UGA-based systems
 
 ## 0.0.13
+
 - Add CPUFriend support to resolve X86PlatformPlugin clashes
-    - (1.2.3 c388a62 release)
+  - (1.2.3 c388a62 release)
 - Fix crash with MacBookAir5,x
 - Fix hibernation support
 - Remove Wireless patches for BCM4328/4321(14e4:4328) due to boot issues
 
 ## 0.0.12
+
 - Convert OpenCore-Patcher binary to OpenCore-Patcher.app
 - Add Backlight patches for modded Nvidia GPUs in iMac10,x-12,x
 - Fix sleep for iMac12,x with upgraded GPUs
 
 ## 0.0.11
+
 - Re-add OpenCore GUI
 - Rewrite in py3
 - Add OpenCore-Patcher binary for releases avoiding local python requirement
 - Increment binaries
-    - OpenCore cbd2fa3 (0.6.7 release)
-    - WhateverGreen 2e19d1b (1.4.8 release)
+  - OpenCore cbd2fa3 (0.6.7 release)
+  - WhateverGreen 2e19d1b (1.4.8 release)
 - Rework SMBIOS allowing both original and custom serials(Should resolve all iMessage issues)
 - Support upgraded GPU detection in iMac10,x-12,x
 - Add Wifi card upgrade detection
 
 ## 0.0.10
+
 - Increment binaries
-    - OpenCore 43f5339 (0.6.6 release)
-    - Lilu d107554 (1.5.1 release)
-    - WhateverGreen 9e53d8a (1.4.7 release)
+  - OpenCore 43f5339 (0.6.6 release)
+  - Lilu d107554 (1.5.1 release)
+  - WhateverGreen 9e53d8a (1.4.7 release)
 - Add IDE support to MacPro3,1
 - Set SecureBootModel to iMac Pro(should aid in booting older OSes with OpenCore)
 - Update MacBookPro SMBIOS
 
 ## 0.0.9
+
 - Resolve firmware install issues bricking Macs
 
 ## 0.0.8
+
 - Fix USB Map
 - Add HiDPI patch
 
 ## 0.0.7
+
 - Add MacPro3,1 to HID patch
 - Fix missing SSDT-CPBG patch
 - Fix BlacklistAppleUpdate
 - Add RestrictEvents kext
 
 ## 0.0.6
+
 - Fix macserial crashing
 
 ## 0.0.5
+
 - Enable hibernation support
 - Work around USB Map failing
 - Add checks whether booting with OpenCore
 - Fix MouSSE injection
 
 ## 0.0.4
+
 - Add basic audio support for legacy chipsets
 - Add patch for dual GPU machines
 
 ## 0.0.3
+
 - Fix Wireless patch logic
 
 ## 0.0.2
+
 - Expand IOHIDFamily Patch to all Nvidia chipsets
 - Fix Airdrop 1.0 support
 - Add El Capitan era wireless cards
 
 ## 0.0.1
-- Inital developer preview
+
+- Initial developer preview

OCLP-CLI.command

@@ -0,0 +1,309 @@
+#!/usr/bin/env python3
+# Copyright (C) 2020-2021 Mykola Grymalyuk
+
+from __future__ import print_function
+
+import subprocess
+import sys
+import platform
+import argparse
+from pathlib import Path
+
+from Resources import Build, ModelArray, Constants, SysPatch, device_probe, Utilities, ModelExample
+
+
+class OpenCoreLegacyPatcher:
+    def __init__(self):
+        print("Loading...")
+        Utilities.disable_cls()
+        self.constants = Constants.Constants()
+        self.constants.computer = device_probe.Computer.probe()
+        self.computer = self.constants.computer
+        self.constants.detected_os = int(platform.uname().release.partition(".")[0])
+        self.constants.detected_os_minor = int(platform.uname().release.partition(".")[2].partition(".")[0])
+        detected_os_build: str = subprocess.run("sw_vers -buildVersion".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
+        self.constants.detected_os_build = detected_os_build
+
+        custom_cpu_model_value = Utilities.get_nvram("revcpuname", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True)
+        if custom_cpu_model_value is not None:
+            # TODO: Fix to not use two separate variables
+            self.constants.custom_cpu_model = 1
+            self.constants.custom_cpu_model_value = custom_cpu_model_value.split("%00")[0]
+
+        if "-v" in (Utilities.get_nvram("boot-args") or ""):
+            self.constants.verbose_debug = True
+
+        # Check if running in RecoveryOS
+        self.constants.recovery_status = Utilities.check_recovery()
+
+        parser = argparse.ArgumentParser()
+
+        # Generic building args
+        parser.add_argument("--build", help="Build OpenCore", action="store_true", required=False)
+        parser.add_argument("--verbose", help="Enable verbose boot", action="store_true", required=False)
+        parser.add_argument("--debug_oc", help="Enable OpenCore DEBUG", action="store_true", required=False)
+        parser.add_argument("--debug_kext", help="Enable kext DEBUG", action="store_true", required=False)
+        parser.add_argument("--hide_picker", help="Hide OpenCore picker", action="store_true", required=False)
+        parser.add_argument("--disable_sip", help="Disable SIP", action="store_true", required=False)
+        parser.add_argument("--disable_smb", help="Disable SecureBootModel", action="store_true", required=False)
+        parser.add_argument("--vault", help="Enable OpenCore Vaulting", action="store_true", required=False)
+        parser.add_argument("--support_all", help="Allow OpenCore on natively supported Models", action="store_true", required=False)
+        parser.add_argument("--firewire", help="Enable FireWire Booting", action="store_true", required=False)
+        parser.add_argument("--nvme", help="Enable NVMe Booting", action="store_true", required=False)
+        parser.add_argument("--wlan", help="Enable Wake on WLAN support", action="store_true", required=False)
+        # parser.add_argument("--disable_amfi", help="Disable AMFI", action="store_true", required=False)
+        parser.add_argument("--moderate_smbios", help="Moderate SMBIOS Patching", action="store_true", required=False)
+        parser.add_argument("--moj_cat_accel", help="Allow Root Patching on Mojave and Catalina", action="store_true", required=False)
+        parser.add_argument("--disable_thunderbolt", help="Disable Thunderbolt on 2013-2014 MacBook Pros", action="store_true", required=False)
+
+        # Building args requiring value values (ie. --model iMac12,2)
+        parser.add_argument("--model", action="store", help="Set custom model", required=False)
+        parser.add_argument("--disk", action="store", help="Specifies disk to install to", required=False)
+        parser.add_argument("--smbios_spoof", action="store", help="Set SMBIOS patching mode", required=False)
+        parser.add_argument("--lb_delay", action="store", help="Set Latebloom delay in ms", required=False)
+        parser.add_argument("--lb_range", action="store", help="Set Latebloom range in ms", required=False)
+        parser.add_argument("--lb_debug", action="store", help="Set Latebloom debug", required=False)
+
+        # SysPatch args
+        parser.add_argument("--patch_sys_vol", help="Patches root volume", action="store_true", required=False)
+        parser.add_argument("--unpatch_sys_vol", help="Unpatches root volume, EXPERIMENTAL", action="store_true", required=False)
+        # parser.add_argument("--patch_disk", action="store", help="Specifies disk to root patch", required=False)
+
+        parser.add_argument("--validate", help="Validate", action="store_true", required=False)
+
+        args = parser.parse_args()
+
+        self.constants.gui_mode = True
+        self.constants.current_path = Path.cwd()
+
+        if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
+            print("- Rerouting payloads location")
+            self.constants.payload_path = sys._MEIPASS / Path("payloads")
+        else:
+            print("- Using default payloads location")
+
+        if args.disk:
+            print(f"- Install Disk set: {args.disk}")
+            self.constants.disk = args.disk
+        if args.validate:
+            self.validate()
+        # if args.patch_disk:
+        #    print(f"- Patch Disk set: {args.patch_disk}")
+        #    self.constants.patch_disk = args.patch_disk
+        if args.verbose:
+            print("- Set verbose configuration")
+            self.constants.verbose_debug = True
+        if args.debug_oc:
+            print("- Set OpenCore DEBUG configuration")
+            self.constants.opencore_debug = True
+            self.constants.opencore_build = "DEBUG"
+        if args.debug_kext:
+            print("- Set kext DEBUG configuration")
+            self.constants.kext_debug = True
+        if args.hide_picker:
+            print("- Set HidePicker configuration")
+            self.constants.showpicker = False
+        if args.disable_sip:
+            print("- Set Disable SIP configuration")
+            self.constants.sip_status = False
+        if args.disable_smb:
+            print("- Set Disable SecureBootModel configuration")
+            self.constants.secure_status = False
+        if args.vault:
+            print("- Set Vault configuration")
+            self.constants.vault = True
+        if args.firewire:
+            print("- Set FireWire Boot configuration")
+            self.constants.firewire_boot = True
+        if args.nvme:
+            print("- Set NVMe Boot configuration")
+            self.constants.nvme_boot = True
+        # if args.disable_amfi:
+        #     print("- Set Disable AMFI configuration")
+        #     self.constants.amfi_status = False
+        if args.wlan:
+            print("- Set Wake on WLAN configuration")
+            self.constants.enable_wake_on_wlan = True
+        if args.disable_thunderbolt:
+            print("- Set Disable Thunderbolt configuration")
+            self.constants.disable_thunderbolt = True
+        if args.moderate_smbios:
+            print("- Set Moderate SMBIOS Patching configuration")
+            self.constants.serial_settings = "Moderate"
+        if args.smbios_spoof:
+            if args.smbios_spoof == "Minimal":
+                self.constants.serial_settings = "Minimal"
+            elif args.smbios_spoof == "Moderate":
+                self.constants.serial_settings = "Moderate"
+            elif args.smbios_spoof == "Advanced":
+                self.constants.serial_settings = "Advanced"
+            else:
+                print(f"- Unknown SMBIOS arg passed: {args.smbios_spoof}")
+
+        if args.lb_delay:
+            try:
+                self.constants.latebloom_delay = int(args.lb_delay)
+                print(f"- Set LateBloom delay: {args.lb_delay}")
+            except ValueError:
+                print(f"- Invalid LateBloom delay: {args.lb_delay}")
+
+        if args.lb_range:
+            try:
+                self.constants.latebloom_range = int(args.lb_range)
+                print(f"- Set LateBloom range: {args.lb_range}")
+            except ValueError:
+                print(f"- Invalid LateBloom range: {args.lb_range}")
+
+        if args.lb_debug:
+            try:
+                self.constants.latebloom_debug = int(args.lb_debug)
+                if self.constants.latebloom_debug in [0, 1]:
+                    print(f"- Set LateBloom debug: {args.lb_debug}")
+                else:
+                    print(f"- Invalid LateBloom debug: {args.lb_debug}")
+            except ValueError:
+                print(f"- Invalid LateBloom range: {args.lb_debug}")
+
+        if args.support_all:
+            print("- Building for natively supported model")
+            self.constants.allow_oc_everywhere = True
+            self.constants.serial_settings = "None"
+
+        if args.build:
+            if args.model:
+                print(f"- Using custom model: {args.model}")
+                self.constants.custom_model = args.model
+                self.set_defaults(self.constants.custom_model, False)
+                self.build_opencore()
+            elif self.computer.real_model not in ModelArray.SupportedSMBIOS and self.constants.allow_oc_everywhere is False:
+                print(
+                    """Your model is not supported by this patcher for running unsupported OSes!"
+
+If you plan to create the USB for another machine, please select the "Change Model" option in the menu."""
+                )
+                sys.exit(1)
+            else:
+                print(f"- Using detected model: {self.constants.computer.real_model}")
+                self.set_defaults(self.constants.custom_model, True)
+                self.build_opencore()
+        if args.patch_sys_vol:
+            if args.moj_cat_accel:
+                print("- Set Mojave/Catalina root patch configuration")
+                self.constants.moj_cat_accel = True
+            print("- Set System Volume patching")
+            self.patch_vol()
+        elif args.unpatch_sys_vol:
+            print("- Set System Volume unpatching")
+            self.unpatch_vol()
+
+    def set_defaults(self, model, host_is_target):
+        if host_is_target:
+            if Utilities.check_metal_support(device_probe, self.computer) is False:
+                self.constants.disable_cs_lv = True
+            if self.computer.dgpu and self.computer.dgpu.arch == device_probe.NVIDIA.Archs.Kepler:
+                self.constants.sip_status = False
+                self.constants.amfi_status = True
+                self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+            if (
+                isinstance(self.computer.wifi, device_probe.Broadcom)
+                and self.computer.wifi.chipset in [device_probe.Broadcom.Chipsets.AirPortBrcm4331, device_probe.Broadcom.Chipsets.AirPortBrcm43224]
+            ) or (isinstance(self.computer.wifi, device_probe.Atheros) and self.computer.wifi.chipset == device_probe.Atheros.Chipsets.AirPortAtheros40):
+                self.constants.sip_status = False
+                self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+        elif model in ModelArray.LegacyGPU:
+            self.constants.disable_cs_lv = True
+        if model in ModelArray.LegacyGPU:
+            if host_is_target and Utilities.check_metal_support(device_probe, self.computer) is True:
+                # Building on device and we have a native, supported GPU
+                if self.computer.dgpu and self.computer.dgpu.arch == device_probe.NVIDIA.Archs.Kepler:
+                    self.constants.sip_status = False
+                    # self.constants.secure_status = True  # Monterey
+                    self.constants.amfi_status = True
+                    self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+                else:
+                    self.constants.sip_status = True
+                    # self.constants.secure_status = True  # Monterey
+                    self.constants.amfi_status = True
+            else:
+                self.constants.sip_status = False  #    Unsigned kexts
+                self.constants.secure_status = False  # Root volume modified
+                self.constants.amfi_status = False  #   Unsigned binaries
+                self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+        if model in ModelArray.ModernGPU:
+            self.constants.sip_status = False  #    Unsigned kexts
+            self.constants.secure_status = False  # Modified root volume
+            self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+            # self.constants.amfi_status = True  #  Signed bundles, Don't need to explicitly set currently
+        if model == "MacBook8,1":
+            # MacBook8,1 has an odd bug where it cannot install Monterey with Minimal spoofing
+            self.constants.serial_settings == "Moderate"
+
+        if self.constants.latebloom_delay == 0:
+            self.constants.latebloom_delay, self.constants.latebloom_range, self.constants.latebloom_debug = Utilities.latebloom_detection(model)
+
+        if Utilities.get_nvram("gpu-power-prefs", "FA4CE28D-B62F-4C99-9CC3-6815686E30F9", decode=True):
+            self.constants.allow_ts2_accel = False
+
+    def patch_vol(self):
+        SysPatch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants).start_patch()
+
+    def unpatch_vol(self):
+        SysPatch.PatchSysVolume(self.constants.custom_model or self.constants.computer.real_model, self.constants).start_unpatch()
+
+    def build_opencore(self):
+        Build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).build_opencore()
+
+    def install_opencore(self):
+        Build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).copy_efi()
+
+    def validate(self):
+        # Runs through ocvalidate to check for errors
+
+        valid_dumps = [
+            ModelExample.MacBookPro.MacBookPro92_Stock,
+            # ModelExample.MacBookPro.MacBookPro171_Stock,
+            # ModelExample.Macmini.Macmini91_Stock,
+            ModelExample.iMac.iMac81_Stock,
+            ModelExample.iMac.iMac112_Stock,
+            ModelExample.iMac.iMac122_Upgraded,
+            ModelExample.MacPro.MacPro31_Stock,
+            ModelExample.MacPro.MacPro31_Upgrade,
+            ModelExample.MacPro.MacPro31_Modern_AMD,
+            ModelExample.MacPro.MacPro31_Modern_Kepler,
+            ModelExample.MacPro.MacPro41_Upgrade,
+            ModelExample.MacPro.MacPro41_Modern_AMD,
+            ModelExample.MacPro.MacPro41_51__Flashed_Modern_AMD,
+        ]
+        self.constants.validate = True
+
+        for model in ModelArray.SupportedSMBIOS:
+            print(f"Validating predefined model: {model}")
+            self.constants.custom_model = model
+            self.build_opencore()
+            result = subprocess.run([self.constants.ocvalidate_path, f"{self.constants.opencore_release_folder}/EFI/OC/config.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            if result.returncode != 0:
+                print("Error on build!")
+                print(result.stdout.decode())
+                raise Exception(f"Validation failed for predefined model: {model}")
+            else:
+                print(f"Validation succeeded for predefined model: {model}")
+
+        for model in valid_dumps:
+            self.constants.computer = model
+            self.computer = self.constants.computer
+            self.constants.custom_model = ""
+            print(f"Validating dumped model: {self.computer.real_model}")
+            self.build_opencore()
+            result = subprocess.run([self.constants.ocvalidate_path, f"{self.constants.opencore_release_folder}/EFI/OC/config.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            if result.returncode != 0:
+                print("Error on build!")
+                print(result.stdout.decode())
+                raise Exception(f"Validation failed for predefined model: {self.computer.real_model}")
+            else:
+                print(f"Validation succeeded for predefined model: {self.computer.real_model}")
+
+
+OpenCoreLegacyPatcher()
+
+# Example arg for OCLP command line
+# ./OCLP-CLI --build --verbose --debug_oc --debug_kext --model iMac11,2

OCLP-CLI.spec

@@ -0,0 +1,35 @@
+# -*- mode: python ; coding: utf-8 -*-
+import sys, os
+sys.path.append(os.path.abspath(os.getcwd()))
+from Resources import Constants
+block_cipher = None
+
+
+a = Analysis(['OCLP-CLI.command'],
+             pathex=['Resources'],
+             binaries=[],
+             datas=[('payloads', 'payloads')],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          [('u', None, 'OPTION')],
+          name='OCLP-CLI',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=True )

OpenCore-Patcher.command

@@ -3,77 +3,272 @@
 
 from __future__ import print_function
 
+import platform
 import subprocess
 import sys
-import time
-import platform
 
-from Resources import build, ModelArray, Constants, SysPatch, utilities, CliMenu
+from Resources import Build, CliMenu, Constants, ModelArray, SysPatch, Utilities, device_probe
 
 
-class OpenCoreLegacyPatcher():
+class OpenCoreLegacyPatcher:
     def __init__(self):
+        print("Loading...")
         self.constants = Constants.Constants()
-        self.current_model: str = None
-        opencore_model: str = subprocess.run("nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:oem-product".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-        if not opencore_model.startswith("nvram: Error getting variable"):
-            opencore_model = [line.strip().split(":oem-product	", 1)[1] for line in opencore_model.split("\n") if line.strip().startswith("4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:")][0]
-            self.current_model = opencore_model
-        else:
-            self.current_model = subprocess.run("system_profiler SPHardwareDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            self.current_model = [line.strip().split(": ", 1)[1] for line in self.current_model.stdout.decode().split("\n") if line.strip().startswith("Model Identifier")][0]
+        self.constants.computer = device_probe.Computer.probe()
+        self.computer = self.constants.computer
         self.constants.detected_os = int(platform.uname().release.partition(".")[0])
-        if self.current_model in ModelArray.NoAPFSsupport:
+        self.constants.detected_os_minor = int(platform.uname().release.partition(".")[2].partition(".")[0])
+        detected_os_build: str = subprocess.run("sw_vers -buildVersion".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
+        self.constants.detected_os_build = detected_os_build
+        self.set_defaults(self.computer.real_model, True)
+
+    def set_defaults(self, model, host_is_target):
+        # Defaults
+        self.constants.sip_status = True
+        self.constants.secure_status = False  # Default false for Monterey
+        self.constants.amfi_status = True
+
+        if host_is_target:
+            if Utilities.check_metal_support(device_probe, self.computer) is False:
+                self.constants.disable_cs_lv = True
+            if self.computer.dgpu and self.computer.dgpu.arch == device_probe.NVIDIA.Archs.Kepler:
+                self.constants.sip_status = False
+                self.constants.amfi_status = True
+                self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+            if (
+                isinstance(self.computer.wifi, device_probe.Broadcom)
+                and self.computer.wifi.chipset in [device_probe.Broadcom.Chipsets.AirPortBrcm4331, device_probe.Broadcom.Chipsets.AirPortBrcm43224]
+            ) or (isinstance(self.computer.wifi, device_probe.Atheros) and self.computer.wifi.chipset == device_probe.Atheros.Chipsets.AirPortAtheros40):
+                self.constants.sip_status = False
+                self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+        elif model in ModelArray.LegacyGPU:
+            self.constants.disable_cs_lv = True
+
+        if model in ModelArray.LegacyGPU:
+            if host_is_target and Utilities.check_metal_support(device_probe, self.computer) is True:
+                # Building on device and we have a native, supported GPU
+                if self.computer.dgpu and self.computer.dgpu.arch == device_probe.NVIDIA.Archs.Kepler:
+                    self.constants.sip_status = False
+                    # self.constants.secure_status = True  # Monterey
+                    self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+                else:
+                    self.constants.sip_status = True
+                    # self.constants.secure_status = True  # Monterey
+                    self.constants.amfi_status = True
+            else:
+                self.constants.sip_status = False  #    Unsigned kexts
+                self.constants.secure_status = False  # Root volume modified
+                self.constants.amfi_status = False  #   Unsigned binaries
+                self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+        if model in ModelArray.ModernGPU:
+            self.constants.sip_status = False  #    Unsigned kexts
+            self.constants.secure_status = False  # Modified root volume
+            self.constants.allow_fv_root = True  #  Allow FileVault on broken seal
+            # self.constants.amfi_status = True  #  Signed bundles, Don't need to explicitly set currently
+        
+
+        if model == "MacBook8,1":
+            # MacBook8,1 has an odd bug where it cannot install Monterey with Minimal spoofing
             self.constants.serial_settings = "Moderate"
 
+        custom_cpu_model_value = Utilities.get_nvram("revcpuname", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True)
+        if custom_cpu_model_value is not None:
+            # TODO: Fix to not use two separate variables
+            self.constants.custom_cpu_model = 1
+            self.constants.custom_cpu_model_value = custom_cpu_model_value.split("%00")[0]
+
+        if "-v" in (Utilities.get_nvram("boot-args") or ""):
+            self.constants.verbose_debug = True
+
+        if Utilities.amfi_status() is False:
+            self.constants.amfi_status = False
+
+        if Utilities.get_nvram("gpu-power-prefs", "FA4CE28D-B62F-4C99-9CC3-6815686E30F9", decode=True):
+            self.constants.allow_ts2_accel = False
+
+        if self.constants.latebloom_delay == 0:
+            self.constants.latebloom_delay, self.constants.latebloom_range, self.constants.latebloom_debug = Utilities.latebloom_detection(model)
+
+        if Utilities.get_nvram("gpu-power-prefs", "FA4CE28D-B62F-4C99-9CC3-6815686E30F9", decode=True):
+            self.constants.allow_ts2_accel = False
+
+        # Check if running in RecoveryOS
+        self.constants.recovery_status = Utilities.check_recovery()
+
     def build_opencore(self):
-        build.BuildOpenCore(self.constants.custom_model or self.current_model, self.constants).build_opencore()
+        Build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).build_opencore()
 
     def install_opencore(self):
-        build.BuildOpenCore(self.constants.custom_model or self.current_model, self.constants).copy_efi()
+        Build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).copy_efi()
 
     def change_model(self):
-        utilities.cls()
-        utilities.header(["Select Different Model"])
-        print("""
+        Utilities.cls()
+        Utilities.header(["Select Different Model"])
+        print(
+            """
 Tip: Run the following command on the target machine to find the model identifier:
 
 system_profiler SPHardwareDataType | grep 'Model Identifier'
-    """)
+    """
+        )
         self.constants.custom_model = input("Please enter the model identifier of the target machine: ").strip()
         if self.constants.custom_model not in ModelArray.SupportedSMBIOS:
-            print(f"""
-        {self.constants.custom_model} is not a valid SMBIOS Identifier for macOS {self.constants.os_support}!
-            """)
+            print(
+                f"""
+{self.constants.custom_model} is not a valid SMBIOS Identifier for macOS {self.constants.os_support}!
+"""
+            )
             print_models = input(f"Print list of valid options for macOS {self.constants.os_support}? (y/n)")
-            if print_models in {"y", "Y", "yes", "Yes"}:
+            if print_models.lower() in {"y", "yes"}:
                 print("\n".join(ModelArray.SupportedSMBIOS))
-                input("Press any key to continue...")
-        if self.constants.custom_model in ModelArray.NoAPFSsupport:
-            self.constants.serial_settings = "Moderate"
-
-
+                input("\nPress [ENTER] to continue")
+        else:
+            self.set_defaults(self.constants.custom_model, False)
 
     def patcher_settings(self):
         response = None
         while not (response and response == -1):
-            title = [
-                "Adjust Patcher Settings"
-            ]
-            menu = utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
+            title = ["Adjust Patcher Settings"]
+            menu = Utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
             options = [
-                # TODO: Enable setting OS target when more OSes become supported by the patcher
-                #[f"Change OS version:\t\t\tCurrently macOS {self.constants.os_support}", self.change_os],
-                [f"Enable Verbose Mode:\t\tCurrently {self.constants.verbose_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_verbose],
-                [f"Enable OpenCore DEBUG:\t\tCurrently {self.constants.opencore_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_oc],
-                [f"Enable Kext DEBUG:\t\t\tCurrently {self.constants.kext_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_kext],
-                [f"Force iMac Metal Patch:\t\tCurrently {self.constants.imac_vendor}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_metal],
-                [f"Assume Upgraded Wifi Always:\tCurrently {self.constants.wifi_build}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_wifi],
-                [f"Set ShowPicker Mode:\t\tCurrently {self.constants.showpicker}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_showpicker],
-                [f"Set Vault Mode:\t\t\tCurrently {self.constants.vault}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_vault],
-                [f"Set SIP and SecureBootModel:\tSIP: {self.constants.sip_status} SBM: {self.constants.secure_status}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_sip],
-                [f"Set SMBIOS Mode:\t\t\tCurrently {self.constants.serial_settings}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_serial],
-                [f"Set Custom Patch Repo", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).custom_repo],
+                ["Debug Settings", self.patcher_setting_debug],
+                ["Security Settings", self.patcher_settings_security],
+                ["SMBIOS Settings", self.patcher_settings_smbios],
+                ["Boot Volume Settings", self.patcher_settings_boot],
+                ["Miscellaneous Settings", self.patcher_settings_misc],
+                ["Dump detected hardware", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).dump_hardware],
+                [
+                    f"Allow Accel on Mojave/Catalina:\tCurrently {self.constants.moj_cat_accel}",
+                    CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_moj_cat_patch,
+                ],
+                [
+                    f"Allow OpenCore on native Models:\tCurrently {self.constants.allow_oc_everywhere}",
+                    CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_native_models,
+                ],
+                ["Advanced Settings, for developers only", self.advanced_patcher_settings],
+            ]
+
+            for option in options:
+                menu.add_menu_option(option[0], function=option[1])
+
+            response = menu.start()
+
+    def patcher_setting_debug(self):
+        response = None
+        while not (response and response == -1):
+            title = ["Adjust Debug Settings"]
+            menu = Utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
+            options = [
+                [f"Enable Verbose Mode:\tCurrently {self.constants.verbose_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_verbose],
+                [f"Enable OpenCore DEBUG:\tCurrently {self.constants.opencore_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_oc],
+                [f"Enable Kext DEBUG:\t\tCurrently {self.constants.kext_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_kext],
+            ] + (
+                [
+                    [
+                        f"Set Latebloom args:\t\tDelay {self.constants.latebloom_delay}, Range {self.constants.latebloom_range}, Debug {self.constants.latebloom_debug}",
+                        CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).latebloom_settings,
+                    ]
+                ]
+                if ((self.constants.custom_model or self.computer.real_model) in ModelArray.PCIRaceCondition)
+                else []
+            )
+
+            for option in options:
+                menu.add_menu_option(option[0], function=option[1])
+
+            response = menu.start()
+
+    def patcher_settings_security(self):
+        response = None
+        while not (response and response == -1):
+            title = ["Adjust Security Settings"]
+            menu = Utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
+            options = [
+                # [
+                #     f"Set Apple Mobile File Integrity (AMFI):\tCurrently {self.constants.amfi_status}",
+                #     CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).set_amfi,
+                # ],
+                [
+                    f"Set System Intrgity Protection (SIP):\tCurrently {self.constants.sip_status}",
+                    CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_sip,
+                ],
+                [
+                    f"Set Secure Boot Model (SBM):\t\tCurrently {self.constants.secure_status}",
+                    CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_sbm,
+                ],
+                [f"Set Vault Mode:\t\t\t\tCurrently {self.constants.vault}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_vault],
+            ]
+
+            for option in options:
+                menu.add_menu_option(option[0], function=option[1])
+
+            response = menu.start()
+
+    def patcher_settings_smbios(self):
+        response = None
+        while not (response and response == -1):
+            title = ["Adjust SMBIOS Settings"]
+            menu = Utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
+            options = [
+                [f"Set SMBIOS Spoof Level:\tCurrently {self.constants.serial_settings}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_serial],
+                [f"Set SMBIOS Spoof Model:\tCurrently {self.constants.override_smbios}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).set_smbios],
+                [f"Set Custom name {self.constants.custom_cpu_model_value}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).custom_cpu],
+            ]
+
+            for option in options:
+                menu.add_menu_option(option[0], function=option[1])
+
+            response = menu.start()
+
+    def patcher_settings_boot(self):
+        response = None
+        while not (response and response == -1):
+            title = ["Adjust Bootable Volume Settings"]
+            menu = Utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
+            options = [
+                [f"Set FireWire Boot:\tCurrently {self.constants.firewire_boot}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_firewire],
+                [f"Set NVMe Boot:\tCurrently {self.constants.nvme_boot}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_nvme],
+            ]
+
+            for option in options:
+                menu.add_menu_option(option[0], function=option[1])
+
+            response = menu.start()
+
+    def patcher_settings_misc(self):
+        response = None
+        while not (response and response == -1):
+            title = ["Adjust Miscellaneous Settings"]
+            menu = Utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
+            options = [
+                [f"Set ShowPicker Mode:\tCurrently {self.constants.showpicker}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_showpicker],
+                [f"Set Wake on WLAN:\t\tCurrently {self.constants.enable_wake_on_wlan}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_wowl],
+                [f"Set Ivy iMac iGPU:\t\tCurrently {self.constants.allow_ivy_igpu}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_ivy],
+                [f"Set TeraScale 2 Accel:\tCurrently {self.constants.allow_ts2_accel}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).terascale_2_accel],
+                [
+                    f"Disable Thunderbolt:\tCurrently {self.constants.disable_thunderbolt}",
+                    CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).disable_thunderbolt,
+                ],
+            ]
+
+            for option in options:
+                menu.add_menu_option(option[0], function=option[1])
+
+            response = menu.start()
+
+    def advanced_patcher_settings(self):
+        response = None
+        while not (response and response == -1):
+            title = ["Adjust Advanced Patcher Settings, for developers ONLY"]
+            menu = Utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
+            options = [
+                [f"Set Metal GPU Status:\t\tCurrently {self.constants.imac_vendor}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_metal],
+                [f"Set DRM Preferences:\t\tCurrently {self.constants.drm_support}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).drm_setting],
+                [f"Set Generic Bootstrap:\t\tCurrently {self.constants.boot_efi}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).bootstrap_setting],
+                [
+                    f"Disable CPU Friend:\t\t\tCurrently {self.constants.disallow_cpufriend}",
+                    CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).disable_cpufriend,
+                ],
             ]
 
             for option in options:
@@ -82,81 +277,149 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
             response = menu.start()
 
     def credits(self):
-        utilities.TUIOnlyPrint(["Credits"], "Press [Enter] to go back.\n",
-                               ["""Many thanks to the following:
+        Utilities.TUIOnlyPrint(
+            ["Credits"],
+            "Press [Enter] to go back.\n",
+            [
+                """Many thanks to the following:
 
   - Acidanthera:\tOpenCore, kexts and other tools
   - Khronokernel:\tWriting and maintaining this patcher
   - DhinakG:\t\tWriting and maintaining this patcher
+  - ASentientBot:\tLegacy Acceleration Patches
+  - Ausdauersportler:\tLinking fixes for SNBGraphicsFB and AMDX3000
   - Syncretic:\t\tAAAMouSSE and telemetrap
-  - cdf:\t\tNightShiftEnabler"""]).start()
+  - cdf:\t\tNightShiftEnabler and Innie"""
+            ],
+        ).start()
 
     def PatchVolume(self):
-        utilities.cls()
-        utilities.header(["Patching System Volume"])
-        print("""Patches Root volume to fix misc issues such as:
+        Utilities.cls()
+        Utilities.header(["Patching System Volume"])
+        big_sur = """Patches Root volume to fix misc issues such as:
 
-- Audio (AppleHDA) Patch for 2011 and older (Excluding MacPro4,1+)
+- Non-Metal Graphics Acceleration
+  - Intel: Ironlake - Sandy Bridge
+  - Nvidia: Tesla - Fermi (8000-500 series)
+  - AMD: TeraScale 1 and 2 (2000-6000 series)
+- Audio support for iMac7,1 and iMac8,1
 
 WARNING: Root Volume Patching is still in active development, please
 have all important user data backed up. Note when the system volume
-is patched, you can no longer have Delta updates or have FileVault
-enabled.
+is patched, you can no longer have Delta updates.
 
 Supported Options:
 
 1. Patch System Volume
 2. Unpatch System Volume (Experimental)
 B. Exit
-        """)
+        """
+        monterey = """Patches Root volume to fix misc issues such as:
+
+- Metal Graphics Acceleration
+  - Intel: Ivy Bridge (4000 series iGPUs)
+  - Nvidia: Kepler (600-700)
+- Non-Metal Graphics Accelertation
+  - Intel: Ironlake - Sandy Bridge
+  - Nvidia: Tesla - Fermi (8000-500 series)
+  - AMD: TeraScale 1 and 2 (2000-6000 series)
+- Audio support for iMac7,1 and iMac8,1
+- Wifi support for BCM94328, BCM94322 and Atheros cards
+
+WARNING: Root Volume Patching is still in active development, please
+have all important user data backed up. Note when the system volume
+is patched, you can no longer have Delta updates.
+
+Supported Options:
+
+1. Patch System Volume
+2. Unpatch System Volume (Experimental)
+B. Exit
+        """
+        mojave_catalina = """Patches Root volume to fix misc issues such as:
+
+- Non-Metal Graphics Acceleration
+  - Intel: Ironlake - Sandy Bridge
+  - Nvidia: Tesla - Fermi (8000-500 series)
+  - AMD: TeraScale 1 and 2 (2000-6000 series)
+- Audio support for iMac7,1 and iMac8,1
+
+WARNING: Root Volume Patching is still in active development, please
+have all important user data backed up. Note when the system volume
+is patched, you can no longer have Delta updates.
+
+Supported Options:
+
+1. Patch System Volume
+2. Unpatch System Volume (Experimental)
+B. Exit
+         """
+
+        default = """
+This OS has no root patches available to apply, please ensure you're patching a booted
+install that requires root patches such as macOS Big Sur or Monterey
+
+Supported Options:
+
+B. Exit
+        """
+        no_patch = False
+        if self.constants.detected_os == self.constants.monterey:
+            print(monterey)
+        elif self.constants.detected_os == self.constants.big_sur:
+            print(big_sur)
+        elif self.constants.detected_os in [self.constants.mojave, self.constants.catalina] and self.constants.moj_cat_accel == True:
+            print(mojave_catalina)
+        else:
+            print(default)
+            no_patch = True
         change_menu = input("Patch System Volume?: ")
-        if change_menu == "1":
-            SysPatch.PatchSysVolume(self.constants.custom_model or self.current_model, self.constants).start_patch()
-        elif change_menu == "2":
-            SysPatch.PatchSysVolume(self.constants.custom_model or self.current_model, self.constants).start_unpatch()
+        if no_patch is not True and change_menu == "1":
+            SysPatch.PatchSysVolume(self.constants.custom_model or self.computer.real_model, self.constants).start_patch()
+        elif no_patch is not True and change_menu == "2":
+            SysPatch.PatchSysVolume(self.constants.custom_model or self.computer.real_model, self.constants).start_unpatch()
         else:
             print("Returning to main menu")
 
-
     def main_menu(self):
         response = None
-        ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS11
         while not (response and response == -1):
             title = [
                 f"OpenCore Legacy Patcher v{self.constants.patcher_version}",
-                f"Selected Model: {self.constants.custom_model or self.current_model}",
-                f"Target OS: macOS {self.constants.os_support}",
+                f"Selected Model: {self.constants.custom_model or self.computer.real_model}",
             ]
 
-            if (self.constants.custom_model or self.current_model) not in ModelArray.SupportedSMBIOS:
+            if (self.constants.custom_model or self.computer.real_model) not in ModelArray.SupportedSMBIOS and self.constants.allow_oc_everywhere is False:
                 in_between = [
-                    'Your model is not supported by this patcher!',
-                    '',
-                    'If you plan to create the USB for another machine, please select the "Change Model" option in the menu.'
+                    "Your model is not supported by this patcher for running unsupported OSes!",
+                    "",
+                    'If you plan to create the USB for another machine, please select the \n"Change Model" option in the menu.',
+                    "",
+                    'If you want to run OCLP on a native Mac, please toggle \n"Allow OpenCore on native Models" in settings',
                 ]
-            elif not self.constants.custom_model and self.current_model == "iMac7,1" and \
-                    "SSE4.1" not in subprocess.run("sysctl machdep.cpu.features".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode():
+            elif not self.constants.custom_model and self.computer.real_model == "iMac7,1" and "SSE4.1" not in self.computer.cpu.flags:
                 in_between = [
-                    'Your model requires a CPU upgrade to a CPU supporting SSE4.1+ to be supported by this patcher!',
-                    '',
-                    f'If you plan to create the USB for another {self.current_model} with SSE4.1+, please select the "Change Model" option in the menu.'
+                    "Your model requires a CPU upgrade to a CPU supporting SSE4.1+ to be supported by this patcher!",
+                    "",
+                    f'If you plan to create the USB for another {self.computer.real_model} with SSE4.1+, please select the "Change Model" option in the menu.',
                 ]
             elif self.constants.custom_model == "iMac7,1":
-                in_between = ["This model is supported",
-                              "However please ensure the CPU has been upgraded to support SSE4.1+"
-                              ]
+                in_between = ["This model is supported", "However please ensure the CPU has been upgraded to support SSE4.1+"]
             else:
                 in_between = ["This model is supported"]
 
-            menu = utilities.TUIMenu(title, "Please select an option: ", in_between=in_between, auto_number=True, top_level=True)
+            menu = Utilities.TUIMenu(title, "Please select an option: ", in_between=in_between, auto_number=True, top_level=True)
 
             options = (
-                [["Build OpenCore", self.build_opencore]] if ((self.constants.custom_model or self.current_model) in ModelArray.SupportedSMBIOS) else []) + [
+                [["Build OpenCore", self.build_opencore]]
+                if ((self.constants.custom_model or self.computer.real_model) in ModelArray.SupportedSMBIOS) or self.constants.allow_oc_everywhere is True
+                else []
+            ) + [
                 ["Install OpenCore to USB/internal drive", self.install_opencore],
                 ["Post-Install Volume Patch", self.PatchVolume],
                 ["Change Model", self.change_model],
                 ["Patcher Settings", self.patcher_settings],
-                ["Credits", self.credits]
+                ["Credits", self.credits],
             ]
 
             for option in options:
@@ -164,7 +427,7 @@ B. Exit
 
             response = menu.start()
 
-        if getattr(sys, "frozen", False):
+        if getattr(sys, "frozen", False) and self.constants.recovery_status is False:
             subprocess.run("""osascript -e 'tell application "Terminal" to close first window' & exit""", shell=True)
 
 

OpenCore-Patcher.spec

@@ -6,8 +6,9 @@ block_cipher = None
 
 
 a = Analysis(['OpenCore-Patcher.command'],
+             pathex=['Resources'],
              binaries=[],
-             datas=[('payloads', 'payloads'), ('Resources', 'Resources')],
+             datas=[('payloads', 'payloads')],
              hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],

README.md

@@ -1,60 +1,69 @@
-# OpenCore Legacy Patcher
+<div align="center">
+             <img src="images/OC-Patcher.png" alt="OpenCore Patcher Logo" width="256" />
+             <h1>OpenCore Legacy Patcher</h1>
+</div>
 
-<img src="images/OC-Patcher.png" width="256">
-
-A python program for building and booting [OpenCore](https://github.com/acidanthera/OpenCorePkg) on legacy Macs, see [Supported SMBIOS](https://dortania.github.io/OpenCore-Legacy-Patcher/MODELS.html) on whether your model is supported. Designed around Big Sur support, however can be used on older OSes.
-  
-| Support Entry | Supported OSes | Description | Comment |
-| :--- | :--- | :--- | :--- |
-| HostOS | macOS 10.7-11 | Refers to OSes where running OpenCore-Patcher.app are supported | Supports 10.7+ if [python 3.6 or higher](https://www.python.org/downloads/) is manually installed, simply run the `OpenCore-Patcher.command` located in the repo |
-| TargetOS | macOS 11 | Refers to OSes that can be patched to run with OpenCore | Unofficially supports 10.4 and newer, no support provided via this patcher |
+A python program with an [Objective-C GUI](https://github.com/dortania/OCLP-GUI) for building and booting [OpenCore](https://github.com/acidanthera/OpenCorePkg) on both legacy and modern Macs, see our in-depth [Guide](https://dortania.github.io/OpenCore-Legacy-Patcher/) for more information.
 
 Supported features:
 
 * System Integrity Protection, FileVault 2, .im4m Secure Boot and Vaulting
+* WPA Wifi and Personal Hotspot support
 * Native OTA OS DELTA updates on all Macs
 * Recovery OS, Safe Mode and Single-user Mode booting
 * Zero firmware patching required (ie. APFS ROM patching)
 * GPU Switching on MacBook Pro models (2012 and newer)
 
-Note: Only clean-installs and upgrades are supported, installs already patched with [Patched-Sur](https://github.com/BenSova/Patched-Sur) or [bigmac](https://github.com/StarPlayrX/bigmac) cannot be used due to broken file integrity with APFS snapshots and SIP.
+Note: Only clean-installs and upgrades are supported, macOS Big Sur installs already patched with other patchers, such as [Patched Sur](https://github.com/BenSova/Patched-Sur) or [bigmac](https://github.com/StarPlayrX/bigmac), cannot be used due to broken file integrity with APFS snapshots and SIP.
 
 * You can however reinstall macOS with this patcher and retain your original data
 
 Note 2: Currently OpenCore Legacy Patcher officially supports patching to run macOS 11, Big Sur installs. For older OSes, OpenCore may function however support is currently not provided from Dortania.
 
-For Mojave and Catalina support, we recommend the use of [dosdude1's patchers](http://dosdude1.com)
-
-## How to use
-
-See the online guide on how:
-
-* [OpenCore Legacy Patcher Guide](https://dortania.github.io/OpenCore-Legacy-Patcher/)
-
-## Patcher Warnings
-
-Since this patcher tricks macOS into thinking you're running a newer Mac, certain functionality may be broken:
-
-* Boot Camp Assistant.app
-  * We recommend running the assistant on a natively supported OS, running via the patcher may result in unforeseen issues
-* Legacy Windows Booting
-  * Currently OpenCore cannot boot MBR-based installs, so Ivy Bridge and older Machines may [not be able to see Windows in OpenCore's Boot Picker](https://github.com/acidanthera/bugtracker/issues/912)
-  * [Solution is to convert install to UEFI](https://docs.microsoft.com/en-us/mem/configmgr/osd/deploy-use/task-sequence-steps-to-manage-bios-to-uefi-conversion)
-* Boot Buddy support
-  * Due to how OpenCore overwrites NVRAM, the usage of Boot Buddy and such tools are **highly** in-advised
+* For macOS Mojave and Catalina support, we recommend the use of [dosdude1's patchers](http://dosdude1.com)
+* macOS Monterey usage is provided however support is limited, currently recommended for users to run Big Sur for best compatibility
 
 ## Support
 
-To get aid with the patcher, we recommend joining the [Unsupported Mac Discord Server](https://discord.gg/XbbWAsE) and heading over to our `#opencore-patcher` channel. We're actively there and is the quickest way to receive help. For bigger issues such as patcher crashing on build and such, we recommend opening an issue right here on GitHub:
+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. For bigger issues such as patcher crashing on build and such, we recommend opening an issue right here on GitHub(Please review [How to debug with OpenCore](https://dortania.github.io/OpenCore-Legacy-Patcher/DEBUG.html) before opening issues):
 
 * [OpenCore Legacy Patcher's Issue's tab](https://github.com/dortania/OpenCore-Legacy-Patcher/issues)
 
-Regarding how to debug OpenCore Patcher, we recommend seeing the below:
+Nightly builds can be found here courteous of nightly.link: 
 
-* [How to debug with OpenCore](https://dortania.github.io/OpenCore-Legacy-Patcher/DEBUG.html)
+* [Nightly OpenCore Patcher (GUI)](https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-gui/main/OpenCore-Patcher-GUI.app.zip)
+* [Nightly OpenCore Patcher (TUI)](https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app/main/OpenCore-Patcher-TUI.app.zip)
+  * [Offline Variant](https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app-offline/main/OpenCore-Patcher-TUI-Offline.app.zip) (No network connection needed on target Mac for Root Patching)
+* [Nightly OpenCore Patcher (CLI)](https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-gui/main/OCLP-CLI.zip)
 
-## Supporting us!
+## Credits
 
-To help support this patcher, we recommend chancking this page:
-
-* [Supporting the patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/DONATE.html)
+* [Acidanthera](https://github.com/Acidanthera)
+  * OpenCorePkg as well as many of the core kexts and tools
+* [DhinakG](https://github.com/DhinakG)
+  * Main co-author
+* [Khronokernel](https://github.com/Khronokernel)
+  * Main co-author
+* [Ausdauersportler](https://github.com/Ausdauersportler)
+  * iMacs Metal GPUs Upgrade Patch set and documentation
+  * Great amounts of help debugging and code suggestions
+* [vit9696](https://github.com/vit9696)
+  * Endless amount of help troubleshooting, determining fixes and writing patches
+* [ASentientBot](https://github.com/ASentientBot)
+  * Legacy Acceleration Patch set and documentation
+* [cdf](https://github.com/cdf)
+  * Mac Pro on OpenCore Patch set and documentation
+  * [Innie](https://github.com/cdf/Innie) and [NightShiftEnabler](https://github.com/cdf/NightShiftEnabler)
+* [Syncretic](https://forums.macrumors.com/members/syncretic.1173816/)
+  * [AAAMouSSE](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/) and [telemetrap](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/post-28447707)
+* [dosdude1](https://github.com/dosdude1)
+  * Main author of GUI
+  * Development of previous patchers, laying out much of what needs to be patched
+* [BarryKN](https://github.com/BarryKN)
+  * Development of previous patchers, laying out much of what needs to be patched
+* [mario_bros_tech](https://github.com/mariobrostech) and the rest of the Unsupported Mac Discord
+  * Catalyst that started OpenCore Legacy Patcher
+* MacRumors and Unsupported Mac Communities
+  * Endless testing, reporting issues
+* Apple
+  * for macOS and many of the kexts, frameworks and other binaries we reimplemented into newer OSes

Resources/CliMenu.py

@@ -1,72 +1,62 @@
 # Handle misc CLI menu options
 # Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
 from __future__ import print_function
+import subprocess
 
-import subprocess, sys, time, platform
+from Resources import Constants, Utilities
 
-from Resources import build, ModelArray, Constants, SysPatch, utilities
 
 class MenuOptions:
     def __init__(self, model, versions):
         self.model = model
         self.constants: Constants.Constants = versions
 
-    def change_os(self):
-        utilities.cls()
-        utilities.header(["Select Patcher's Target OS"])
-        print(f"""
-Minimum Target:\t{self.constants.min_os_support}
-Maximum Target:\t{self.constants.max_os_support}
-Current target:\t{self.constants.os_support}
-        """)
-        temp_os_support = float(input("Please enter OS target: "))
-        if (self.constants.max_os_support < temp_os_support) or (temp_os_support < self.constants.min_os_support):
-            print("Unsupported entry")
-        else:
-            self.constants.os_support = temp_os_support
-        if temp_os_support == 11.0:
-            ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS11
-        elif temp_os_support == 12.0:
-            ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS12
-
     def change_verbose(self):
-        utilities.cls()
-        utilities.header(["Set Verbose mode"])
-        change_menu = input("Enable Verbose mode(y/n): ")
+        Utilities.cls()
+        Utilities.header(["Set Verbose mode"])
+        change_menu = input("Enable Verbose mode(y/n/q): ")
         if change_menu in {"y", "Y", "yes", "Yes"}:
             self.constants.verbose_debug = True
         elif change_menu in {"n", "N", "no", "No"}:
             self.constants.verbose_debug = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.change_verbose()
 
     def change_oc(self):
-        utilities.cls()
-        utilities.header(["Set OpenCore DEBUG mode"])
-        change_menu = input("Enable OpenCore DEBUG mode(y/n): ")
+        Utilities.cls()
+        Utilities.header(["Set OpenCore DEBUG mode"])
+        change_menu = input("Enable OpenCore DEBUG mode(y/n/q): ")
         if change_menu in {"y", "Y", "yes", "Yes"}:
             self.constants.opencore_debug = True
             self.constants.opencore_build = "DEBUG"
         elif change_menu in {"n", "N", "no", "No"}:
             self.constants.opencore_debug = False
             self.constants.opencore_build = "RELEASE"
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.change_oc()
+
     def change_kext(self):
-        utilities.cls()
-        utilities.header(["Set Kext DEBUG mode"])
-        change_menu = input("Enable Kext DEBUG mode(y/n): ")
+        Utilities.cls()
+        Utilities.header(["Set Kext DEBUG mode"])
+        change_menu = input("Enable Kext DEBUG mode(y/n/q): ")
         if change_menu in {"y", "Y", "yes", "Yes"}:
             self.constants.kext_debug = True
         elif change_menu in {"n", "N", "no", "No"}:
             self.constants.kext_debug = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.change_kext()
 
     def change_metal(self):
-        utilities.cls()
-        utilities.header(["Assume Metal GPU Always in iMac"])
-        print("""This is for iMacs that have upgraded Metal GPUs, otherwise
+        Utilities.cls()
+        Utilities.header(["Assume Metal GPU Always in iMac"])
+        print(
+            """This is for iMacs that have upgraded Metal GPUs, otherwise
 Patcher assumes based on stock configuration (ie. iMac10,x-12,x)
 
 Valid Options:
@@ -74,10 +64,12 @@ Valid Options:
 1. None(stock GPU)
 2. Nvidia GPU
 3. AMD GPU
+Q. Return to previous menu
 
 Note: Patcher will detect whether hardware has been upgraded regardless, this
 option is for those patching on a different machine or OCLP cannot detect.
-        """)
+        """
+        )
         change_menu = input("Set GPU Patch type(ie. 1): ")
         if change_menu == "1":
             self.constants.metal_build = False
@@ -88,29 +80,16 @@ option is for those patching on a different machine or OCLP cannot detect.
         elif change_menu == "3":
             self.constants.metal_build = True
             self.constants.imac_vendor = "AMD"
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
-
-    def change_wifi(self):
-        utilities.cls()
-        utilities.header(["Assume Upgraded Wifi Always"])
-        print("""This is for Macs with upgraded wifi cards(ie. BCM94360/2)
-
-Note: Patcher will detect whether hardware has been upgraded regardless, this
-option is for those patching on a different machine or cannot detect.
-        """)
-        change_menu = input("Enable Upgraded Wifi build algorithm?(y/n): ")
-        if change_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.wifi_build = True
-        elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.wifi_build = False
-        else:
-            print("Invalid option")
+            self.change_metal()
 
     def change_serial(self):
-        utilities.cls()
-        utilities.header(["Set SMBIOS Mode"])
-        print("""This section is for setting how OpenCore generates the SMBIOS
+        Utilities.cls()
+        Utilities.header(["Set SMBIOS Spoof Level"])
+        print(
+            """This section is for setting how OpenCore generates the SMBIOS
 Recommended for adanced users who want control how serials are handled
 
 Valid options:
@@ -118,122 +97,537 @@ Valid options:
 1. Minimal:\tUse original serials and minimally update SMBIOS
 2. Moderate:\tReplace entire SMBIOS but keep original serials
 3. Advanced:\tReplace entire SMBIOS and generate new serials
+Q. Return to previous menu
 
 Note: For new users we recommend leaving as default(1. Minimal)
-        """)
-        change_menu = input("Set SMBIOS Mode(ie. 1): ")
+        """
+        )
+        change_menu = input("Set SMBIOS Spoof Level(ie. 1): ")
         if change_menu == "1":
             self.constants.serial_settings = "Minimal"
         elif change_menu == "2":
             self.constants.serial_settings = "Moderate"
         elif change_menu == "3":
             self.constants.serial_settings = "Advanced"
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.change_serial()
+
     def change_showpicker(self):
-        utilities.cls()
-        utilities.header(["Set OpenCore Picker mode"])
-        print("""By default, OpenCore will show its boot picker each time on boot up,
+        Utilities.cls()
+        Utilities.header(["Set OpenCore Picker mode"])
+        print(
+            """By default, OpenCore will show its boot picker each time on boot up,
 however this can be disabled by default and be shown on command by repeatedly
 pressing the "Esc" key
-        """)
-        change_menu = input("Show OpenCore Picker by default(y/n): ")
+        """
+        )
+        change_menu = input("Show OpenCore Picker by default(y/n/q): ")
         if change_menu in {"y", "Y", "yes", "Yes"}:
             self.constants.showpicker = True
         elif change_menu in {"n", "N", "no", "No"}:
             self.constants.showpicker = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.change_showpicker()
 
     def change_vault(self):
-        utilities.cls()
-        utilities.header(["Set OpenCore Vaulting"])
-        print("""By default, this patcher will sign all your files and ensure none of the
+        Utilities.cls()
+        Utilities.header(["Set OpenCore Vaulting"])
+        print(
+            """By default, this patcher will sign all your files and ensure none of the
 contents can be tampered with. However for more advanced users, you may
 want to be able to freely edit the config.plist and files.
 
-Note: For secuirty reasons, OpenShell will be disabled when Vault is set.
+Note: For security reasons, OpenShell will be disabled when Vault is set.
 
-        """)
-        change_menu = input("Enable Vault(y/n): ")
+        """
+        )
+        change_menu = input("Enable Vault(y/n/q): ")
         if change_menu in {"y", "Y", "yes", "Yes"}:
             self.constants.vault = True
         elif change_menu in {"n", "N", "no", "No"}:
             self.constants.vault = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.change_vault()
 
     def change_sip(self):
-        utilities.cls()
-        utilities.header(["Set SIP and SecureBootModel"])
-        print("""SIP and SecureBootModel are used to ensure proper OTA functionality,
-however to patch the root volume both of these must be disabled.
+        Utilities.cls()
+        Utilities.header(["Set System Integrity protection"])
+        print(
+            """SIP is used to ensure proper secuirty measures are set,
+however to patch the root volume this must be disabled.
 Only disable is absolutely necessary. SIP value = 0xFEF
 
-Note: for minor changes, SIP can be adjusted in recovery like normal.
-Additionally, when disabling SIP via the patcher amfi_get_out_of_my_way=1
-will be added to boot-args.
+Valid options:
+
+1. Enable SIP
+2. Disable SIP
+Q. Return to previous menu
+
+        """
+        )
+        change_menu = input("Set SIP: ")
+        if change_menu == "1":
+            self.constants.sip_status = True
+        elif change_menu == "2":
+            self.constants.sip_status = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.change_sip()
+
+    def change_sbm(self):
+        Utilities.cls()
+        Utilities.header(["Set SecureBootModel"])
+        print(
+            """SecureBootModel is used to ensure best firmware security,
+however to patch the root volume this must be disabled.
+Only disable is absolutely necessary. SIP value = 0xFEF
 
 Valid options:
 
-1. Enable Both
-2. Disable SIP only
-3. Disable SecureBootModel Only
-4. Disable Both
+1. Enable SecureBootModel
+2. Disable SecureBootModel
+Q. Return to previous menu
 
-        """)
-        change_menu = input("Set SIP and SecureBootModel(ie. 1): ")
+        """
+        )
+        change_menu = input("Set SecureBootModel: ")
         if change_menu == "1":
-            self.constants.sip_status = True
             self.constants.secure_status = True
         elif change_menu == "2":
-            self.constants.sip_status = False
-            self.constants.secure_status = True
-        elif change_menu == "3":
-            self.constants.sip_status = True
-            self.constants.secure_status = False
-        elif change_menu == "4":
-            self.constants.sip_status = False
             self.constants.secure_status = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.change_sbm()
 
-    def change_imac_nvidia(self):
-        utilities.cls()
-        utilities.header(["Force iMac Nvidia Patches"])
-        print("""Specifically for iMac10,x-12,x with Metal Nvidia GPU upgrades
-By default the patcher will try to detect what hardware is
-running, however this will enforce iMac Nvidia Build Patches.
-        """)
-        change_menu = input("Assume iMac Nvidia patches(y/n): ")
+    def set_amfi(self):
+        Utilities.cls()
+        Utilities.header(["Set AMFI"])
+        print(
+            """Required for Root Patching non-Metal GPUs
+in macOS Big Sur. Without this, will receive kernel panic once
+Patcher finishes installing legacy acceleration patches.
+        """
+        )
+        change_menu = input("Disable AMFI(y/n/q): ")
         if change_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.imac_nvidia_build = True
+            self.constants.amfi_status = False
         elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.imac_nvidia_build = False
+            self.constants.amfi_status = True
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.set_amfi()
 
-    def custom_repo(self):
-        utilities.cls()
-        utilities.header(["Swet custom patch repo"])
-        print(f"""For users participating in OpenCore Patcher betas, this is
-where you can add custom repos such as Google Drive links.
+    def bootstrap_setting(self):
+        Utilities.cls()
+        Utilities.header(["Set Bootstrap method"])
+        print(
+            """Sets OpenCore's bootstrap method, currently the patcher supports the
+following options.
 
 Valid options:
 
-1. Set custom location
-2. Reset repo location
-3. Exit
+1. System/Library/CoreServices/boot.efi (default)
+2. EFI/BOOT/BOOTx64.efi
+Q. Return to previous menu
 
-Current repo:
-{self.constants.url_apple_binaries}
-        """)
-        change_menu = input("Set custom location?: ")
+Note: S*/L*/C*/boot.efi method is only installed to the EFI partition only
+and not to macOS itself.
+
+Recommended to set to BOOTx64.efi in situations where your Mac cannot
+see the EFI Boot entry in the boot picker.
+
+        """
+        )
+        change_menu = input("Set Bootstrap method: ")
         if change_menu == "1":
-            self.constants.url_backup = self.constants.url_apple_binaries
-            self.constants.url_apple_binaries = input("Enter new URL: ")
+            self.constants.boot_efi = False
         elif change_menu == "2":
-            if self.constants.url_backup != "":
-                self.constants.url_apple_binaries = self.constants.url_backup
+            self.constants.boot_efi = True
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
         else:
-            print("Invalid option")
+            self.bootstrap_setting()
+
+    def drm_setting(self):
+        Utilities.cls()
+        Utilities.header(["Set DRM preferences"])
+        print(
+            """Sets OpenCore's DRM preferences for iMac13,x and iMac14,x.
+In Big Sur, some DRM based content may be broken by
+default in AppleTV, Photobooth, etc.
+
+To resolve, you can opt to disable Intel QuickSync support in
+favor of Nvidia's Software rendering. This can aid in DRM however
+greatly hampers Video rendering performance in Final Cut Pro and
+other programs relying on such features.
+
+Recommend only disabling if absolutely required.
+        """
+        )
+        change_menu = input("Enable Nvidia's Software DRM rendering(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.drm_support = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.drm_support = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.drm_setting()
+
+    def allow_native_models(self):
+        Utilities.cls()
+        Utilities.header(["Allow OpenCore on native Models"])
+        print(
+            """Allows natively supported Macs to use OpenCore. Recommended
+for users with 3rd Party NVMe SSDs to achieve improved overall
+power usage.
+
+        """
+        )
+        change_menu = input("Allow OpenCore on all Models(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.allow_oc_everywhere = True
+            self.constants.serial_settings = "None"
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.allow_oc_everywhere = False
+            self.constants.serial_settings = "Minimal"
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.allow_native_models()
+
+    def custom_cpu(self):
+        Utilities.cls()
+        Utilities.header(["Set custom CPU Model Name"])
+        print(
+            """Change reported CPU Model name in About This Mac
+Custom names will report as follows:
+
+1: Original Name: 2.5 Ghz Dual-Core Intel Core i5
+2. CPU name:      Intel(R) Core(TM) i5-3210M CPU @ 2.50Ghz
+3. Custom Name:   2.5Ghz Cotton Candy (example)
+Q. Return to previous menu
+        """
+        )
+        if self.constants.custom_cpu_model_value == "":
+            if self.constants.custom_cpu_model == 0:
+                print("Currently using original name")
+            else:
+                print("Currently using CPU name")
+        else:
+            print(f"Custom CPU name currently: {self.constants.custom_cpu_model_value}")
+        change_menu = input("Set custom CPU Name(1,2,3): ")
+        if change_menu == "1":
+            self.constants.custom_cpu_model = 2
+            self.constants.custom_cpu_model_value = ""
+        elif change_menu == "2":
+            self.constants.custom_cpu_model = 0
+            self.constants.custom_cpu_model_value = ""
+        elif change_menu == "3":
+            self.constants.custom_cpu_model = 1
+            self.constants.custom_cpu_model_value = input("Enter new CPU Name: ")
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.custom_cpu()
+
+    def disable_cpufriend(self):
+        Utilities.cls()
+        Utilities.header(["Disable CPU Friend?"])
+        print(
+            """Only recommended for advanced users
+Disabling CPUFriend forces macOS into using a different
+Mac's power profile for CPUs and GPUs, which can harm the
+hardware
+        """
+        )
+        change_menu = input("Disable CPU Friend?(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.disallow_cpufriend = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.disallow_cpufriend = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.disable_cpufriend()
+
+    def set_smbios(self):
+        Utilities.cls()
+        Utilities.header(["Set SMBIOS Spoof Model"])
+        print(
+            """Change model OpenCore spoofs Mac too
+
+Valid options:
+1. Default set by OpenCore (Default)
+2. User Override
+3. Disable all spoofing (unsupported configuration)
+Q. Return to previous menu
+        """
+        )
+
+        change_menu = input("Set SMBIOS Spoof Model: ")
+        if change_menu == "1":
+            print("Setting SMBIOS spoof to default mode")
+            self.constants.override_smbios = "Default"
+        elif change_menu == "2":
+            custom_smbios = input("Set new SMBIOS mode: ")
+            try:
+                test = self.constants.board_id[custom_smbios]
+                self.constants.override_smbios = custom_smbios
+            except KeyError:
+                print("Unsupported SMBIOS, defaulting to Default setting")
+                self.constants.override_smbios = "Default"
+        elif change_menu == "3":
+            print("Disabling SMBIOS spoof")
+            self.constants.override_smbios = self.model
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.set_smbios()
+
+    def allow_firewire(self):
+        Utilities.cls()
+        Utilities.header(["Allow FireWire Boot Support"])
+        print(
+            """
+In macOS Catalina and newer, Apple restricted
+usage of FireWire devices to boot macOS for
+security concerns relating to DMA access.
+
+If you are comfortable lowering the security,
+you can re-enable FireWire support for Catalina
+and newer.
+
+Note: MacBook5,x-7,1 don't support FireWire boot
+        """
+        )
+
+        change_menu = input("Enable FireWire Boot support?(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.firewire_boot = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.firewire_boot = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.allow_firewire()
+
+    def allow_nvme(self):
+        Utilities.cls()
+        Utilities.header(["Allow NVMe UEFI Support"])
+        print(
+            """
+For machines not natively supporting NVMe,
+this option allows you to see and boot NVMe
+drive in OpenCore's picker
+
+Not required if your machine natively supports NVMe
+
+Note: You must have OpenCore on a bootable volume
+first, ie. USB or SATA drive. Once loaded,
+OpenCore will enable NVMe support in it's picker
+        """
+        )
+
+        change_menu = input("Enable NVMe Boot support?(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.nvme_boot = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.nvme_boot = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.allow_nvme()
+
+    def allow_wowl(self):
+        Utilities.cls()
+        Utilities.header(["Allow Wake on WLAN"])
+        print(
+            """
+Due to an unfortunate bug in macOS Big Sur+, Wake on WLAN is
+disabled by default for BCM943224, BCM94331 and BCM94360/2 chipsets.
+
+This is due to Wake on WLAN creating network instability and in other cases
+halving network speeds. This issue is not replicable across machines however
+be prepared if enabling.
+        """
+        )
+
+        change_menu = input("Allow Wake on WLAN?(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.enable_wake_on_wlan = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.enable_wake_on_wlan = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.allow_wowl()
+
+    def allow_ivy(self):
+        Utilities.cls()
+        Utilities.header(["Allow Ivy iMac iGPU"])
+        print(
+            """
+For iMac13,x systems with a Nvidia dGPU, the iGPU is disabled by default to
+allow Delta Updates, FileVault, SIP and such on macOS Monterey. However due to
+this, DRM and QuickSync support may be broken.
+
+Users can choose to override this option but be aware SIP must be
+disabled to run root patches to fix DRM and QuickSync.
+
+Note: This does not apply for Big Sur, the iGPU can be renabled without
+consequence
+Note 2: This setting only affects iMac13,x with dGPUs
+        """
+        )
+
+        change_menu = input("Allow Ivy iMac iGPU?(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.allow_ivy_igpu = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.allow_ivy_igpu = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.allow_ivy()
+
+    def latebloom_settings(self):
+        Utilities.cls()
+        Utilities.header(["Set latebloom properties"])
+        print(
+            f"""
+Set latebloom properties, useful for debugging boot stalls on
+pre-Sandy Bridge Macs.
+
+Valid options:
+
+1. Set delay (currently: {self.constants.latebloom_delay}ms)
+2. Set range (currently: {self.constants.latebloom_range}ms)
+3. Set debug (currently: {bool(self.constants.latebloom_debug)})
+Q. Return to previous menu
+        """
+        )
+
+        change_menu = input("Select latebloom property(1/2/3): ")
+        if change_menu == "1":
+            try:
+                self.constants.latebloom_delay = int(input("Set delay: "))
+            except ValueError:
+                input("Invalid value, press [ENTER] to continue")
+            self.latebloom_settings()
+        elif change_menu == "2":
+            try:
+                self.constants.latebloom_range = int(input("Set range: "))
+            except ValueError:
+                input("Invalid value, press [ENTER] to continue")
+            self.latebloom_settings()
+        elif change_menu == "3":
+            try:
+                print("Currently supports either 0(False) or 1(True)")
+                latebloom_debug = int(input("Set debug(0/1): "))
+                if latebloom_debug not in [0, 1]:
+                    input("Invalid value, press [ENTER] to continue")
+                else:
+                    self.constants.latebloom_debug = latebloom_debug
+            except ValueError:
+                input("Invalid value, press [ENTER] to continue")
+            self.latebloom_settings()
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.latebloom_settings()
+
+    def allow_moj_cat_patch(self):
+        Utilities.cls()
+        Utilities.header(["Allow Root Patching on Mojave/Catalina"])
+        print(
+            """
+This is an experimental option that allows the usage of legacy acceleration
+patches in Mojave and Catalina.
+
+The main goal of this is to allow developers to better test patch sets as well
+as allow acceleration on TeraScale 2 machines. Not all features may be available
+(ie. GPU switching may not work, etc)
+
+Note: for the average user, we recommend using dosdude1's legacy patcher:
+
+- http://dosdude1.com/software.html
+        """
+        )
+
+        change_menu = input("Allow Root Patching on Mojave/Catalina?(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.moj_cat_accel = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.moj_cat_accel = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.allow_moj_cat_patch()
+
+    def disable_thunderbolt(self):
+        Utilities.cls()
+        Utilities.header(["Disable Thunderbolt on 2013-14 MacBook Pros"])
+        print(
+            """
+Some 2013-14 MacBook Pro's have issues with the built-in thunderbolt,
+resulting in kernel panics and random shutdowns.
+
+To alliviate, you can disable the thunderbolt controller on MacBookPro11,x 
+machines with this option.
+
+Note: This option only works on MacBookPro11,x, file an issue if you know of
+other devices that benefit from this fix.
+        """
+        )
+
+        change_menu = input("Disable Thunderbolt?(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.disable_thunderbolt = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.disable_thunderbolt = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.disable_thunderbolt()
+
+    def terascale_2_accel(self):
+        Utilities.cls()
+        Utilities.header(["Set TeraScale 2 Acceleration"])
+        print(
+            """
+By default this patcher will install TeraScale 2 acceleration, however
+for some laptops this may be undesired due to how degraded their dGPU
+is.
+
+Disabling TeraScale 2 acceleration will instead install basic framebuffer
+support allowing for basic brightness control and let the HD3000 iGPU
+handle acceleration tasks.
+        """
+        )
+
+        change_menu = input("Allow TeraScale 2 Acceleration?(y/n/q): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.allow_ts2_accel = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.allow_ts2_accel = False
+        elif change_menu in {"q", "Q", "Quit", "quit"}:
+            print("Returning to previous menu")
+        else:
+            self.terascale_2_accel()
+
+    def dump_hardware(self):
+        Utilities.cls()
+        Utilities.header(["Dumping detected hardware"])
+        print("")
+        print(self.constants.computer)
+        input("\nPress [ENTER] to exit: ")

Resources/Constants.py

@@ -5,64 +5,145 @@
 from __future__ import print_function
 
 from pathlib import Path
+from typing import Optional
+
+from Resources import device_probe
 
 
 class Constants:
     def __init__(self):
-        self.patcher_version = "0.0.20"
-        self.opencore_commit = "c528597 - 2021-04-05"
-        self.opencore_version = "0.6.8"
-        self.lilu_version = "1.5.2"
-        self.whatevergreen_version = "1.4.9"
-        self.airportbcrmfixup_version = "2.1.2"
-        self.bcm570_version = "1.0.1"
-        self.marvel_version = "1.0.0"
-        self.nforce_version = "1.0.0"
-        self.mce_version = "1.0.0"
-        self.mousse_version = "0.93"
-        self.telemetrap_version = "1.0.0"
-        self.io80211high_sierra_version = "1.0.0"
-        self.io80211mojave_version = "1.0.0"
-        self.voodoohda_version = "296"
-        self.restrictevents_version = "1.0.0"
-        self.restrictevents_mbp_version = "1.0.1"
-        self.piixata_version = "1.0.0"
-        self.backlight_version = "1.0.0"
-        self.cpufriend_version = "1.2.3"
-        self.nightshift_version = "1.1.0"
-        self.smcspoof_version = "1.0.0"
-        self.cputscsync = "1.0.3"
-        self.hibernationfixup = "1.3.9"
+        # Patcher Versioning
+        self.patcher_version = "0.2.5"  #              OpenCore-Legacy-Patcher
+        self.patcher_support_pkg_version = "0.1.3"  #  PatcherSupportPkg
+
+        # OpenCore Versioning
+        # https://github.com/acidanthera/OpenCorePkg
+        self.opencore_commit = "ff4b099 - 09-06-2021"
+        self.opencore_version = "0.7.3"
+
+        # Kext Versioning
+        ## Acidanthera
+        ## https://github.com/acidanthera
+        self.lilu_version = "1.5.6"  #               Lilu
+        self.whatevergreen_version = "1.5.3"  #      WhateverGreen
+        self.airportbcrmfixup_version = "2.1.3"  #   AirPortBrcmFixup
+        self.nvmefix_version = "1.0.9"  #            NVMeFix
+        self.applealc_version = "1.6.3"  #           AppleALC
+        self.restrictevents_version = "1.0.3"  #     RestrictEvents
+        self.restrictevents_mbp_version = "1.0.3"  # RestrictEvents blocking displaypolicyd (see RestrictEvents-MBP91.patch)
+        self.featureunlock_version = "1.0.3"  #      FeatureUnlock
+        self.debugenhancer_version = "1.0.4"  #      DebugEnhancer
+        self.cpufriend_version = "1.2.4"  #          CPUFriend
+        self.bluetool_version = "2.6.1"  #           BlueToolFixup
+        self.cslvfixup_version = "2.6.1"  #          CSLVFixup
+
+        ## Apple
+        ## https://www.apple.com
+        self.marvel_version = "1.0.1"  #  MarvelYukonEthernet
+        self.nforce_version = "1.0.1"  #  nForceEthernet
+        self.piixata_version = "1.0.1"  # AppleIntelPIIXATA
+        self.fw_kext = "1.0.1"  #         IOFireWireFamily
+        self.apple_trackpad = "1.0.1"  #  AppleUSBTrackpad
+
+        ## Apple - Dortania Modified
+        self.bcm570_version = "1.0.2"  #             CatalinaBCM5701Ethernet
+        self.corecaptureelcap_version = "1.0.1"  #   corecaptureElCap
+        self.io80211elcap_version = "2.0.0"  #       IO80211ElCap
+        self.io80211high_sierra_version = "1.0.1"  # IO80211HighSierra
+        self.io80211mojave_version = "1.0.1"  #      IO80211Mojave
+
+        ## Dortania
+        ## https://github.com/dortania
+        self.backlight_injector_version = "1.0.0"  # BacklightInjector
+        self.smcspoof_version = "1.0.0"  #           SMC-Spoof
+        self.mce_version = "1.0.0"  #                AppleMCEReporterDisabler
+        self.btspoof_version = "1.0.0"  #            Bluetooth-Spoof
+
+        ## Syncretic
+        ## https://forums.macrumors.com/members/syncretic.1173816/
+        ## https://github.com/reenigneorcim/latebloom
+        self.latebloom_version = "0.22"  #   Latebloom
+        self.mousse_version = "0.95"  #      MouSSE
+        self.telemetrap_version = "1.0.0"  # telemetrap
+
+        ## cdf
+        ## https://github.com/cdf/Innie
+        self.innie_version = "1.3.0"  # Innie
 
         # Get resource path
         self.current_path = Path(__file__).parent.parent.resolve()
         self.payload_path = self.current_path / Path("payloads")
 
-        self.custom_model: str = None
-        self.custom_mxm_gpu: str = None
-        self.current_gpuv: str = None
-        self.current_gpud: str = None
-
         # Patcher Settings
+        self.allow_oc_everywhere = False  # Set whether Patcher can be run on unsupported Macs
+        self.gui_mode = False  #            Determine whether running in a GUI or TUI
+        self.disk = ""  #                   Set installation ESP
+        self.patch_disk = ""  #             Set Root Volume to patch
+        self.validate = False  #            Enable validation testing for CI
+        self.recovery_status = False  #     Detect if booted into RecoveryOS
+
+        ## Hardware
+        self.computer: device_probe.Computer = None  # type: ignore
+        self.custom_model: Optional[str] = None
+
+        ## OpenCore Settings
         self.opencore_debug = False
         self.opencore_build = "RELEASE"
-        self.kext_debug = False
-        self.verbose_debug = False
-        self.os_support = 11.0
-        self.min_os_support = 11.0
-        self.max_os_support = 11.0
-        self.metal_build = False
-        self.imac_vendor = "None"
-        self.wifi_build = False
-        self.gui_mode = False
-        self.serial_settings = "Minimal"
-        self.showpicker = True
-        self.vault = False
-        self.sip_status = True
-        self.secure_status = True
-        self.detected_os = 0
+        self.showpicker = True  # Show or Hide OpenCore's Boot Picker
+        self.boot_efi = False  #  Use EFI/BOOT/BOOTx64.efi bootstrap
+
+        ## Kext Settings
+        self.kext_debug = False  # Enables Lilu debug and DebugEnhancer
+
+        ## NVRAM Settings
+        self.verbose_debug = False  # -v
+
+        ## SMBIOS Settings
+        self.custom_cpu_model = 2  #        Patch type value
+        self.custom_cpu_model_value = ""  # New CPU name within About This Mac
+        self.serial_settings = "Minimal"  # Set SMBIOS level used
+        self.override_smbios = "Default"  # Set SMBIOS model used
+
+        ## Latebloom Settings
+        self.latebloom_status = False  # Latebloom Enabled
+        self.latebloom_delay = 0  #      Delay between each PCIe Probe
+        self.latebloom_range = 0  #      Range each delay can differ
+        self.latebloom_debug = 0  #      Debug Setting
+
+        ## Security Settings
+        self.apecid_support = False  # ApECID
+        self.amfi_status = True  #     Apple Mobile File Integrity
+        self.sip_status = True  #      System Integrity Protection
+        self.secure_status = False  #  Secure Boot Model
+        self.vault = False  #          EFI Vault
+        self.disable_cs_lv = False  #  Disable Library validation
+
+        ## OS Settings
+        self.os_support = 12.0
+        self.detected_os = 0  #        Major Kernel Version
+        self.detected_os_minor = 0  #  Minor Kernel Version
+        self.detected_os_build = ""  # OS Build
+        self.allow_fv_root = False  #  Allow FileVault on broken sealed snapshots
+
+        ## Boot Volume Settings
+        self.firewire_boot = False  # Allow macOS FireWire Boot
+        self.nvme_boot = False  #     Allow UEFI NVMe Boot
+
+        ## Graphics Settings
+        self.metal_build = False  #    Set MXM Build support
+        self.imac_vendor = "None"  #   Set MXM GPU vendor
+        self.drm_support = False  #    Set iMac14,x DRM support
+        self.allow_ivy_igpu = False  # Set iMac13,x iGPU support
+        self.moj_cat_accel = False  #  Set Mojave/Catalina Acceleration support
+        self.allow_ts2_accel = True  # Set TeraScale 2 Acceleration support
+
+        ## Miscellaneous
+        self.disallow_cpufriend = False  #   Disable CPUFriend
+        self.enable_wake_on_wlan = False  #  Allow Wake on WLAN for modern Broadcom
+        self.disable_thunderbolt = False  #  Disable Thunderbolt Controller
 
         # OS Versions
+        ## Based off Major Kernel Version
         self.tiger = 8
         self.leopard = 9
         self.snow_leopard = 10
@@ -76,225 +157,663 @@ class Constants:
         self.mojave = 18
         self.catalina = 19
         self.big_sur = 20
+        self.monterey = 21
+
+        # Vendor IDs
+        self.pci_nvidia = "10DE"
+        self.pci_amd_ati = "1002"
+        self.pci_intel = "8086"
+        self.pci_broadcom = "14E4"
+        self.pci_atheros = "168C"
+        self.pci_apple = "106B"
+        self.pci_aquantia = "1D6A"
+        self.pci_marvell = "11AB"
+        self.pci_syskonnect = "1148"
+
+        # Class Codes
+        ## https://pci-ids.ucw.cz/read/PD
+        self.classcode_sata = "01060100"
+        self.classcode_nvme = "02080100"
+        self.classcode_nvme_generic = "02800100"
+        self.classcode_wifi = "00800200"
+        self.classcode_gpu = "00000300"
+        self.classcode_gpu_variant = "00800300"
+        self.classcode_xhci = "30030C00"
+        self.classcode_ethernet = "00000200"
+
+        # Nvidia GPU Architecture
+        self.arch_tesla = "NV50"
+        self.arch_fermi = "GF100"
+        self.arch_kepler = "GK100"
 
         # External Files
-        self.url_backup = ""
-        self.url_apple_binaries = "https://github.com/dortania/Apple-Binaries-OCLP/archive/refs/heads/main.zip"
+        self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/"
+
+        self.legacy_accel_support = [
+            self.mojave,
+            self.catalina,
+            self.big_sur,
+            self.monterey,
+        ]
 
     # Payload Location
     # OpenCore
     @property
-    def opencore_zip_source(self): return self.payload_path / Path(f"OpenCore/OpenCore-{self.opencore_build}-v{self.opencore_version}.zip")
+    def opencore_zip_source(self):
+        return self.payload_path / Path(f"OpenCore/OpenCore-{self.opencore_build}.zip")
+
     @property
-    def plist_template(self): return self.payload_path / Path(f"Config/v{self.opencore_version}/config.plist")
+    def plist_template(self):
+        return self.payload_path / Path("Config/config.plist")
+
+    # Mount Location
+    @property
+    def payload_mnt1_path(self):
+        return self.payload_path / Path("mnt1")
 
     # ACPI
     @property
-    def pci_ssdt_path(self): return self.payload_path / Path("ACPI/SSDT-CPBG.aml")
+    def pci_ssdt_path(self):
+        return self.payload_path / Path("ACPI/SSDT-CPBG.aml")
+
+    @property
+    def windows_ssdt_path(self):
+        return self.payload_path / Path("ACPI/SSDT-PCI.aml")
 
     # Drivers
     @property
-    def nvme_driver_path(self): return self.payload_path / Path("Drivers/NvmExpressDxe.efi")
+    def nvme_driver_path(self):
+        return self.payload_path / Path("Drivers/NvmExpressDxe.efi")
+
+    @property
+    def exfat_legacy_driver_path(self):
+        return self.payload_path / Path("Drivers/ExFatDxeLegacy.efi")
+
+    @property
+    def xhci_driver_path(self):
+        return self.payload_path / Path("Drivers/XhciDxe.efi")
 
     # Kexts
     @property
-    def payload_kexts_path(self): return self.payload_path / Path("Kexts")
+    def payload_kexts_path(self):
+        return self.payload_path / Path("Kexts")
+
     @property
-    def lilu_path(self): return self.payload_kexts_path / Path(f"Acidanthera/Lilu-v{self.lilu_version}.zip")
+    def lilu_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/Lilu-v{self.lilu_version}.zip")
+
     @property
-    def whatevergreen_path(self): return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}.zip")
+    def whatevergreen_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}.zip")
+
     @property
-    def airportbcrmfixup_path(self): return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}.zip")
+    def airportbcrmfixup_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}.zip")
+
     @property
-    def restrictevents_path(self): return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}.zip")
+    def restrictevents_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}.zip")
+
     @property
-    def restrictevents_mbp_path(self): return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-MBP91-v{self.restrictevents_mbp_version}.zip")
+    def restrictevents_mbp_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-MBP91-v{self.restrictevents_mbp_version}.zip")
+
     @property
-    def bcm570_path(self): return self.payload_kexts_path / Path(f"Ethernet/CatalinaBCM5701Ethernet-v{self.bcm570_version}.zip")
+    def bcm570_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/CatalinaBCM5701Ethernet-v{self.bcm570_version}.zip")
+
     @property
-    def marvel_path(self): return self.payload_kexts_path / Path(f"Ethernet/MarvelYukonEthernet-v{self.marvel_version}.zip")
+    def marvel_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/MarvelYukonEthernet-v{self.marvel_version}.zip")
+
     @property
-    def nforce_path(self): return self.payload_kexts_path / Path(f"Ethernet/nForceEthernet-v{self.nforce_version}.zip")
+    def nforce_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/nForceEthernet-v{self.nforce_version}.zip")
+
     @property
-    def mce_path(self): return self.payload_kexts_path / Path(f"Misc/AppleMCEReporterDisabler-v{self.mce_version}.zip")
+    def mce_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleMCEReporterDisabler-v{self.mce_version}.zip")
+
     @property
-    def mousse_path(self): return self.payload_kexts_path / Path(f"SSE/AAAMouSSE-v{self.mousse_version}.zip")
+    def mousse_path(self):
+        return self.payload_kexts_path / Path(f"SSE/AAAMouSSE-v{self.mousse_version}.zip")
+
     @property
-    def telemetrap_path(self): return self.payload_kexts_path / Path(f"SSE/telemetrap-v{self.telemetrap_version}.zip")
+    def telemetrap_path(self):
+        return self.payload_kexts_path / Path(f"SSE/telemetrap-v{self.telemetrap_version}.zip")
+
     @property
-    def io80211high_sierra_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211HighSierra-v{self.io80211high_sierra_version}.zip")
+    def corecaptureelcap_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/corecaptureElCap-v{self.corecaptureelcap_version}.zip")
+
     @property
-    def io80211mojave_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211Mojave-v{self.io80211mojave_version}.zip")
+    def io80211elcap_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211ElCap-v{self.io80211elcap_version}.zip")
+
     @property
-    def voodoohda_path(self): return self.payload_kexts_path / Path(f"Audio/VoodooHDA-v{self.voodoohda_version}.zip")
+    def io80211high_sierra_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211HighSierra-v{self.io80211high_sierra_version}.zip")
+
     @property
-    def piixata_path(self): return self.payload_kexts_path / Path(f"Misc/AppleIntelPIIXATA-v{self.piixata_version}.zip")
+    def io80211mojave_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211Mojave-v{self.io80211mojave_version}.zip")
+
     @property
-    def backlight_path(self): return self.payload_kexts_path / Path(f"Misc/AppleBacklightFixup-v{self.backlight_version}.zip")
+    def applealc_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/AppleALC-v{self.applealc_version}.zip")
+
     @property
-    def cpufriend_path(self): return self.payload_kexts_path / Path(f"Acidanthera/CPUFriend-v{self.cpufriend_version}.zip")
+    def piixata_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleIntelPIIXATA-v{self.piixata_version}.zip")
+
     @property
-    def nightshift_path(self): return self.payload_kexts_path / Path(f"Misc/NightShiftEnabler-v{self.nightshift_version}.zip")
+    def backlight_injector_path(self):
+        return self.payload_kexts_path / Path(f"Misc/BacklightInjector-v{self.backlight_injector_version}.zip")
+
     @property
-    def smcspoof_path(self): return self.payload_kexts_path / Path(f"Misc/SMC-Spoof-v{self.smcspoof_version}.zip")
+    def cpufriend_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/CPUFriend-v{self.cpufriend_version}.zip")
+
     @property
-    def cputscsync_path(self): return self.payload_kexts_path / Path(f"Acidanthera/CpuTscSync-v{self.cputscsync}.zip")
+    def smcspoof_path(self):
+        return self.payload_kexts_path / Path(f"Misc/SMC-Spoof-v{self.smcspoof_version}.zip")
+
     @property
-    def hibernationfixup_path(self): return self.payload_kexts_path / Path(f"Acidanthera/HibernationFixup-v{self.hibernationfixup}.zip")
+    def btspoof_path(self):
+        return self.payload_kexts_path / Path(f"Misc/Bluetooth-Spoof-v{self.btspoof_version}.zip")
+
+    @property
+    def nvmefix_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/NVMeFix-v{self.nvmefix_version}.zip")
+
+    @property
+    def featureunlock_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/FeatureUnlock-v{self.featureunlock_version}.zip")
+
+    @property
+    def debugenhancer_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/DebugEnhancer-v{self.debugenhancer_version}.zip")
+
+    @property
+    def bluetool_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/BlueToolFixup-v{self.bluetool_version}.zip")
+    
+    @property
+    def cslvfixup_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/CSLVFixup-v{self.cslvfixup_version}.zip")
+
+    @property
+    def innie_path(self):
+        return self.payload_kexts_path / Path(f"Misc/Innie-v{self.innie_version}.zip")
+
+    @property
+    def latebloom_path(self):
+        return self.payload_kexts_path / Path(f"Misc/latebloom-v{self.latebloom_version}.zip")
+
+    @property
+    def apple_trackpad_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleUSBTrackpad-v{self.apple_trackpad}.zip")
+
+    @property
+    def plist_folder_path(self):
+        return self.payload_kexts_path / Path("Plists")
+
+    @property
+    def platform_plugin_plist_path(self):
+        return self.plist_folder_path / Path("PlatformPlugin")
+
+    @property
+    def fw_family_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireFamily-v{self.fw_kext}.zip")
+
+    @property
+    def fw_sbp2_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireSBP2-v{self.fw_kext}.zip")
+
+    @property
+    def fw_bus_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireSerialBusProtocolTransport-v{self.fw_kext}.zip")
 
     # Build Location
     @property
-    def build_path(self): return self.current_path / Path("Build-Folder/")
-    @property
-    def opencore_release_folder(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}-v{self.opencore_version}")
-    @property
-    def opencore_zip_copied(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}-v{self.opencore_version}.zip")
+    def build_path(self):
+        return self.current_path / Path("Build-Folder/")
 
     @property
-    def oc_folder(self): return self.opencore_release_folder / Path("EFI/OC/")
+    def opencore_release_folder(self):
+        return self.build_path / Path(f"OpenCore-Build")
+
     @property
-    def plist_path(self): return self.oc_folder / Path("config.plist")
+    def opencore_zip_copied(self):
+        return self.build_path / Path(f"OpenCore-{self.opencore_build}.zip")
+
     @property
-    def acpi_path(self): return self.oc_folder / Path("ACPI")
+    def oc_folder(self):
+        return self.opencore_release_folder / Path("EFI/OC/")
+
     @property
-    def drivers_path(self): return self.oc_folder / Path("Drivers")
+    def plist_path(self):
+        return self.oc_folder / Path("config.plist")
+
     @property
-    def kexts_path(self): return self.oc_folder / Path("Kexts")
+    def acpi_path(self):
+        return self.oc_folder / Path("ACPI")
+
     @property
-    def resources_path(self): return self.oc_folder / Path("Resources")
+    def drivers_path(self):
+        return self.oc_folder / Path("Drivers")
+
     @property
-    def map_kext_folder(self): return self.kexts_path / Path("USB-Map.kext")
+    def kexts_path(self):
+        return self.oc_folder / Path("Kexts")
+
     @property
-    def map_contents_folder(self): return self.map_kext_folder / Path("Contents")
+    def resources_path(self):
+        return self.oc_folder / Path("Resources")
+
     @property
-    def pp_kext_folder(self): return self.kexts_path / Path("CPUFriendDataProvider.kext")
+    def map_kext_folder(self):
+        return self.kexts_path / Path("USB-Map.kext")
+
     @property
-    def pp_contents_folder(self): return self.pp_kext_folder / Path("Contents")
+    def map_contents_folder(self):
+        return self.map_kext_folder / Path("Contents")
+
     @property
-    def agdp_kext_folder(self): return self.kexts_path / Path("AGDP-Override.kext")
+    def pp_kext_folder(self):
+        return self.kexts_path / Path("CPUFriendDataProvider.kext")
+
     @property
-    def agdp_contents_folder(self): return self.agdp_kext_folder / Path("Contents")
+    def pp_contents_folder(self):
+        return self.pp_kext_folder / Path("Contents")
+
     @property
-    def agpm_kext_folder(self): return self.kexts_path / Path("AGPM-Override.kext")
+    def agdp_kext_folder(self):
+        return self.kexts_path / Path("AGDP-Override.kext")
+
     @property
-    def agpm_contents_folder(self): return self.agpm_kext_folder / Path("Contents")
+    def agdp_contents_folder(self):
+        return self.agdp_kext_folder / Path("Contents")
+
     @property
-    def amc_kext_folder(self): return self.kexts_path / Path("AMC-Override.kext")
+    def agpm_kext_folder(self):
+        return self.kexts_path / Path("AGPM-Override.kext")
+
     @property
-    def amc_contents_folder(self): return self.amc_kext_folder / Path("Contents")
+    def agpm_contents_folder(self):
+        return self.agpm_kext_folder / Path("Contents")
+
+    @property
+    def amc_kext_folder(self):
+        return self.kexts_path / Path("AMC-Override.kext")
+
+    @property
+    def amc_contents_folder(self):
+        return self.amc_kext_folder / Path("Contents")
 
     # Tools
     @property
-    def macserial_path(self): return self.payload_path / Path("Tools/macserial")
+    def macserial_path(self):
+        return self.payload_path / Path("Tools/macserial")
+
     @property
-    def vault_path(self): return self.payload_path / Path("Tools/CreateVault/sign.command")
+    def gfxutil_path(self):
+        return self.payload_path / Path("Tools/gfxutil")
+
+    @property
+    def vault_path(self):
+        return self.payload_path / Path("Tools/CreateVault/sign.command")
+
+    @property
+    def ocvalidate_path(self):
+        return self.payload_path / Path("Tools/ocvalidate")
 
     # Icons
     @property
-    def app_icon_path(self): return self.current_path / Path("OC-Patcher.icns")
-    @property
-    def icon_path_external(self): return self.payload_path / Path("Icon/External/.VolumeIcon.icns")
-    @property
-    def icon_path_internal(self): return self.payload_path / Path("Icon/Internal/.VolumeIcon.icns")
-    @property
-    def icon_path_sd(self): return self.payload_path / Path("Icon/SD-Card/.VolumeIcon.icns")
-    @property
-    def icon_path_ssd(self): return self.payload_path / Path("Icon/SSD/.VolumeIcon.icns")
-    @property
-    def gui_path(self): return self.payload_path / Path("Icon/Resources.zip")
+    def app_icon_path(self):
+        return self.current_path / Path("OC-Patcher.icns")
 
-    # Apple Paylods Paths
     @property
-    def payload_apple_root_path_unzip(self): return self.payload_path / Path("Apple-Binaries-OCLP-main")
+    def icon_path_external(self):
+        return self.payload_path / Path("Icon/External/.VolumeIcon.icns")
+
     @property
-    def payload_apple_root_path_zip(self): return self.payload_path / Path("Apple.zip")
+    def icon_path_internal(self):
+        return self.payload_path / Path("Icon/Internal/.VolumeIcon.icns")
+
     @property
-    def payload_apple_root_path(self): return self.payload_path / Path("Apple")
+    def icon_path_sd(self):
+        return self.payload_path / Path("Icon/SD-Card/.VolumeIcon.icns")
+
     @property
-    def payload_apple_kexts_path(self): return self.payload_apple_root_path / Path("Extensions")
+    def icon_path_ssd(self):
+        return self.payload_path / Path("Icon/SSD/.VolumeIcon.icns")
+
     @property
-    def payload_apple_frameworks_path(self): return self.payload_apple_root_path / Path("Frameworks")
+    def gui_path(self):
+        return self.payload_path / Path("Icon/Resources.zip")
+
+    # Apple Payloads Paths
+
     @property
-    def payload_apple_frameworks_path_accel(self): return self.payload_apple_frameworks_path / Path("Graphics-Acceleration")
+    def payload_apple_root_path_zip(self):
+        return self.payload_path / Path("Apple.zip")
+
     @property
-    def payload_apple_lauchd_path(self): return self.payload_apple_root_path / Path("LaunchDaemons")
+    def payload_apple_root_path(self):
+        return self.payload_path / Path("Apple")
+
     @property
-    def payload_apple_lauchd_path_accel(self): return self.payload_apple_lauchd_path / Path("Graphics-Acceleration")
+    def payload_apple_kexts_path(self):
+        return self.payload_apple_root_path / Path("Extensions")
+
     @property
-    def payload_apple_private_frameworks_path(self): return self.payload_apple_root_path / Path("PrivateFrameworks")
+    def payload_apple_coreservices_path(self):
+        return self.payload_apple_root_path / Path("CoreServices")
+
     @property
-    def payload_apple_private_frameworks_path_accel(self): return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration")
+    def payload_apple_usr_path(self):
+        return self.payload_apple_root_path / Path("usr")
+
     @property
-    def payload_apple_private_frameworks_path_brightness(self): return self.payload_apple_private_frameworks_path / Path("Brightness-Control")
+    def payload_apple_libexec_path(self):
+        return self.payload_apple_usr_path / Path("libexec")
+
+    @property
+    def payload_apple_frameworks_path(self):
+        return self.payload_apple_root_path / Path("Frameworks")
+
+    @property
+    def payload_apple_frameworks_path_accel(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration")
+
+    @property
+    def payload_apple_frameworks_path_accel_ts2(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration-TeraScale-2")
+
+    @property
+    def payload_apple_frameworks_path_accel_ivy(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration-Ivy-Bridge")
+
+    @property
+    def payload_apple_lauchd_path(self):
+        return self.payload_apple_root_path / Path("LaunchDaemons")
+
+    @property
+    def payload_apple_lauchd_path_accel(self):
+        return self.payload_apple_lauchd_path / Path("Graphics-Acceleration")
+
+    @property
+    def payload_apple_private_frameworks_path(self):
+        return self.payload_apple_root_path / Path("PrivateFrameworks")
+
+    @property
+    def payload_apple_private_frameworks_path_accel(self):
+        return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration")
+
+    @property
+    def payload_apple_private_frameworks_path_accel_ts2(self):
+        return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration-TeraScale-2")
+
+    @property
+    def payload_apple_private_frameworks_path_accel_ivy(self):
+        return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration-Ivy-Bridge")
+
+    @property
+    def payload_apple_private_frameworks_path_brightness(self):
+        return self.payload_apple_private_frameworks_path / Path("Brightness-Control")
 
     # Apple Extensions
     @property
-    def applehda_path(self): return self.payload_apple_kexts_path / Path("Audio/AppleHDA.kext")
-
+    def audio_path(self):
+        return self.payload_apple_kexts_path / Path("Audio")
 
     # GPU Kexts and Bundles
-    @property
-    def legacy_graphics(self): return self.payload_apple_kexts_path / Path("Graphics-Acceleration")
-    @property
-    def legacy_nvidia_path(self): return self.legacy_graphics / Path("Nvidia-Tesla-Fermi")
-    @property
-    def legacy_amd_path(self): return self.legacy_graphics / Path("AMD-ATI")
-    @property
-    def legacy_intel_gen1_path(self): return self.legacy_graphics / Path("Intel-Gen5-Ironlake")
-    @property
-    def legacy_intel_gen2_path(self): return self.legacy_graphics / Path("Intel-Gen6-SandyBridge")
 
     @property
-    def legacy_brightness(self): return self.payload_apple_kexts_path / Path("Brightness-Control")
+    def legacy_graphics(self):
+        return self.payload_apple_kexts_path / Path("Graphics-Acceleration")
 
-    # Apple Frameworks
     @property
-    def coredisplay_path(self): return self.payload_apple_frameworks_path_accel / Path("CoreDisplay.framework")
-    @property
-    def iosurface_f_path(self): return self.payload_apple_frameworks_path_accel / Path("IOSurface.framework")
-    @property
-    def opengl_path(self): return self.payload_apple_frameworks_path_accel / Path("OpenGL.framework")
+    def legacy_nvidia_path(self):
+        return self.legacy_graphics / Path("Nvidia-Tesla")
 
-    # Apple LaunchDaemons
     @property
-    def hiddhack_path(self): return self.payload_apple_lauchd_path_accel / Path("HiddHack.plist")
+    def legacy_nvidia_kepler_path(self):
+        return self.legacy_graphics / Path("Nvidia-Kepler")
 
-    # Apple PrivateFrameworks
     @property
-    def gpusupport_path(self): return self.payload_apple_private_frameworks_path_accel / Path("GPUSupport.framework")
+    def legacy_amd_path(self):
+        return self.legacy_graphics / Path("AMD-TeraScale")
+
     @property
-    def skylight_path(self): return self.payload_apple_private_frameworks_path_accel / Path("SkyLight.framework")
+    def legacy_amd_path_ts2(self):
+        return self.legacy_graphics / Path("AMD-TeraScale-2")
+
+    @property
+    def legacy_intel_gen1_path(self):
+        return self.legacy_graphics / Path("Intel-Gen5-Ironlake")
+
+    @property
+    def legacy_intel_gen2_path(self):
+        return self.legacy_graphics / Path("Intel-Gen6-SandyBridge")
+
+    @property
+    def legacy_intel_gen3_path(self):
+        return self.legacy_graphics / Path("Intel-Gen7-IvyBridge")
+
+    @property
+    def legacy_general_path(self):
+        return self.legacy_graphics / Path("General-Patches")
+
+    @property
+    def legacy_brightness(self):
+        return self.payload_apple_kexts_path / Path("Brightness-Control")
+
+    @property
+    def legacy_wifi_coreservices(self):
+        return self.payload_apple_coreservices_path / Path("Legacy-Wifi")
+
+    @property
+    def legacy_wifi_libexec(self):
+        return self.payload_apple_libexec_path / Path("Legacy-Wifi")
 
     csr_values = {
-        "CSR_ALLOW_UNTRUSTED_KEXTS           ": False, # 0x1   - Introduced in El Capitan
-        "CSR_ALLOW_UNRESTRICTED_FS           ": False, # 0x2   - Introduced in El Capitan
-        "CSR_ALLOW_TASK_FOR_PID              ": False, # 0x4   - Introduced in El Capitan
-        "CSR_ALLOW_KERNEL_DEBUGGER           ": False, # 0x8   - Introduced in El Capitan
-        "CSR_ALLOW_APPLE_INTERNAL            ": False, # 0x10  - Introduced in El Capitan
-        "CSR_ALLOW_UNRESTRICTED_DTRACE       ": False, # 0x20  - Introduced in El Capitan
-        "CSR_ALLOW_UNRESTRICTED_NVRAM        ": False, # 0x40  - Introduced in El Capitan
-        "CSR_ALLOW_DEVICE_CONFIGURATION      ": False, # 0x80  - Introduced in El Capitan
-        "CSR_ALLOW_ANY_RECOVERY_OS           ": False, # 0x100 - Introduced in Sierra
-        "CSR_ALLOW_UNAPPROVED_KEXTS          ": False, # 0x200 - Introduced in High Sierra
-        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE": False, # 0x400 - Introduced in Mojave
-        "CSR_ALLOW_UNAUTHENTICATED_ROOT      ": False, # 0x800 - Introduced in Big Sur
+        # Source: macOS 11.4 (XNU's csr.h)
+        # https://opensource.apple.com/source/xnu/xnu-7195.121.3/bsd/sys/csr.h.auto.html
+        "CSR_ALLOW_UNTRUSTED_KEXTS": False,  #            0x1   - Allows Unsigned Kexts           - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_UNRESTRICTED_FS": False,  #            0x2   - File System Access              - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_TASK_FOR_PID": False,  #               0x4   - Unrestricted task_for_pid()     - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_KERNEL_DEBUGGER": False,  #            0x8   - Allow Kernel Debugger           - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_APPLE_INTERNAL": False,  #             0x10  - Set AppleInternal Features      - Introduced in El Capitan  # noqa: E241
+        # "CSR_ALLOW_DESTRUCTIVE_DTRACE": False,  #       0x20  - Allow destructive DTrace        - Deprecated                # noqa: E241
+        "CSR_ALLOW_UNRESTRICTED_DTRACE": False,  #        0x20  - Unrestricted DTrace usage       - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_UNRESTRICTED_NVRAM": False,  #         0x40  - Unrestricted NVRAM write        - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_DEVICE_CONFIGURATION": False,  #       0x80  - Allow custom DeviceTree (iOS)   - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_ANY_RECOVERY_OS": False,  #            0x100 - Skip BaseSystem Verification    - Introduced in Sierra      # noqa: E241
+        "CSR_ALLOW_UNAPPROVED_KEXTS": False,  #           0x200 - Allow Unnotarized Kexts         - Introduced in High Sierra # noqa: E241
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE": False,  # 0x400 - Override Executable Policy      - Introduced in Mojave      # noqa: E241
+        "CSR_ALLOW_UNAUTHENTICATED_ROOT": False,  #       0x800 - Allow Root Volume Mounting      - Introduced in Big Sur     # noqa: E241
     }
 
+    root_patch_sip_mojave = [
+        # Variables required to root patch in Mojave and Catalina
+        "CSR_ALLOW_UNTRUSTED_KEXTS",
+        "CSR_ALLOW_UNRESTRICTED_FS",
+        "CSR_ALLOW_UNAPPROVED_KEXTS",
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE",
+    ]
+
+    root_patch_sip_big_sur = [
+        # Variables required to root patch in Big Sur and Monterey
+        "CSR_ALLOW_UNTRUSTED_KEXTS",
+        "CSR_ALLOW_UNRESTRICTED_FS",
+        "CSR_ALLOW_UNAPPROVED_KEXTS",
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE",
+        "CSR_ALLOW_UNAUTHENTICATED_ROOT",
+    ]
+
     sbm_values = [
-        "j137",
-        "j680",
-        "j132",
-        "j174",
-        "j140k",
-        "j780",
-        "j213",
-        "j140a",
-        "j152f",
-        "j160",
-        "j230k",
-        "j214k",
-        "j223",
-        "j215",
-        "j185",
-        "j185f",
-    ]
+        "j137ap",  #  iMacPro1,1
+        "j680ap",  #  MacBookPro15,1
+        "j132ap",  #  MacBookPro15,2
+        "j174ap",  #  Macmini8,1
+        "j140kap",  # MacBookAir8,1
+        "j780ap",  #  MacBookPro15,3
+        "j213ap",  #  MacBookPro15,4
+        "j140aap",  # MacBookAir8,2
+        "j152fap",  # MacBookPro16,1
+        "j160ap",  #  MacPro7,1
+        "j230kap",  # MacBookAir9,1
+        "j214kap",  # MacBookPro16,2
+        "j223ap",  #  MacBookPro16,3
+        "j215ap",  #  MacBookPro16,4
+        "j185ap",  #  iMac20,1
+        "j185fap",  # iMac20,2
+        # "x86legacy",  # non-T2 Macs/VMs, Monterey's boot.efi enforces this on all Macs
+    ]
+
+    sandy_board_id = [
+        "Mac-E43C1C25D4880AD6",  # MacBookPro12,1
+        "Mac-06F11F11946D27C5",  # MacBookPro11,5
+        "Mac-9F18E312C5C2BF0B",  # MacBookAir7,1
+        "Mac-937CB26E2E02BB01",  # MacBookAir7,2
+        "Mac-35C5E08120C7EEAF",  # Macmini7,1
+        "Mac-7BA5B2D9E42DDD94",  # iMacPro1,1
+    ]
+
+    board_id = {
+        "MacBook1,1": "Mac-F4208CC8",
+        "MacBook2,1": "Mac-F4208CA9",
+        "MacBook3,1": "Mac-F22788C8",
+        "MacBook4,1": "Mac-F22788A9",
+        "MacBook5,1": "Mac-F42D89C8",
+        "MacBook5,2": "Mac-F22788AA",
+        "MacBook6,1": "Mac-F22C8AC8",
+        "MacBook7,1": "Mac-F22C89C8",
+        "MacBook8,1": "Mac-BE0E8AC46FE800CC",
+        "MacBook9,1": "Mac-9AE82516C7C6B903",
+        "MacBook10,1": "Mac-EE2EBD4B90B839A8",
+        "MacBookAir1,1": "Mac-F42C8CC8",
+        "MacBookAir2,1": "Mac-F42D88C8",
+        "MacBookAir3,1": "Mac-942452F5819B1C1B",
+        "MacBookAir3,2": "Mac-942C5DF58193131B",
+        "MacBookAir4,1": "Mac-C08A6BB70A942AC2",
+        "MacBookAir4,2": "Mac-742912EFDBEE19B3",
+        "MacBookAir5,1": "Mac-66F35F19FE2A0D05",
+        "MacBookAir5,2": "Mac-2E6FAB96566FE58C",
+        "MacBookAir6,1": "Mac-35C1E88140C3E6CF",
+        "MacBookAir6,2": "Mac-7DF21CB3ED6977E5",
+        "MacBookAir7,1": "Mac-9F18E312C5C2BF0B",
+        "MacBookAir7,2": "Mac-937CB26E2E02BB01",
+        "MacBookAir8,1": "Mac-827FAC58A8FDFA22",
+        "MacBookAir8,2": "Mac-226CB3C6A851A671",
+        "MacBookAir9,1": "Mac-0CFF9C7C2B63DF8D",
+        "MacBookPro1,1": "Mac-F425BEC8",
+        "MacBookPro1,2": "Mac-F42DBEC8",
+        "MacBookPro2,1": "Mac-F42189C8",
+        "MacBookPro2,2": "Mac-F42187C8",
+        "MacBookPro3,1": "Mac-F4238BC8",
+        "MacBookPro4,1": "Mac-F42C89C8",
+        "MacBookPro5,1": "Mac-F42D86C8",
+        "MacBookPro5,2": "Mac-F2268EC8",
+        "MacBookPro5,3": "Mac-F22587C8",
+        "MacBookPro5,4": "Mac-F22587A1",
+        "MacBookPro5,5": "Mac-F2268AC8",
+        "MacBookPro6,1": "Mac-F22589C8",
+        "MacBookPro6,2": "Mac-F22586C8",
+        "MacBookPro7,1": "Mac-F222BEC8",
+        "MacBookPro8,1": "Mac-94245B3640C91C81",
+        "MacBookPro8,2": "Mac-94245A3940C91C80",
+        "MacBookPro8,3": "Mac-942459F5819B171B",
+        "MacBookPro9,1": "Mac-4B7AC7E43945597E",
+        "MacBookPro9,2": "Mac-6F01561E16C75D06",
+        "MacBookPro10,1": "Mac-C3EC7CD22292981F",
+        "MacBookPro10,2": "Mac-AFD8A9D944EA4843",
+        "MacBookPro11,1": "Mac-189A3D4F975D5FFC",
+        "MacBookPro11,2": "Mac-3CBD00234E554E41",
+        "MacBookPro11,3": "Mac-2BD1B31983FE1663",
+        "MacBookPro11,4": "Mac-06F11FD93F0323C5",
+        "MacBookPro11,5": "Mac-06F11F11946D27C5",
+        "MacBookPro12,1": "Mac-E43C1C25D4880AD6",
+        "MacBookPro13,1": "Mac-473D31EABEB93F9B",
+        "MacBookPro13,2": "Mac-66E35819EE2D0D05",
+        "MacBookPro13,3": "Mac-A5C67F76ED83108C",
+        "MacBookPro14,1": "Mac-B4831CEBD52A0C4C",
+        "MacBookPro14,2": "Mac-CAD6701F7CEA0921",
+        "MacBookPro14,3": "Mac-551B86E5744E2388",
+        "MacBookPro15,1": "Mac-937A206F2EE63C01",
+        "MacBookPro15,2": "Mac-827FB448E656EC26",
+        "MacBookPro15,3": "Mac-1E7E29AD0135F9BC",
+        "MacBookPro15,4": "Mac-53FDB3D8DB8CA971",
+        "MacBookPro16,1": "Mac-E1008331FDC96864",
+        "MacBookPro16,2": "Mac-5F9802EFE386AA28",
+        "MacBookPro16,3": "Mac-E7203C0F68AA0004",
+        "MacBookPro16,4": "Mac-A61BADE1FDAD7B05",
+        "Macmini1,1": "Mac-F4208EC8",
+        "Macmini2,1": "Mac-F4208EAA",
+        "Macmini3,1": "Mac-F22C86C8",
+        "Macmini4,1": "Mac-F2208EC8",
+        "Macmini5,1": "Mac-8ED6AF5B48C039E1",
+        "Macmini5,2": "Mac-4BC72D62AD45599E",
+        "Macmini5,3": "Mac-7BA5B2794B2CDB12",
+        "Macmini6,1": "Mac-031AEE4D24BFF0B1",
+        "Macmini6,2": "Mac-F65AE981FFA204ED",
+        "Macmini7,1": "Mac-35C5E08120C7EEAF",
+        "Macmini8,1": "Mac-7BA5B2DFE22DDD8C",
+        "iMac4,1": "Mac-F42786C8",
+        "iMac4,2": "Mac-F4218EC8",
+        "iMac5,1": "Mac-F4228EC8",
+        "iMac5,2": "Mac-F4218EC8",
+        "iMac6,1": "Mac-F4218FC8",
+        "iMac7,1": "Mac-F42386C8",
+        "iMac8,1": "Mac-F227BEC8",
+        "iMac9,1": "Mac-F2218FA9",
+        "iMac10,1": "Mac-F221DCC8",
+        # "iMac10,1": "Mac-F2268CC8",
+        "iMac11,1": "Mac-F2268DAE",
+        "iMac11,2": "Mac-F2238AC8",
+        "iMac11,3": "Mac-F2238BAE",
+        "iMac12,1": "Mac-942B5BF58194151B",
+        "iMac12,2": "Mac-942B59F58194171B",
+        "iMac13,1": "Mac-00BE6ED71E35EB86",
+        "iMac13,2": "Mac-FC02E91DDD3FA6A4",
+        "iMac13,3": "Mac-7DF2A3B5E5D671ED",
+        "iMac14,1": "Mac-031B6874CF7F642A",
+        "iMac14,2": "Mac-27ADBB7B4CEE8E61",
+        "iMac14,3": "Mac-77EB7D7DAF985301",
+        "iMac14,4": "Mac-81E3E92DD6088272",
+        "iMac15,1": "Mac-42FD25EABCABB274",
+        "iMac16,1": "Mac-A369DDC4E67F1C45",
+        "iMac16,2": "Mac-FFE5EF870D7BA81A",
+        "iMac17,1": "Mac-DB15BD556843C820",
+        # iMac17,1": "Mac-65CE76090165799A",
+        # iMac17,1": "Mac-B809C3757DA9BB8D",
+        "iMac18,1": "Mac-4B682C642B45593E",
+        "iMac18,2": "Mac-77F17D7DA9285301",
+        "iMac18,3": "Mac-BE088AF8C5EB4FA2",
+        "iMac19,1": "Mac-AA95B1DDAB278B95",
+        "iMac19,2": "Mac-63001698E7A34814",
+        "iMac20,1": "Mac-CFF7D910A743CAAF",
+        "iMac20,2": "Mac-AF89B6D9451A490B",
+        "iMacPro1,1": "Mac-7BA5B2D9E42DDD94",
+        "MacPro1,1": "Mac-F4208DC8",
+        "MacPro2,1": "Mac-F4208DA9",
+        "MacPro3,1": "Mac-F42C88C8",
+        "MacPro4,1": "Mac-F221BEC8",
+        "MacPro5,1": "Mac-F221BEC8",
+        "MacPro6,1": "Mac-F60DEB81FF30ACF6",
+        "MacPro7,1": "Mac-27AD2F918AE68F61",
+        "Xserve1,1": "Mac-F4208AC8",
+        "Xserve2,1": "Mac-F42289C8",
+        "Xserve3,1": "Mac-F223BEC8",
+    }
+
+    target_type = {
+        "ADP3,2": "J273",
+        "MacBookAir10,1": "J313",
+        "MacBookPro17,1": "J293",
+        "Macmini9,1": "J274",
+        "iMac21,1": "J256",
+        "iMac21,2": "J257",
+    }

Resources/ModelExample.py

@@ -0,0 +1,343 @@
+# Example Hardware probe of multiple models
+# To be used when running validation tests
+from Resources import device_probe
+
+class MacBook:
+
+    MacBook71 = device_probe.Computer(
+        real_model="MacBook7,1",
+        real_board_id="Mac-F22C89C8",
+        reported_model="MacBook7,1",
+        reported_board_id="Mac-F22C89C8",
+        gpus=[
+            device_probe.NVIDIA(vendor_id=4318, device_id=2208, class_code=196608, name="IGPU", model="NVIDIA GeForce 320M", pci_path="PciRoot(0x0)/Pci(0x2,0x0)"),
+        ],
+        igpu=device_probe.NVIDIA(vendor_id=4318, device_id=2208, class_code=196608, name="IGPU", model="NVIDIA GeForce 320M", pci_path="PciRoot(0x0)/Pci(0x2,0x0)"),
+        dgpu=None,
+        storage=[
+            device_probe.SATAController(vendor_id=4318, device_id=3464, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0xa,0x0)"),
+        ],
+        wifi=device_probe.Broadcom(vendor_id=5348, device_id=17235, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)"),
+        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"],
+        ),
+        oclp_version=None,
+        opencore_version=None,
+    )
+
+class MacBookPro:
+
+    MacBookPro92_Stock = device_probe.Computer(
+        real_model="MacBookPro9,2",
+        real_board_id="Mac-6F01561E16C75D06",
+        reported_model="MacBookPro9,2", 
+        reported_board_id="Mac-6F01561E16C75D06", 
+        gpus=[
+            device_probe.Intel(vendor_id=32902, device_id=358, class_code=196608, name="IGPU", model="Intel HD Graphics 4000", pci_path="PciRoot(0x0)/Pci(0x2,0x0)")
+        ], 
+        igpu=device_probe.Intel(vendor_id=32902, device_id=358, class_code=196608, name="IGPU", model="Intel HD Graphics 4000", pci_path="PciRoot(0x0)/Pci(0x2,0x0)"),
+        dgpu=None,
+        storage=[device_probe.SATAController(vendor_id=32902, device_id=7683, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")],
+        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']
+        ),
+        oclp_version=None,
+        opencore_version=None,
+    )
+
+    MacBookPro171_Stock = device_probe.Computer(
+        # Run under Rosetta
+        real_model="MacBookPro17,1",
+        real_board_id="J293",
+        reported_model="MacBookPro17,1",
+        reported_board_id="J293",
+        gpus=[device_probe.AMD(vendor_id=4098, device_id=26640, class_code=196608, name="display", model="Unknown Unknown", pci_path="")],
+        igpu=None,
+        dgpu=None,
+        storage=[],
+        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"],
+        ),
+        oclp_version=None,
+        opencore_version=None,
+    )
+
+class Macmini:
+
+    Macmini81_Stock = device_probe.Computer(
+        real_model="Macmini8,1",
+        real_board_id="Mac-7BA5B2DFE22DDD8C",
+        reported_model="Macmini8,1",
+        reported_board_id="Mac-7BA5B2DFE22DDD8C",
+        gpus=[device_probe.Intel(vendor_id=32902, device_id=16027, class_code=196608, name="IGPU", model="Intel UHD Graphics 630", pci_path="PciRoot(0x0)/Pci(0x2,0x0)")],
+        igpu=device_probe.Intel(vendor_id=32902, device_id=16027, class_code=196608, name="IGPU", model="Intel UHD Graphics 630", pci_path="PciRoot(0x0)/Pci(0x2,0x0)"),
+        dgpu=None,
+        storage=[],
+        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"]
+        ), 
+        oclp_version=None, 
+        opencore_version=None   
+    )
+
+    Macmini91_Stock = device_probe.Computer(
+        # Run under Rosetta
+        real_model="Macmini9,1",
+        real_board_id="J274",
+        reported_model="Macmini9,1",
+        reported_board_id="J274",
+        gpus=[
+            device_probe.AMD(vendor_id=4098, device_id=26640, class_code=196608, name="display", model="Unknown Unknown", pci_path="", )
+        ],
+        igpu=None,
+        dgpu=None,
+        storage=[],
+        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"]
+        ),
+        oclp_version=None,
+        opencore_version=None
+    )
+
+class iMac:
+
+    iMac81_Stock = device_probe.Computer(
+        # Stock Model
+        real_model="iMac8,1", 
+        real_board_id="Mac-F226BEC8", 
+        reported_model="iMac8,1", 
+        reported_board_id="Mac-F226BEC8", 
+        gpus=[
+            device_probe.AMD(vendor_id=4098, device_id=38088, class_code=196608, name="GFX0", model="ATI Radeon HD 2400", pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)")
+        ], 
+        igpu=None, 
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=38088, class_code=196608, name="GFX0", model="ATI Radeon HD 2400", pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"), 
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=10281, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")
+        ], 
+        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"]
+        ), 
+        oclp_version=None,
+        opencore_version=None,
+    )
+
+    iMac112_Stock = device_probe.Computer(
+        # Stock Model
+        real_model="iMac11,2", 
+        real_board_id="Mac-F2238AC8", 
+        reported_model="iMac11,2", 
+        reported_board_id="Mac-F2238AC8", 
+        gpus=[
+            device_probe.AMD(vendor_id=4098, device_id=38024, class_code=196608, name="GFX0", model="ATI Radeon HD 4670", pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)")
+        ], 
+        igpu=None, 
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=38024, class_code=196608, name="GFX0", model="ATI Radeon HD 4670", pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"), 
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=15138, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")
+        ], 
+        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"]
+        ), 
+        oclp_version=None, 
+        opencore_version=None,
+    )
+
+    iMac122_Upgraded = device_probe.Computer(
+        real_model="iMac12,2",
+        real_board_id="Mac-942B59F58194171B",
+        reported_model="iMac12,2",
+        reported_board_id="Mac-942B59F58194171B",
+        gpus=[
+            device_probe.Intel(vendor_id=32902, device_id=258, class_code=196608, name="HD Graphics 3000", model=None, pci_path="PciRoot(0x0)/Pci(0x2,0x0)"),
+            device_probe.AMD(vendor_id=4098, device_id=26600, class_code=196608, name="GFX0", model="Radeon Pro WX4130", pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"),
+        ],
+        igpu=device_probe.Intel(vendor_id=32902, device_id=258, class_code=196608, name="HD Graphics 3000", model=None, pci_path="PciRoot(0x0)/Pci(0x2,0x0)"),
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=26600, class_code=196608, name="GFX0", model="Radeon Pro WX4130", pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"),
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=7170, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")
+        ],
+        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"]
+        ),
+        oclp_version=None, 
+        opencore_version=None,
+    )
+
+class MacPro:
+
+    MacPro31_Stock = device_probe.Computer(
+        # Stock Model, stock TS1 GPU and no Wifi card
+        real_model="MacPro3,1",
+        real_board_id="Mac-F42C88C8",
+        reported_model="MacPro3,1",
+        reported_board_id="Mac-F42C88C8",
+        gpus=[
+            device_probe.AMD(vendor_id=4098, device_id=38272, class_code=196608, name="GFX0", model="ATI Radeon HD 2600", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)")
+        ],
+        igpu=None,
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=38272, class_code=196608, name="GFX0", model="ATI Radeon HD 2600", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)"),
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=9857, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")
+        ],
+        wifi=None,
+        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"],
+        ),
+        oclp_version=None,
+        opencore_version=None,
+    )
+
+    MacPro31_Upgrade = device_probe.Computer(
+        # Upgraded Model, TS2 GPU and El-Capitan era Wifi card
+        real_model="MacPro3,1",
+        real_board_id="Mac-F42C88C8",
+        reported_model="MacPro3,1",
+        reported_board_id="Mac-F42C88C8",
+        gpus=[
+            device_probe.AMD(vendor_id=4098, device_id=26808, class_code=196608, name="GFX0", model="ATI Radeon HD 5770", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)")
+        ],
+        igpu=None,
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=26808, class_code=196608, name="GFX0", model="ATI Radeon HD 5770", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)"),
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=9857, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")
+        ],
+        wifi=device_probe.Broadcom(
+            vendor_id=5348, device_id=17192, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x3)/Pci(0x0,0x0)"
+        ),
+        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"],
+        ),
+        oclp_version=None,
+        opencore_version=None,
+    )
+
+    MacPro31_Modern_AMD = device_probe.Computer(
+        # Upgraded Model, Polaris GPU and BCM94360CD
+        real_model="MacPro3,1",
+        real_board_id="Mac-F42C88C8",
+        reported_model="MacPro3,1",
+        reported_board_id="Mac-F42C88C8",
+        gpus=[
+            device_probe.AMD(vendor_id=4098, device_id=26591, class_code=196608, name="GFX0", model="Radeon RX 470/570", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)")
+        ],
+        igpu=None,
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=26591, class_code=196608, name="GFX0", model="Radeon RX 470/570", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)"),
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=9857, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")
+        ],
+        wifi=device_probe.Broadcom(
+            vendor_id=5348, device_id=17312, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x3)/Pci(0x0,0x0)"
+        ),
+        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"],
+        ),
+        oclp_version=None,
+        opencore_version=None,
+    )
+
+    MacPro31_Modern_Kepler = device_probe.Computer(
+        # Upgraded Model, Kepler GPU and BCM94360CD
+        real_model="MacPro3,1",
+        real_board_id="Mac-F42C88C8",
+        reported_model="MacPro3,1",
+        reported_board_id="Mac-F42C88C8",
+        gpus=[device_probe.NVIDIA(vendor_id=4318, device_id=4737, class_code=196608, name="GFX0", model="NVIDIA GeForce GT 710", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)")], 
+        igpu=None, 
+        dgpu=device_probe.NVIDIA(vendor_id=4318, device_id=4737, class_code=196608, name="GFX0", model="NVIDIA GeForce GT 710", pci_path="PciRoot(0x0)/Pci(0x5,0x0)/Pci(0x0,0x0)"),
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=9857, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")
+        ],
+        wifi=device_probe.Broadcom(
+            vendor_id=5348, device_id=17312, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1c,0x3)/Pci(0x0,0x0)"
+        ),
+        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"],
+        ),
+        oclp_version=None,
+        opencore_version=None,
+    )
+
+    MacPro41_Upgrade = device_probe.Computer(
+        # Upgraded model with AMD HD7950, Atheros PCIe card
+        real_model="MacPro4,1", 
+        real_board_id="Mac-F221BEC8", 
+        reported_model="MacPro4,1", 
+        reported_board_id="Mac-F221BEC8", 
+        gpus=[device_probe.AMD(vendor_id=4098, device_id=26522, class_code=196608, name="PXS1", model="AMD Radeon HD 7950", pci_path="PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)")], 
+        igpu=None, 
+        dgpu=None, 
+        storage=[device_probe.SATAController(vendor_id=32902, device_id=14882, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")], 
+        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"]
+        ), 
+        oclp_version=None, 
+        opencore_version=None
+    )
+
+    MacPro41_Modern_AMD = device_probe.Computer(
+        # Upgraded model with AMD RX470, BCM94360CD, Intel 660p
+        # Booted through OpenCore
+        real_model="MacPro4,1", 
+        real_board_id="Mac-F221BEC8", 
+        reported_model="MacPro4,1", 
+        reported_board_id="Mac-27AD2F918AE68F61", 
+        gpus=[device_probe.AMD(vendor_id=4098, device_id=26591, class_code=196608, name="GFX0", model="Radeon RX 470/570", pci_path="PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)")], 
+        igpu=None, 
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=26591, class_code=196608, name="GFX0", model="Radeon RX 470/570", pci_path="PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"), 
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=14882, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)"), 
+            device_probe.NVMeController(vendor_id=32902, device_id=61864, class_code=67586, name="PXS3", model=None, pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)", aspm=2)
+        ], 
+        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"]
+        ), 
+        oclp_version="0.2.5", 
+        opencore_version="REL-071-2021-07-02"
+    )
+
+    MacPro41_51__Flashed_Modern_AMD = device_probe.Computer(
+        # 4,1 flashed to 5,1, RX5700XT, BCM94360CD, WD SN750 NVMe
+        real_model="MacPro5,1", 
+        real_board_id="Mac-F221BEC8", 
+        reported_model="MacPro5,1", 
+        reported_board_id="Mac-F221BEC8", 
+        gpus=[device_probe.AMD(vendor_id=4098, device_id=29471, class_code=196608, name="GFX0", model="AMD Radeon RX 5700 XT", pci_path="PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)")], 
+        igpu=None, 
+        dgpu=device_probe.AMD(vendor_id=4098, device_id=29471, class_code=196608, name="GFX0", model="AMD Radeon RX 5700 XT", pci_path="PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)/Pci(0x0,0x0)"), 
+        storage=[
+            device_probe.SATAController(vendor_id=32902, device_id=14882, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)"), 
+            device_probe.NVMeController(vendor_id=5559, device_id=20482, class_code=67586, name="PXS3", model=None, pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)", aspm=2)
+        ], 
+
+        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"]
+        ),
+        oclp_version="0.2.5", 
+        opencore_version="REL-071-2021-07-02"
+    )

Resources/PCIIDArray.py

@@ -0,0 +1,972 @@
+# Array of Device IDs for different devices
+
+
+class nvidia_ids:
+    # 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/
+    tesla_ids = [
+        # G80
+        0x0190,  # G80 [GeForce 8800 GTS / 8800 GTX]
+        0x0191,  # G80 [GeForce 8800 GTX]
+        0x0193,  # G80 [GeForce 8800 GTS]
+        0x0194,  # G80 [GeForce 8800 Ultra]
+        0x019E,  # G80GL [Quadro FX 4600]
+        0x019D,  # G80GL [Quadro FX 5600]
+        # G84
+        0x0400,  # G84 [8600 GTS]
+        0x0401,  # G84 [8600 GT]
+        0x0402,  # G84 [8600 GT]
+        0x0403,  # G84 [8600 GS]
+        0x0404,  # G84 [8400 GS]
+        0x0405,  # G84 [9500M GS]
+        0x0406,  # G84 [8300 GS]
+        0x0407,  # G84 [8600M GT]
+        0x0408,  # G84 [9650M GS]
+        0x0409,  # G84 [8700M GT]
+        0x040A,  # G84 [FX 370]
+        0x040B,  # G84 [NVS 320M]
+        0x040C,  # G84 [FX 570M]
+        0x040D,  # G84 [FX 1600M]
+        0x040E,  # G84 [FX 570]
+        0x040F,  # G84 [FX 1700]
+        # G86
+        0x0420,  # G86 [8400 SE]
+        0x0421,  # G86 [8500 GT]
+        0x0422,  # G86 [8400 GS]
+        0x0423,  # G86 [8300 GS]
+        0x0424,  # G86 [8400 GS]
+        0x0425,  # G86 [8600M GS]
+        0x0426,  # G86 [8400M GT]
+        0x0427,  # G86 [8400M GS]
+        0x0428,  # G86 [8400M G]
+        0x0429,  # G86 [NVS 140M]
+        0x042A,  # G86 [NVS 130M]
+        0x042B,  # G86 [NVS 135M]
+        0x042C,  # G86 [9400 GT]
+        0x042D,  # G86 [FX 360M]
+        0x042E,  # G86 [9300M G]
+        0x042F,  # G86 [NVS 290]
+        # G92
+        0x0410,  # G92 [GT 330]
+        0x0600,  # G92 [8800 GTS 512]
+        0x0601,  # G92 [9800 GT]
+        0x0602,  # G92 [8800 GT]
+        0x0603,  # G92 [GT 230]
+        0x0604,  # G92 [9800 GX2]
+        0x0605,  # G92 [9800 GT]
+        0x0606,  # G92 [8800 GS]
+        0x0607,  # G92 [GTS 240]
+        0x0608,  # G92 [9800M GTX]
+        0x0609,  # G92 [8800M GTS]
+        0x060A,  # G92 [GTX 280M]
+        0x060B,  # G92 [9800M GT]
+        0x060C,  # G92 [8800M GTX]
+        0x060F,  # G92 [GTX 285M]
+        0x0610,  # G92 [9600 GSO]
+        0x0611,  # G92 [8800 GT]
+        0x0612,  # G92 [9800 GTX/9800 GTX+]
+        0x0613,  # G92 [9800 GTX+]
+        0x0614,  # G92 [9800 GT]
+        0x0615,  # G92 [GTS 250]
+        0x0617,  # G92 [9800M GTX]
+        0x0618,  # G92 [GTX 260M]
+        0x0619,  # G92 [FX 4700 X2]
+        0x061A,  # G92 [FX 3700]
+        0x061B,  # G92 [VX 200]
+        0x061C,  # G92 [FX 3600M]
+        0x061D,  # G92 [FX 2800M]
+        0x061E,  # G92 [FX 3700M]
+        0x061F,  # G92 [FX 3800M]
+        # G94
+        0x0621,  # G94 [GT 230]
+        0x0622,  # G94 [9600 GT]
+        0x0623,  # G94 [9600 GS]
+        0x0624,  # G94 [9600 GT Green Edition]
+        0x0625,  # G94 [9600 GSO 512]
+        0x0626,  # G94 [GT 130]
+        0x0627,  # G94 [GT 140]
+        0x0628,  # G94 [9800M GTS]
+        0x062A,  # G94 [9700M GTS]
+        0x062B,  # G94 [9800M GS]
+        0x062C,  # G94 [9800M GTS ]
+        0x062D,  # G94 [9600 GT]
+        0x062E,  # G94 [9600 GT]
+        0x062F,  # G94 [9800 S]
+        0x0631,  # G94 [GTS 160M]
+        0x0635,  # G94 [9600 GSO]
+        0x0637,  # G94 [9600 GT]
+        0x0638,  # G94 [FX 1800]
+        0x063A,  # G94 [FX 2700M]
+        # G96
+        0x0640,  # G96 [9500 GT]
+        0x0641,  # G96 [9400 GT]
+        0x0643,  # G96 [9500 GT]
+        0x0644,  # G96 [9500 GS]
+        0x0645,  # G96 [9500 GS]
+        0x0646,  # G96 [GT 120]
+        0x0647,  # G96 [9600M GT]
+        0x0648,  # G96 [9600M GS]
+        0x0649,  # G96 [9600M GT]
+        0x064A,  # G96 [9700M GT]
+        0x064B,  # G96 [9500M G]
+        0x064C,  # G96 [9650M GT]
+        0x0651,  # G96 [G 110M]
+        0x0652,  # G96 [GT 130M]
+        0x0653,  # G96 [GT 120M]
+        0x0654,  # G96 [GT 220M]
+        0x0655,  # G96 [GT 120]
+        0x0656,  # G96 [GT 120 ]
+        0x0658,  # G96 [FX 380]
+        0x0659,  # G96 [FX 580]
+        0x065A,  # G96 [FX 1700M]
+        0x065B,  # G96 [9400 GT]
+        0x065C,  # G96 [FX 770M]
+        0x065F,  # G96 [G210]
+        # G98
+        0x06E0,  # G98 [9300 GE]
+        0x06E1,  # G98 [9300 GS]
+        0x06E2,  # G98 [8400]
+        0x06E3,  # G98 [8400 SE]
+        0x06E4,  # G98 [8400 GS]
+        0x06E5,  # G98M [9300M GS]
+        0x06E6,  # G98 [G100]
+        0x06E7,  # G98 [9300 SE]
+        0x06E8,  # G98 [9200M GS]
+        0x06E9,  # G98 [9300M GS]
+        0x06EA,  # G98 [NVS 150M]
+        0x06EB,  # G98 [NVS 160M]
+        0x06EC,  # G98 [G 105M]
+        0x06ED,  # G98 [9600 GT / 9800 GT]
+        0x06EF,  # G98 [G 103M]
+        0x06F1,  # G98 [G105M]
+        0x06F8,  # G98 [NVS 420]
+        0x06F9,  # G98 [FX 370 LP]
+        0x06FA,  # G98 [NVS 450]
+        0x06FB,  # G98 [FX 370M]
+        0x06FD,  # G98 [NVS 295]
+        0x06FF,  # G98 [HICx16]
+        # GT200
+        0x05E0,  # GT200 [GTX 295]
+        0x05E1,  # GT200 [GTX 280]
+        0x05E2,  # GT200 [GTX 260]
+        0x05E3,  # GT200 [GTX 285]
+        0x05E6,  # GT200 [GTX 275]
+        0x05E7,  # GT200 [C1060]
+        0x05E9,  # GT200 [CX]
+        0x05EA,  # GT200 [GTX 260]
+        0x05EB,  # GT200 [GTX 295]
+        0x05ED,  # GT200 [FX 5800]
+        0x05EE,  # GT200 [FX 4800]
+        0x05EF,  # GT200 [FX 3800]
+        0x05FD,  # GT200GL [Quadro FX 5800]
+        0x05FE,  # GT200GL [Quadro FX 4800]
+        0x05FF,  # GT200GL [Quadro FX 3800]
+        # MCP77 GPU
+        0x0840,  # MCP77 GPU [8200M]
+        0x0844,  # MCP77 GPU [9100M G]
+        0x0845,  # MCP77 GPU [8200M G]
+        0x0846,  # MCP77 GPU [9200]
+        0x0847,  # MCP77 GPU [9100]
+        0x0848,  # MCP77 GPU [8300]
+        0x0849,  # MCP77 GPU [8200]
+        0x084A,  # MCP77 GPU [730A]
+        0x084B,  # MCP77 GPU [9200]
+        0x084C,  # MCP77 GPU [980A/780A SLI]
+        0x084D,  # MCP77 GPU [750A SLI]
+        0x084F,  # MCP77 GPU [8100 / 720A]
+        # MCP79 GPU
+        0x0860,  # MCP79 GPU [9400]
+        0x0861,  # MCP79 GPU [9400]
+        0x0862,  # MCP79 GPU [9400M G]
+        0x0863,  # MCP79 GPU [9400M]
+        0x0864,  # MCP79 GPU [9300]
+        0x0865,  # MCP79 GPU [ION]
+        0x0866,  # MCP79 GPU [9400M G]
+        0x0867,  # MCP79 GPU [9400]
+        0x0868,  # MCP79 GPU [760i SLI]
+        0x0869,  # MCP79 GPU [9400]
+        0x086A,  # MCP79 GPU [9400]
+        0x086C,  # MCP79 GPU [9300 / 730i]
+        0x086D,  # MCP79 GPU [9200]
+        0x086E,  # MCP79 GPU [9100M G]
+        0x086F,  # MCP79 GPU [8200M G]
+        0x0870,  # MCP79 GPU [9400M]
+        0x0871,  # MCP79 GPU [9200]
+        0x0872,  # MCP79 GPU [G102M]
+        0x0873,  # MCP79 GPU [G102M]
+        0x0874,  # MCP79 GPU [ION]
+        0x0876,  # MCP79 GPU [ION]
+        0x087A,  # MCP79 GPU [9400]
+        0x087D,  # MCP79 GPU [ION]
+        0x087E,  # MCP79 GPU [ION LE]
+        0x087F,  # MCP79 GPU [ION LE]
+        # GT215
+        0x0CA0,  # GT215 [GT 330]
+        0x0CA2,  # GT215 [GT 320]
+        0x0CA3,  # GT215 [GT 240]
+        0x0CA4,  # GT215 [GT 340]
+        0x0CA5,  # GT215 [GT 220]
+        0x0CA7,  # GT215 [GT 330]
+        0x0CA9,  # GT215 [GTS 250M]
+        0x0CAC,  # GT215 [GT 220]
+        0x0CAF,  # GT215 [GT 335M]
+        0x0CB0,  # GT215 [GTS 350M]
+        0x0CB1,  # GT215 [GTS 360M]
+        0x0CBC,  # GT215 [FX 1800M]
+        # GT216
+        0x0A20,  # GT216 [GT 220]
+        0x0A22,  # GT216 [315]
+        0x0A23,  # GT216 [210]
+        0x0A26,  # GT216 [405]
+        0x0A27,  # GT216 [405]
+        0x0A28,  # GT216 [GT 230M]
+        0x0A29,  # GT216 [GT 330M]
+        0x0A2A,  # GT216 [GT 230M]
+        0x0A2B,  # GT216 [GT 330M]
+        0x0A2C,  # GT216 [NVS 5100M]
+        0x0A2D,  # GT216 [GT 320M]
+        0x0A32,  # GT216 [GT 415]
+        0x0A34,  # GT216 [GT 240M]
+        0x0A35,  # GT216 [GT 325M]
+        0x0A38,  # GT216 [400]
+        0x0A3C,  # GT216 [FX 880M]
+        # GT218
+        0x0A60,  # GT218 [G210]
+        0x0A62,  # GT218 [205]
+        0x0A63,  # GT218 [310]
+        0x0A64,  # GT218 [ION]
+        0x0A65,  # GT218 [210]
+        0x0A66,  # GT218 [310]
+        0x0A67,  # GT218 [315]
+        0x0A68,  # GT218 [G105M]
+        0x0A69,  # GT218 [G105M]
+        0x0A6A,  # GT218 [NVS 2100M]
+        0x0A6C,  # GT218 [NVS 3100M]
+        0x0A6E,  # GT218 [305M]
+        0x0A6F,  # GT218 [ION]
+        0x0A70,  # GT218 [310M]
+        0x0A71,  # GT218 [305M]
+        0x0A72,  # GT218 [310M]
+        0x0A73,  # GT218 [305M]
+        0x0A74,  # GT218 [G210M]
+        0x0A75,  # GT218 [310M]
+        0x0A76,  # GT218 [ION]
+        0x0A78,  # GT218 [FX 380 LP]
+        0x0A7A,  # GT218 [315M]
+        0x0A7C,  # GT218 [FX 380M]
+        0x10C0,  # GT218 [9300 GS]
+        0x10C3,  # GT218 [8400GS]
+        0x10C5,  # GT218 [405]
+        0x10D8,  # GT218 [NVS 300]
+        # MCP89 GPU
+        0x08A0,  # MCP89 GPU [320M]
+        0x08A2,  # MCP89 GPU [320M]
+        0x08A3,  # MCP89 GPU [320M]
+        0x08A4,  # MCP89 GPU [320M]
+    ]
+
+    fermi_ids = [
+        # GF100
+        0x06C0,  # GF100 [GTX 480]
+        0x06C4,  # GF100 [GTX 465]
+        0x06CA,  # GF100 [GTX 480M]
+        0x06CB,  # GF100 [GTX 480]
+        0x06CD,  # GF100 [GTX 470]
+        0x06D1,  # GF100 [C2050 / C2070]
+        0x06D2,  # GF100 [M2070]
+        0x06D8,  # GF100 [6000]
+        0x06D9,  # GF100 [5000]
+        0x06DA,  # GF100 [5000M]
+        0x06DC,  # GF100 [6000]
+        0x06DD,  # GF100 [4000]
+        0x06DE,  # GF100 [T20]
+        0x06DF,  # GF100 [M2070-Q]
+        # GF104
+        0x0E22,  # GF104 [GTX 460]
+        0x0E23,  # GF104 [GTX 460 SE]
+        0x0E24,  # GF104 [GTX 460 OEM]
+        0x0E30,  # GF104 [GTX 470M]
+        0x0E31,  # GF104 [GTX 485M]
+        0x0E3A,  # GF104 [3000M]
+        0x0E3B,  # GF104 [4000M]
+        # GF114
+        0x1200,  # GF114 [GTX 560 Ti]
+        0x1201,  # GF114 [GTX 560]
+        0x1202,  # GF114 [GTX 560 Ti OEM]
+        0x1203,  # GF114 [GTX 460 SE v2]
+        0x1205,  # GF114 [GTX 460 v2]
+        0x1206,  # GF114 [GTX 555]
+        0x1207,  # GF114 [GT 645 OEM]
+        0x1208,  # GF114 [GTX 560 SE]
+        0x1210,  # GF114 [GTX 570M]
+        0x1211,  # GF114 [GTX 580M]
+        0x1212,  # GF114 [GTX 675M]
+        0x1213,  # GF114 [GTX 670M]
+        # GF106
+        0x0DC0,  # GF106 [GT 440]
+        0x0DC4,  # GF106 [GTS 450]
+        0x0DC5,  # GF106 [GTS 450]
+        0x0DC6,  # GF106 [GTS 450]
+        0x0DCD,  # GF106 [GT 555M]
+        0x0DCE,  # GF106 [GT 555M]
+        0x0DD1,  # GF106 [GTX 460M]
+        0x0DD2,  # GF106 [GT 445M]
+        0x0DD3,  # GF106 [GT 435M]
+        0x0DD6,  # GF106 [GT 550M]
+        0x0DD8,  # GF106 [2000]
+        0x0DDA,  # GF106 [2000M]
+        # GF116
+        0x1241,  # GF116 [GT 545 OEM]
+        0x1243,  # GF116 [GT 545]
+        0x1244,  # GF116 [GTX 550 Ti]
+        0x1245,  # GF116 [GTS 450 Rev. 2]
+        0x1246,  # GF116 [GT 550M]
+        0x1247,  # GF116 [GT 635M]
+        0x1248,  # GF116 [GT 555M]
+        0x1249,  # GF116 [GTS 450 Rev. 3]
+        0x124B,  # GF116 [GT 640 OEM]
+        0x124D,  # GF116 [GT 555M]
+        0x1251,  # GF116 [GTX 560M]
+        # GF108
+        0x0DE0,  # GF108 [GT 440]
+        0x0DE1,  # GF108 [GT 430]
+        0x0DE2,  # GF108 [GT 420]
+        0x0DE3,  # GF108 [GT 635M]
+        0x0DE4,  # GF108 [GT 520]
+        0x0DE5,  # GF108 [GT 530]
+        0x0DE8,  # GF108 [GT 620M]
+        0x0DE9,  # GF108 [GT 630M]
+        0x0DEA,  # GF108 [610M]
+        0x0DEB,  # GF108 [GT 555M]
+        0x0DEC,  # GF108 [GT 525M]
+        0x0DED,  # GF108 [GT 520M]
+        0x0DEE,  # GF108 [GT 415M]
+        0x0DEF,  # GF108 [NVS 5400M]
+        0x0DF0,  # GF108 [GT 425M]
+        0x0DF1,  # GF108 [GT 420M]
+        0x0DF2,  # GF108 [GT 435M]
+        0x0DF3,  # GF108 [GT 420M]
+        0x0DF4,  # GF108 [GT 540M]
+        0x0DF5,  # GF108 [GT 525M]
+        0x0DF6,  # GF108 [GT 550M]
+        0x0DF7,  # GF108 [GT 520M]
+        0x0DF8,  # GF108 [600]
+        0x0DF9,  # GF108 [500M]
+        0x0DFA,  # GF108 [1000M]
+        0x0DFC,  # GF108 [NVS 5200M]
+        0x0F00,  # GF108 [GT 630]
+        0x0F01,  # GF108 [GT 620]
+        0x0F02,  # GF108 [GT 730]
+        # GF110
+        0x1080,  # GF110 [GTX 580]
+        0x1081,  # GF110 [GTX 570]
+        0x1082,  # GF110 [GTX 560 Ti]
+        0x1084,  # GF110 [GTX 560]
+        0x1086,  # GF110 [GTX 570]
+        0x1087,  # GF110 [GTX 560 Ti]
+        0x1088,  # GF110 [GTX 590]
+        0x1089,  # GF110 [GTX 580]
+        0x108B,  # GF110 [GTX 580]
+        0x1091,  # GF110 [M2090]
+        0x1096,  # GF110GL [Tesla C2050 / C2075]
+        0x109A,  # GF110 [5010M]
+        0x109B,  # GF110 [7000]
+        # GF119
+        0x1040,  # GF119 [GT 520]
+        0x1042,  # GF119 [510]
+        0x1048,  # GF119 [605]
+        0x1049,  # GF119 [GT 620]
+        0x104A,  # GF119 [GT 610]
+        0x104B,  # GF119 [GT 625 OEM]
+        0x104C,  # GF119 [GT 705]
+        0x1050,  # GF119 [GT 520M]
+        0x1051,  # GF119 [GT 520MX]
+        0x1052,  # GF119 [GT 520M]
+        0x1054,  # GF119 [410M]
+        0x1055,  # GF119 [410M]
+        0x1056,  # GF119 [NVS 4200M]
+        0x1057,  # GF119 [NVS 4200M]
+        0x1058,  # GF119 [610M]
+        0x1059,  # GF119 [610M]
+        0x105A,  # GF119 [610M]
+        0x105B,  # GF119M [705M]
+        0x107C,  # GF119 [NVS 315]
+        0x107D,  # GF119 [NVS 310]
+        # GF117
+        0x1140,  # GF117 [GT 620M]
+    ]
+
+    kepler_ids = [
+        # GK104
+        0x1180,  # GK104 [GTX 680]
+        0x1183,  # GK104 [GTX 660 Ti]
+        0x1184,  # GK104 [GTX 770]
+        0x1185,  # GK104 [GTX 660]
+        0x1186,  # GK104 [GTX 660 Ti]
+        0x1187,  # GK104 [GTX 760]
+        0x1188,  # GK104 [GTX 690]
+        0x1189,  # GK104 [GTX 670]
+        0x118E,  # GK104 [GTX 760 OEM]
+        0x118F,  # GK104GL [Tesla K10]
+        0x1198,  # GTX 880M
+        0x1199,  # GK104 [GTX 870M]
+        0x119A,  # GTX 860M
+        0x119D,  # GK104M [GTX 775M Mac Edition]
+        0x119E,  # GTX 780M
+        0x119F,  # GK104 [GTX 780M]
+        0x11A0,  # GK104 [GTX 680M]
+        0x11A1,  # GK104 [GTX 670MX]
+        0x11A2,  # GK104 [GTX 675MX]
+        0x11A3,  # GK104 [GTX 680MX]
+        0x11A7,  # GK104 [GTX 675MX]
+        0x11A9,  # GTX 870M
+        0x11B4,  # GK104GL [Quadro K4200]
+        0x11B6,  # Quadro K3100M
+        0x11B7,  # Quadro K4100M
+        0x11B8,  # Quadro K5100M
+        0x11BA,  # GK104 [K5000]
+        0x11BC,  # GK104 [K5000M]
+        0x11BD,  # GK104 [K4000M]
+        0x11BE,  # GK104 [K3000M]
+        0x11BF,  # GK104 [GRID K2]
+        # GK106
+        0x11C0,  # GK106 [GTX 660]
+        0x11C2,  # GK106 [GTX 650 Ti BOOST]
+        0x11C6,  # GK106 [GTX 650 Ti]
+        0x11E0,  # GK106 [GTX 770M]
+        0x11E1,  # GTX 765M
+        0x11E2,  # GTX 765M
+        0x11FA,  # GK106 [K4000]
+        0x11FC,  # Quadro K2100M
+        # GK107
+        0x0FC0,  # GK107 [GT 640]
+        0x0FC1,  # GK107 [GT 640]
+        0x0FC2,  # GK107 [GT 630]
+        0x0FC6,  # GK107 [GTX 650]
+        0x0FC8,  # GK107 [GT 740]
+        0x0FCD,  # GK107M [GT 755M]
+        0x0FD1,  # GK107 [GT 650M]
+        0x0FD2,  # GK107 [GT 640M]
+        0x0FD3,  # GK107 [GT 640M LE]
+        0x0FD4,  # GK107 [GTX 660M]
+        0x0FD5,  # GK107 [GT 650M]
+        0x0FD8,  # GK107 [GT 640M]
+        0x0FD9,  # GK107 [GT 645M]
+        0x0FDF,  # GK107M [ GT 740M]
+        0x0FE0,  # GK107 [GTX 660M]
+        0x0FE1,  # GK107M [GT 730M]
+        0x0FE3,  # GK107M [GT 745M]
+        0x0FE4,  # GK107M [GT 750M]
+        0x0FE9,  # GK107 [GT 750M Mac Edition]
+        0x0FEA,  # GK107M [GT 755M Mac Edition]
+        0x0FEE,  # GK107M [810M]
+        0x0FF2,  # GK107GL [GRID K1]
+        0x0FF3,  # GK107GL [Quadro K420]
+        0x0FF6,  # Quadro K1100M
+        0x0FF9,  # GK107 [K2000D]
+        0x0FFA,  # GK107 [K600]
+        0x0FFB,  # GK107 [K2000M]
+        0x0FFC,  # GK107 [K1000M]
+        0x0FFD,  # GK107 [NVS 510]
+        0x0FFE,  # GK107 [K2000]
+        0x0FFF,  # GK107 [410]
+        # GK110
+        0x1001,  # GK110B [GTX TITAN Z]
+        0x1003,  # GK110 [GTX Titan LE]
+        0x1004,  # GK110 [GTX 780]
+        0x1005,  # GK110 [GTX Titan]
+        0x1007,  # GK110 [GTX 780 Rev. 2]
+        0x100A,  # GK110B [GTX 780 Ti]
+        0x100C,  # GK110B [GTX TITAN Black]
+        0x101F,  # GK110 [TEslA K20]
+        0x1020,  # GK110 [TEslA K2]
+        0x1021,  # GK110 [TEslA K2m]
+        0x1022,  # GK110 [TEslA K20C]
+        0x1023,  # GK110BGL [Tesla K40m]
+        0x1024,  # GK180GL [Tesla K40c]
+        0x1026,  # GK110 [TEslA K20s]
+        0x1028,  # GK110 [TEslA K20m]
+        0x102D,  # GK210GL [Tesla K80]
+        0x103C,  # GK110GL [Quadro K5200]
+        # GK208
+        0x1280,  # GK208 [GT 635]
+        0x1281,  # GK208 [GT 710]
+        0x1282,  # GK208 [GT 640 REv. 2]
+        0x1284,  # GK208 [GT 630 REv. 2]
+        0x1286,  # GK208 [GT 720]
+        0x1287,  # GK208B [GT 730]
+        0x1288,  # GK208B [GT 720]
+        0x1289,  # GK208 [GT 710]
+        0x128B,  # GK208B [GT 710]
+        0x1290,  # GK208 [GT 730M]
+        0x1291,  # GK208 [GT 735M]
+        0x1292,  # GK208 [GT 740M]
+        0x1293,  # GK208 [GT 730M]
+        0x1294,  # GK208 [GT 740M]
+        0x1295,  # GK208 [710M]
+        0x1296,  # GK208M [825M]
+        0x1298,  # GK208M [GT 720M]
+        0x1299,  # GK208BM [920M]
+        0x129A,  # GK208BM [910M]
+        0x12B9,  # GK208 [K610M]
+        0x12BA,  # GK208 [K510M]
+    ]
+
+
+class amd_ids:
+    legacy_gcn_ids = [
+        # AMDRadeonX4000
+        # AMDBonaireGraphicsAccelerator
+        0x6640,
+        0x6641,
+        0x6646,
+        0x6647,
+        0x6650,
+        0x6651,
+        0x665C,
+        0x665D,
+        # AMDFijiGraphicsAccelerator
+        0x7300,
+        0x730F,
+        # AMDHawaiiGraphicsAccelerator
+        0x67B0,
+        # AMDPitcairnGraphicsAccelerator
+        0x6800,
+        0x6801,
+        0x6806,
+        0x6808,
+        0x6810,
+        0x6818,
+        0x6819,
+        # AMDTahitiGraphicsAccelerator
+        0x6790,
+        0x6798,
+        0x679A,
+        0x679E,
+        0x6780,
+        # AMDTongaGraphicsAccelerator
+        0x6920,
+        0x6921,
+        0x6930,
+        0x6938,
+        0x6939,
+        # AMDVerdeGraphicsAccelerator
+        0x6820,
+        0x6821,
+        0x6823,
+        0x6825,
+        0x6827,
+        0x682B,
+        0x682D,
+        0x682F,
+        0x6835,
+        0x6839,
+        0x683B,
+        0x683D,
+        0x683F,
+    ]
+
+    polaris_ids = [
+        # AMDRadeonX4000
+        # AMDBaffinGraphicsAccelerator
+        0x67E0,
+        0x67E3,
+        0x67E8,
+        0x67EB,
+        0x67EF,
+        0x67FF,
+        0x67E1,
+        0x67E7,
+        0x67E9,
+        # AMDEllesmereGraphicsAccelerator
+        0x67C0,
+        0x67C1,
+        0x67C2,
+        0x67C4,
+        0x67C7,
+        0x67DF,
+        0x67D0,
+        0x67C8,
+        0x67C9,
+        0x67CA,
+        0x67CC,
+        0x67CF,
+    ]
+
+    vega_ids = [
+        # AMDRadeonX5000
+        # AMDVega10GraphicsAccelerator
+        0x6860,
+        0x6861,
+        0x6862,
+        0x6863,
+        0x6864,
+        0x6867,
+        0x6868,
+        0x6869,
+        0x686A,
+        0x686B,
+        0x686C,
+        0x686D,
+        0x686E,
+        0x686F,
+        0x687F,
+        # AMDVega12GraphicsAccelerator
+        0x69A0,
+        0x69A1,
+        0x69A2,
+        0x69A3,
+        0x69AF,
+        # AMDVega20GraphicsAccelerator
+        0x66A0,
+        0x66A1,
+        0x66A2,
+        0x66A3,
+        0x66A7,
+        0x66AF,
+    ]
+
+    navi_ids = [
+        # AMDRadeonX6000
+        # AMDNavi10GraphicsAccelerator
+        0x7310,
+        0x7312,
+        0x7318,
+        0x7319,
+        0x731A,
+        0x731B,
+        0x731F,
+        # AMDNavi12GraphicsAccelerator
+        0x7360,
+        # AMDNavi14GraphicsAccelerator
+        0x7340,
+        0x7341,
+        0x7343,
+        0x7347,
+        0x734F,
+        # AMDNavi21GraphicsAccelerator
+        0x73A2,
+        0x73AB,
+        0x73BF,
+    ]
+    terascale_1_ids = [
+        0x9400,
+        0x9401,
+        0x9402,
+        0x9403,
+        0x9581,
+        0x9583,
+        0x9588,
+        0x94C8,
+        0x94C9,
+        0x9500,
+        0x9501,
+        0x9505,
+        0x9507,
+        0x9504,
+        0x9506,
+        0x9598,
+        0x9488,
+        0x9599,
+        0x9591,
+        0x9593,
+        0x9440,
+        0x9442,
+        0x944A,
+        0x945A,
+        0x9490,
+        0x949E,
+        0x9480,
+        0x9540,
+        0x9541,
+        0x954E,
+        0x954F,
+        0x9552,
+        0x9553,
+        0x94A0,
+    ]
+
+    terascale_2_ids = [
+        0x6738,
+        0x6739,
+        0x6720,
+        0x6722,
+        0x6768,
+        0x6770,
+        0x6779,
+        0x6760,
+        0x6761,
+        0x68E0,
+        0x6898,
+        0x6899,
+        0x68B8,
+        0x68B0,
+        0x68B1,
+        0x68A0,
+        0x68A1,
+        0x6840,
+        0x6841,
+        0x68D8,
+        0x68C0,
+        0x68C1,
+        0x68D9,
+        0x6750,
+        0x6758,
+        0x6759,
+        0x6740,
+        0x6741,
+        0x6745,
+    ]
+
+
+class intel_ids:
+    iron_ids = [
+        # AppleIntelHDGraphics IDs
+        0x0044,
+        0x0046,
+    ]
+
+    sandy_ids = [
+        # AppleIntelHD3000Graphics IDs
+        # AppleIntelSNBGraphicsFB IDs
+        0x0106,
+        0x0601,
+        0x0116,
+        0x0102,
+        0x0126,
+    ]
+
+    ivy_ids = [
+        # AppleIntelHD4000Graphics IDs
+        # AppleIntelFramebufferCapri IDs
+        0x0152,
+        0x0156,
+        0x0162,
+        0x0166,
+    ]
+
+    haswell_ids = [
+        # AppleIntelHD5000Graphics IDs
+        # AppleIntelFramebufferAzul IDs
+        0x0D26,
+        0x0A26,
+        0x0A2E,
+        0x0D22,
+        0x0412,
+    ]
+
+    broadwell_ids = [
+        # AppleIntelBDWGraphicsFramebuffer IDs
+        0x0BD1,
+        0x0BD2,
+        0x0BD3,
+        0x1606,
+        0x160E,
+        0x1616,
+        0x161E,
+        0x1626,
+        0x1622,
+        0x1612,
+        0x162B,
+    ]
+
+    skylake_ids = [
+        # AppleIntelSKLGraphicsFramebuffer IDs
+        0x1916,
+        0x191E,
+        0x1926,
+        0x1927,
+        0x1912,
+        0x1932,
+        0x1902,
+        0x1917,
+        0x193B,
+        0x191B,
+    ]
+
+    kaby_lake_ids = [
+        # AppleIntelKBLGraphicsFramebuffer IDs
+        0x5912,
+        0x5916,
+        0x591B,
+        0x591C,
+        0x591E,
+        0x5926,
+        0x5927,
+        0x5923,
+    ]
+
+    coffee_lake_ids = [
+        # AppleIntelCFLGraphicsFramebuffer IDs
+        0x3E9B,
+        0x3EA5,
+        0x3EA6,
+        0x3E92,
+        0x3E91,
+        0x3E98,
+    ]
+
+    ice_lake_ids = [
+        # AppleIntelICLLPGraphicsFramebuffer IDs
+        0xFF05,
+        0x8A70,
+        0x8A71,
+        0x8A51,
+        0x8A5C,
+        0x8A5D,
+        0x8A52,
+        0x8A53,
+        0x8A5A,
+        0x8A5B,
+    ]
+
+    AppleIntel8254XEthernet = [
+        # AppleIntel8254XEthernet IDs
+        0x1096,
+        0x100F,
+        0x105E,
+    ]
+
+    AppleIntelI210Ethernet = [
+        # AppleIntelI210Ethernet IDs
+        0x1533,  # I210
+        0x15F2,  # I225
+        0x15F3,  # I225
+        0x3100,  # I225
+        0x3101,  # I225
+        0x5502,  # I225
+        0x0D9F,  # I225
+        0x15F8,  # I225
+        0x15F7,  # I225
+        0x15FD,  # I225
+    ]
+
+    Intel82574L = [
+        # Intel82574L IDs
+        0x104B,
+        0x10F6,
+    ]
+
+
+class broadcom_ids:
+    AirPortBrcmNIC = [
+        # AirPortBrcmNIC IDs
+        0x43BA,  # BCM43602
+        0x43A3,  # BCM4350
+        0x43A0,  # BCM4360
+    ]
+
+    AirPortBrcm4360 = [
+        # AirPortBrcm4360 IDs (removed duplicates for 4360 class cards)
+        0x4331,  # BCM94331
+        0x4353,  # BCM943224
+    ]
+
+    AirPortBrcm4331 = [
+        # AirPortBrcm4331 IDs (removed duplicates for 4331 class cards)
+        0x432B,  # BCM94322
+    ]
+
+    AppleAirPortBrcm43224 = [
+        # AppleAirPortBrcm43224 IDs
+        0x4311,  # BCM4311 - never used by Apple
+        0x4312,  # BCM4311 - never used by Apple
+        0x4313,  # BCM4311 - never used by Apple
+        0x4318,  # BCM4318 - never used by Apple
+        0x4319,  # BCM4318 - never used by Apple
+        0x431A,  # Unknown - never used by Apple
+        0x4320,  # BCM4306 - never used by Apple
+        0x4324,  # BCM4309 - never used by Apple
+        0x4325,  # BCM4306 - never used by Apple
+        0x4328,  # BCM4328
+        0x432C,  # BCM4322 - never used by Apple
+        0x432D,  # BCM4322 - never used by Apple
+    ]
+
+    AppleBCM5701Ethernet = [
+        # AppleBCM5701Ethernet IDs
+        0x1684,
+        0x16B0,
+        0x16B4,
+        0x1682,
+        0x1686,
+    ]
+
+
+class aquantia_ids:
+    AppleEthernetAquantiaAqtion = [
+        # AppleEthernetAquantiaAqtion IDs
+        0x0001,  # AQC107
+        0xD107,  # AQC107
+        0x07B1,  # AQC107
+        0x80B1,  # AQC107
+        0x87B1,  # AQC107
+        0x88B1,  # AQC107
+        0x89B1,  # AQC107
+        0x91B1,  # AQC107
+        0x92B1,  # AQC107
+        0x00C0,  # AQC113
+        0x04C0,  # AQC113
+    ]
+
+
+class marvell_ids:
+    MarvelYukonEthernet = [
+        # AppleYukon2.kext IDs
+        # AppleYukon2 supports 2 vendors (Marvell and SysKonnect)
+        0x9E00,
+        0x2100,
+        0x9E00,
+        0x2200,
+        0x9E00,
+        0x8100,
+        0x9E00,
+        0x8200,
+        0x9E00,
+        0x9100,
+        0x9E00,
+        0x9200,
+        0x9000,
+        0x2100,
+        0x9000,
+        0x2200,
+        0x9000,
+        0x8100,
+        0x9000,
+        0x8200,
+        0x9000,
+        0x9100,
+        0x9000,
+        0x9200,
+        0x9E00,
+        0x2200,
+        0x9E00,
+        0x2200,
+    ]
+
+
+class syskonnect_ids:
+    MarvelYukonEthernet = [
+        # AppleYukon2.kext IDs
+        # AppleYukon2 supports 2 vendors (Marvell and SysKonnect)
+        0x4365,
+        0x4360,
+        0x435A,
+        0x4354,
+        0x4362,
+        0x4363,
+        0x00BA,
+        0x436A,
+    ]
+
+
+class atheros_ids:
+    AtherosWifi = [
+        # AirPortAtheros40 IDs
+        0x0030,  # AR93xx
+        0x002A,  # AR928X
+        0x001C,  # AR242x / AR542x
+        0x0023,  # AR5416 - never used by Apple
+        0x0024,  # AR5418
+    ]

Resources/SMBIOSData.py

@@ -0,0 +1,110 @@
+FirmwareFeatures = {
+    "iMac7,1": "0xC0001407",
+    "iMac8,1": "0xC0001403",
+    "iMac9,1": "0xC0001403",
+    "iMac10,1": "0xE00DE137",
+    "iMac11,1": "0xE00DE137",
+    "iMac11,2": "0xC00C9423",
+    "iMac11,3": "0xE00DE137",
+    "iMac12,1": "0xE00DE137",
+    "iMac12,2": "0xE00DE137",
+    "iMac13,1": "0xE00DE137",
+    "iMac13,2": "0xE00DE137",
+    "iMac13,3": "0xE00DE137",
+    "iMac14,1": "0xFB0FF577",
+    "iMac14,2": "0xE00FE137",
+    "iMac14,3": "0xE00FE137",
+    "iMac14,4": "0xF00FE137",
+    "iMac15,1": "0xF80FE137",
+    "iMac16,1": "0xFC0FE137",
+    "iMac16,2": "0xFC0FE137",
+    "iMac17,1": "0xFC0FE137",
+    "iMac18,1": "0xFD0FF576",
+    "iMac18,2": "0xFD0FF576",
+    "iMac18,3": "0xFD0FF576",
+    "iMac19,1": "0xFD8FF576",
+    "iMac19,2": "0xFD8FF576",
+    "iMac20,1": "0xFD8FF576",
+    "iMac20,2": "0xFD8FF576",
+    "iMacPro1,1": "0xFD8FF53E",
+    "MacBook3,1": "0xC0001407",
+    "MacBook4,1": "0xC0001403",
+    "MacBook5,1": "0xC0001403",
+    "MacBook5,2": "0xC0001403",
+    "MacBook6,1": "0xFC0FE13F",
+    "MacBook7,1": "0xFC0FE13F",
+    "MacBook8,1": "0xFC0FE13F",
+    "MacBook9,1": "0xFC0FE13F",
+    "MacBook10,1": "0xFC0FE13F",
+    "MacBookAir1,1": "0xC0001403",
+    "MacBookAir2,1": "0xC0001403",
+    "MacBookAir3,1": "0xD00DE137",
+    "MacBookAir3,2": "0xD00DE137",
+    "MacBookAir4,1": "0xD00DE137",
+    "MacBookAir4,2": "0xD00DE137",
+    "MacBookAir5,1": "0xE00DE137",
+    "MacBookAir5,2": "0xE00DE137",
+    "MacBookAir6,1": "0xE00FE137",
+    "MacBookAir6,2": "0xE00FE137",
+    "MacBookAir7,1": "0xFF0FF576",
+    "MacBookAir7,2": "0xFF0FF576",
+    "MacBookAir8,1": "0xFD8FF42E",
+    "MacBookAir8,2": "0xFD8FF42E",
+    "MacBookAir9,1": "0xFFAFF06E",
+    "MacBookPro3,1": "0xC0001407",
+    "MacBookPro4,1": "0xC0001403",
+    "MacBookPro5,1": "0xC0001403",
+    "MacBookPro5,2": "0xC0001403",
+    "MacBookPro5,3": "0xC0001403",
+    "MacBookPro5,4": "0xC0001403",
+    "MacBookPro5,5": "0xC0001403",
+    "MacBookPro6,1": "0xC00DE137",
+    "MacBookPro6,2": "0xC00DE137",
+    "MacBookPro7,1": "0xC00DE137",
+    "MacBookPro8,1": "0xC00DE137",
+    "MacBookPro8,2": "0xC00DE137",
+    "MacBookPro8,3": "0xC00DE137",
+    "MacBookPro9,1": "0xC00DE137",
+    "MacBookPro9,2": "0xC10DF577",
+    "MacBookPro10,1": "0xE00DE137",
+    "MacBookPro10,2": "0xE00DE137",
+    "MacBookPro11,1": "0xEB0FF577",
+    "MacBookPro11,2": "0xEB0FF577",
+    "MacBookPro11,3": "0xEB0FF577",
+    "MacBookPro11,4": "0xEB0FF577",
+    "MacBookPro11,5": "0xEB0FF577",
+    "MacBookPro12,1": "0xFD0FF576",
+    "MacBookPro13,1": "0xFC0FE137",
+    "MacBookPro13,2": "0xFC0FE137",
+    "MacBookPro13,3": "0xFC0FE137",
+    "MacBookPro14,1": "0xFF0FF57E",
+    "MacBookPro14,2": "0xFF0FF57E",
+    "MacBookPro14,3": "0xFF0FF57E",
+    "MacBookPro15,1": "0xFD8FF426",
+    "MacBookPro15,2": "0xFD8FF426",
+    "MacBookPro15,3": "0xFD8FF426",
+    "MacBookPro15,4": "0xFD8FF426",
+    "MacBookPro16,1": "0xFDAFF066",
+    "MacBookPro16,2": "0xFFAFF06E",
+    "MacBookPro16,3": "0xFDAFF066",
+    "MacBookPro16,4": "0xFDAFF066",
+    "Macmini3,1": "0xC0001403",
+    "Macmini4,1": "0xC00C9423",
+    "Macmini5,1": "0xD00DE137",
+    "Macmini5,2": "0xD00DE137",
+    "Macmini5,3": "0xD00DE137",
+    "Macmini6,1": "0xE00DE137",
+    "Macmini6,2": "0xE00DE137",
+    "Macmini7,1": "0xE00DE137",
+    "Macmini8,1": "0xFD8FF466",
+    "MacPro1,1": "0x80000015",
+    "MacPro2,1": "0xC0000015",
+    "MacPro3,1": "0xC0001403",
+    "MacPro4,1": "0xE001F537",
+    "MacPro5,1": "0xE80FE137",
+    "MacPro6,1": "0xE90FF576",
+    "MacPro7,1": "0xFDAFF066",
+    "Xserve2,1": "0xC0001403",
+    "Xserve3,1": "0xE001F537",
+    "Dortania1,1": "0xFDAFF066",
+}

Resources/SysPatchArray.py

@@ -0,0 +1,261 @@
+# Lists Root patches used by SysPatch.py
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
+DeleteNvidiaAccel11 = [
+    "AMDRadeonX4000.kext",
+    "AMDRadeonX4000HWServices.kext",
+    "AMDRadeonX5000.kext",
+    "AMDRadeonX5000HWServices.kext",
+    "AMDRadeonX6000.kext",
+    "AMDRadeonX6000Framebuffer.kext",
+    "AMDRadeonX6000HWServices.kext",
+    "AppleIntelBDWGraphics.kext",
+    "AppleIntelBDWGraphicsFramebuffer.kext",
+    "AppleIntelCFLGraphicsFramebuffer.kext",
+    "AppleIntelHD4000Graphics.kext",
+    "AppleIntelHD5000Graphics.kext",
+    "AppleIntelICLGraphics.kext",
+    "AppleIntelICLLPGraphicsFramebuffer.kext",
+    "AppleIntelKBLGraphics.kext",
+    "AppleIntelKBLGraphicsFramebuffer.kext",
+    "AppleIntelSKLGraphics.kext",
+    "AppleIntelSKLGraphicsFramebuffer.kext",
+    "AppleIntelFramebufferAzul.kext",
+    "AppleIntelFramebufferCapri.kext",
+    "AppleParavirtGPU.kext",
+    "GeForce.kext",
+    "IOAcceleratorFamily2.kext",
+    "IOGPUFamily.kext",
+]
+
+DeleteAMDAccel11 = [
+    "AMDRadeonX4000.kext",
+    "AMDRadeonX4000HWServices.kext",
+    "AMDRadeonX5000.kext",
+    "AMDRadeonX5000HWServices.kext",
+    "AMDRadeonX6000.kext",
+    "AMDRadeonX6000Framebuffer.kext",
+    "AMDRadeonX6000HWServices.kext",
+    "AMD7000Controller.kext",  # AMDSupport Dependency
+    "AMD8000Controller.kext",  # AMDSupport Dependency
+    "AMD9000Controller.kext",  # AMDSupport Dependency
+    "AMD9500Controller.kext",  # AMDSupport Dependency
+    "AMD10000Controller.kext",  # AMDSupport Dependency
+    "AppleIntelBDWGraphics.kext",
+    "AppleIntelBDWGraphicsFramebuffer.kext",
+    "AppleIntelCFLGraphicsFramebuffer.kext",
+    "AppleIntelHD4000Graphics.kext",
+    "AppleIntelHD5000Graphics.kext",
+    "AppleIntelICLGraphics.kext",
+    "AppleIntelICLLPGraphicsFramebuffer.kext",
+    "AppleIntelKBLGraphics.kext",
+    "AppleIntelKBLGraphicsFramebuffer.kext",
+    "AppleIntelSKLGraphics.kext",
+    "AppleIntelSKLGraphicsFramebuffer.kext",
+    "AppleIntelFramebufferAzul.kext",
+    "AppleIntelFramebufferCapri.kext",
+    "AppleParavirtGPU.kext",
+    "GeForce.kext",
+    "IOGPUFamily.kext",
+]
+
+DeleteAMDAccel11TS2 = [
+    "AppleCameraInterface.kext",
+]
+
+AddNvidiaAccel11 = [
+    "GeForceGA.bundle",
+    "GeForceTesla.kext",
+    "GeForceTeslaGLDriver.bundle",
+    "GeForceTeslaVADriver.bundle",
+    "NVDANV50HalTesla.kext",
+    "NVDAResmanTesla.kext",
+    "IOSurface.kext",
+]
+
+AddNvidiaBrightness = [
+    "GeForceGA.bundle",
+    "GeForceTesla.kext",
+    "GeForceTeslaGLDriver.bundle",
+    "GeForceTeslaVADriver.bundle",
+    "NVDANV50HalTesla.kext",
+    "NVDAResmanTesla.kext",
+]
+
+AddNvidiaKeplerAccel11 = [
+    "GeForce.kext",
+    "GeForceAIRPlugin.bundle",
+    "GeForceGLDriver.bundle",
+    "GeForceMTLDriver.bundle",
+    "GeForceVADriver.bundle",
+    "NVDAGF100Hal.kext",
+    "NVDAGK100Hal.kext",
+    "NVDAResman.kext",
+    "NVDAStartup.kext",
+]
+
+AddAMDAccel11 = [
+    "AMD2400Controller.kext",
+    "AMD2600Controller.kext",
+    "AMD3800Controller.kext",
+    "AMD4600Controller.kext",
+    "AMD4800Controller.kext",
+    "AMD5000Controller.kext",
+    "AMD6000Controller.kext",
+    "AMDFramebuffer.kext",
+    "AMDLegacyFramebuffer.kext",
+    "AMDLegacySupport.kext",
+    "AMDRadeonVADriver.bundle",
+    "AMDRadeonVADriver2.bundle",
+    "AMDRadeonX3000.kext",
+    "AMDRadeonX3000GLDriver.bundle",
+    "AMDShared.bundle",
+    "AMDSupport.kext",
+    "ATIRadeonX2000.kext",
+    "ATIRadeonX2000GA.plugin",
+    "ATIRadeonX2000GLDriver.bundle",
+    "ATIRadeonX2000VADriver.bundle",
+]
+
+AddAMDBrightness = [
+    "AMD2400Controller.kext",
+    "AMD2600Controller.kext",
+    "AMD3800Controller.kext",
+    "AMD4600Controller.kext",
+    "AMD4800Controller.kext",
+    "AMD5000Controller.kext",
+    "AMD6000Controller.kext",
+    "AMDLegacyFramebuffer.kext",
+    "AMDLegacySupport.kext",
+    "AMDRadeonVADriver.bundle",
+    "AMDRadeonVADriver2.bundle",
+    # "AMDRadeonX3000.kext",
+    # "AMDRadeonX3000GLDriver.bundle",
+    "AMDShared.bundle",
+    "ATIRadeonX2000.kext",
+    "ATIRadeonX2000GA.plugin",
+    "ATIRadeonX2000GLDriver.bundle",
+    "ATIRadeonX2000VADriver.bundle",
+]
+
+AddAMDAccel11TS2 = [
+    "IOSurface.kext",
+    "IOAcceleratorFamily2.kext",
+]
+
+AddIntelGen1Accel = [
+    "AppleIntelHDGraphics.kext",
+    "AppleIntelHDGraphicsFB.kext",
+    "AppleIntelHDGraphicsGA.plugin",
+    "AppleIntelHDGraphicsGLDriver.bundle",
+    "AppleIntelHDGraphicsVADriver.bundle",
+]
+
+AddIntelGen2Accel = [
+    "AppleIntelHD3000Graphics.kext",
+    "AppleIntelHD3000GraphicsGA.plugin",
+    "AppleIntelHD3000GraphicsGLDriver.bundle",
+    "AppleIntelHD3000GraphicsVADriver.bundle",
+    "AppleIntelSNBGraphicsFB.kext",
+    "AppleIntelSNBVA.bundle",
+]
+
+AddIntelGen3Accel = [
+    "AppleIntelFramebufferCapri.kext",
+    "AppleIntelHD4000Graphics.kext",
+    "AppleIntelHD4000GraphicsGLDriver.bundle",
+    "AppleIntelHD4000GraphicsMTLDriver.bundle",
+    "AppleIntelHD4000GraphicsVADriver.bundle",
+    "AppleIntelIVBVA.bundle",
+    "AppleIntelGraphicsShared.bundle",
+]
+
+AddGeneralAccel = ["IOAcceleratorFamily2.kext", "IOSurface.kext"]
+
+DeleteBrightness = ["AppleGraphicsControl.kext/Contents/PlugIns/AGDCBacklightControl.kext"]
+
+AddBrightness = [
+    "AppleBacklight.kext",
+    "AppleBacklightExpert.kext",
+]
+
+AddVolumeControl = [
+    "AppleHDA.kext",
+    "IOAudioFamily.kext",
+]
+
+DeleteVolumeControl = [
+    "AppleVirtIO.kext",
+    "AppleVirtualGraphics.kext",
+    "AppleVirtualPlatform.kext",
+    "ApplePVPanic.kext",
+    "AppleVirtIOStorage.kext",
+]
+
+AddNvidiaAccelLegacy = [
+    # "GeForceGA.bundle",
+    "GeForceTesla.kext",
+    "GeForceTeslaGLDriver.bundle",
+    "GeForceTeslaVADriver.bundle",
+    "NVDANV50HalTesla.kext",
+    "NVDAResmanTesla.kext",
+]
+
+AddAMDAccelLegacy = [
+    "AMD2400Controller.kext",
+    "AMD2600Controller.kext",
+    "AMD3800Controller.kext",
+    "AMD4600Controller.kext",
+    "AMD4800Controller.kext",
+    "AMD5000Controller.kext",
+    "AMD6000Controller.kext",
+    "AMDFramebuffer.kext",
+    "AMDLegacyFramebuffer.kext",
+    "AMDLegacySupport.kext",
+    "AMDRadeonVADriver.bundle",
+    "AMDRadeonVADriver2.bundle",
+    "AMDRadeonX3000.kext",
+    "AMDRadeonX3000GLDriver.bundle",
+    "AMDRadeonX4000HWServices.kext",
+    "AMDRadeonX4000.kext",
+    "AMDRadeonX4000GLDriver.bundle",
+    "AMDShared.bundle",
+    "AMDSupport.kext",
+    "ATIRadeonX2000.kext",
+    "ATIRadeonX2000GA.plugin",
+    "ATIRadeonX2000GLDriver.bundle",
+    "ATIRadeonX2000VADriver.bundle",
+]
+
+AddGeneralAccelCatalina = [
+    "AppleGraphicsControl.kext",
+    "AppleGraphicsPowerManagement.kext",
+    "AppleMCCSControl.kext",
+    "IOGraphicsFamily.kext",
+    "IONDRVSupport.kext",
+    "IOSurface.kext",
+]
+
+AddGeneralAccelMojave = [
+    "IONDRVSupport.kext",
+    "AppleGraphicsControl.kext",
+    "AppleGraphicsPowerManagement.kext",
+    "AppleMCCSControl.kext",
+    "IOAccelerator2D.plugin",
+    "IOAcceleratorFamily2.kext",
+    "IOGraphicsFamily.kext",
+]
+
+BackupLocations = [
+    "System/Library/Extensions",
+    "System/Library/Frameworks/CoreDisplay.framework",
+    "System/Library/Frameworks/IOSurface.framework",
+    "System/Library/Frameworks/OpenGL.framework",
+    "System/Library/Frameworks/WebKit.framework",
+    "System/Library/LaunchDaemons",
+    "System/Library/PrivateFrameworks/DisplayServices.framework",
+    "System/Library/PrivateFrameworks/GPUSupport.framework",
+    "System/Library/PrivateFrameworks/SkyLight.framework",
+    "System/Library/PrivateFrameworks/IOAccelerator.framework",
+    "System/Library/PrivateFrameworks/AppleGVA.framework",
+    "System/Library/PrivateFrameworks/AppleGVACore.framework",
+]

Resources/Utilities.py

@@ -0,0 +1,431 @@
+# Copyright (C) 2020-2021, Dhinak G
+from __future__ import print_function
+
+import hashlib
+import math
+import os
+import plistlib
+import subprocess
+from pathlib import Path
+import re
+import os
+import binascii
+
+try:
+    import requests
+except ImportError:
+    subprocess.run(["pip3", "install", "requests"], stdout=subprocess.PIPE)
+    try:
+        import requests
+    except ImportError:
+        raise Exception("Missing requests library!\nPlease run the following before starting OCLP:\npip3 install requests")
+
+from Resources import Constants, ioreg, device_probe
+
+
+def hexswap(input_hex: str):
+    hex_pairs = [input_hex[i : i + 2] for i in range(0, len(input_hex), 2)]
+    hex_rev = hex_pairs[::-1]
+    hex_str = "".join(["".join(x) for x in hex_rev])
+    return hex_str.upper()
+
+
+def string_to_hex(input_string):
+    if not (len(input_string) % 2) == 0:
+        input_string = "0" + input_string
+    input_string = hexswap(input_string)
+    input_string = binascii.unhexlify(input_string)
+    return input_string
+
+
+def process_status(process_result):
+    if process_result.returncode != 0:
+        print(f"Process failed with exit code {process_result.returncode}")
+        print(f"Please file an issue on our Github")
+        raise Exception(f"Process result: \n{process_result.stdout.decode()}")
+
+
+def human_fmt(num):
+    for unit in ["B", "KB", "MB", "GB", "TB", "PB"]:
+        if abs(num) < 1000.0:
+            return "%3.1f %s" % (num, unit)
+        num /= 1000.0
+    return "%.1f %s" % (num, "EB")
+
+
+def header(lines):
+    lines = [i for i in lines if i is not None]
+    total_length = len(max(lines, key=len)) + 4
+    print("#" * (total_length))
+    for line in lines:
+        left_side = math.floor(((total_length - 2 - len(line.strip())) / 2))
+        print("#" + " " * left_side + line.strip() + " " * (total_length - len("#" + " " * left_side + line.strip()) - 1) + "#")
+    print("#" * total_length)
+
+
+RECOVERY_STATUS = None
+
+
+def check_recovery():
+    global RECOVERY_STATUS  # pylint: disable=global-statement # We need to cache the result
+
+    if RECOVERY_STATUS is None:
+        RECOVERY_STATUS = Path("/System/Library/BaseSystem").exists()
+
+    return RECOVERY_STATUS
+
+
+def get_disk_path():
+    root_partition_info = plistlib.loads(subprocess.run("diskutil info -plist /".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+    root_mount_path = root_partition_info["DeviceIdentifier"]
+    root_mount_path = root_mount_path[:-2] if root_mount_path.count("s") > 1 else root_mount_path
+    return root_mount_path
+
+
+def check_seal():
+    # 'Snapshot Sealed' property is only listed on booted snapshots
+    sealed = subprocess.run(["diskutil", "apfs", "list"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    if "Snapshot Sealed:           Yes" in sealed.stdout.decode():
+        return True
+    else:
+        return False
+
+
+def latebloom_detection(model):
+    if model in ["MacPro4,1", "MacPro5,1", "iMac7,1", "iMac8,1"]:
+        # These machines are more likely to experience boot hangs, increase delays to accomodate
+        lb_delay = "250"
+    else:
+        lb_delay = "100"
+    lb_range = "1"
+    lb_debug = "1"
+    boot_args = get_nvram("boot-args", decode=False)
+    # boot_args = "latebloom=200 lb_range=40 lb_debug=0 keepsyms=1 debug=0x100 -lilubetaall"
+    if boot_args:
+        # TODO: This crashes if latebloom=xxx is the very first entry in boot-args
+        if "latebloom=" in boot_args:
+            lb_delay = re.search(r"(?:[, ])latebloom=(\d+)", boot_args)
+            lb_delay = lb_delay[1]
+        if "lb_range=" in boot_args:
+            lb_range = re.search(r"(?:[, ])lb_range=(\d+)", boot_args)
+            lb_range = lb_range[1]
+        if "lb_debug=" in boot_args:
+            lb_debug = re.search(r"(?:[, ])lb_debug=(\d+)", boot_args)
+            lb_debug = lb_debug[1]
+    return int(lb_delay), int(lb_range), int(lb_debug)
+
+
+def csr_decode(csr_active_config, os_sip):
+    if csr_active_config is None:
+        csr_active_config = b"\x00\x00\x00\x00"
+    sip_int = int.from_bytes(csr_active_config, byteorder="little")
+    i = 0
+    for current_sip_bit in Constants.Constants.csr_values:
+        if sip_int & (1 << i):
+            Constants.Constants.csr_values[current_sip_bit] = True
+        i = i + 1
+
+    # Can be adjusted to whatever OS needs patching
+    sip_needs_change = all(Constants.Constants.csr_values[i] for i in os_sip)
+    if sip_needs_change is True:
+        return False
+    else:
+        return True
+
+
+def friendly_hex(integer: int):
+    return "{:02X}".format(integer)
+
+
+def amfi_status():
+    amfi_1 = "amfi_get_out_of_my_way=0x1"
+    amfi_2 = "amfi_get_out_of_my_way=1"
+
+    if get_nvram("OCLP-Settings", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=False):
+        if "-allow_amfi" in get_nvram("OCLP-Settings", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True):
+            return False
+        else:
+            return True
+    elif get_nvram("boot-args", decode=False):
+        if amfi_1 in get_nvram("boot-args", decode=False) or amfi_2 in get_nvram("boot-args", decode=False):
+            return False
+    else:
+        return True
+
+
+def check_oclp_boot():
+    if get_nvram("OCLP-Version", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True):
+        return True
+    else:
+        return False
+
+
+def check_monterey_wifi():
+    IO80211ElCap = "com.apple.iokit.IO80211ElCap"
+    CoreCaptureElCap = "com.apple.driver.corecaptureElCap"
+    loaded_kexts: str = subprocess.run("kextcache".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
+    if IO80211ElCap in loaded_kexts and CoreCaptureElCap in loaded_kexts:
+        return True
+    else:
+        return False
+
+
+def check_metal_support(device_probe, computer):
+    dgpu = computer.dgpu
+    igpu = computer.igpu
+    if (
+        (dgpu and dgpu.arch in [device_probe.NVIDIA.Archs.Tesla, device_probe.NVIDIA.Archs.Fermi, device_probe.AMD.Archs.TeraScale_1, device_probe.AMD.Archs.TeraScale_2])
+        or (igpu and igpu.arch in [device_probe.Intel.Archs.Iron_Lake, device_probe.Intel.Archs.Sandy_Bridge])
+        or isinstance(igpu, device_probe.NVIDIA)
+    ):
+        return False
+    else:
+        return True
+
+
+def check_filevault_skip():
+    # Check whether we can skip FileVault check with Root Patching
+    if get_nvram("OCLP-Settings", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=False) and "-allow_fv" in get_nvram("OCLP-Settings", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True):
+        return True
+    else:
+        return False
+
+
+def patching_status(os_sip, os):
+    # Detection for Root Patching
+    sip_enabled = True  #  System Integrity Protection
+    sbm_enabled = True  #  Secure Boot Status (SecureBootModel)
+    amfi_enabled = True  # Apple Mobile File Integrity
+    fv_enabled = True  #   FileVault
+    dosdude_patched = True
+
+    gen6_kext = "/System/Library/Extension/AppleIntelHDGraphics.kext"
+    gen7_kext = "/System/Library/Extension/AppleIntelHD3000Graphics.kext"
+
+    if os > Constants.Constants().catalina:
+        amfi_enabled = amfi_status()
+    else:
+        # Catalina and older supports individually disabling Library Validation
+        amfi_enabled = False
+
+    if get_nvram("HardwareModel", "94B73556-2197-4702-82A8-3E1337DAFBFB", decode=False) not in Constants.Constants.sbm_values:
+        sbm_enabled = False
+
+    if get_nvram("csr-active-config", decode=False) and csr_decode(get_nvram("csr-active-config", decode=False), os_sip) is False:
+        sip_enabled = False
+
+    if os > Constants.Constants().catalina and not check_filevault_skip():
+        # Assume non-OCLP Macs do not have our APFS seal patch
+        fv_status: str = subprocess.run("fdesetup status".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
+        if "FileVault is Off" in fv_status:
+            fv_enabled = False
+    else:
+        fv_enabled = False
+
+    if not (Path(gen6_kext).exists() and Path(gen7_kext).exists()):
+        dosdude_patched = False
+
+    return sip_enabled, sbm_enabled, amfi_enabled, fv_enabled, dosdude_patched
+
+
+clear = True
+
+
+def disable_cls():
+    global clear
+    clear = False
+
+
+def cls():
+    global clear
+    if not clear:
+        return
+    if not check_recovery():
+        os.system("cls" if os.name == "nt" else "clear")
+    else:
+        print("\u001Bc")
+
+
+def get_nvram(variable: str, uuid: str = None, *, decode: bool = False):
+    # TODO: Properly fix for El Capitan, which does not print the XML representation even though we say to
+
+    if uuid is not None:
+        uuid += ":"
+    else:
+        uuid = ""
+
+    nvram = ioreg.IORegistryEntryFromPath(ioreg.kIOMasterPortDefault, "IODeviceTree:/options".encode())
+
+    value = ioreg.IORegistryEntryCreateCFProperty(nvram, f"{uuid}{variable}", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)
+
+    ioreg.IOObjectRelease(nvram)
+
+    if not value:
+        return None
+
+    value = ioreg.corefoundation_to_native(value)
+
+    if decode and isinstance(value, bytes):
+        value = value.strip(b"\0").decode()
+    return value
+
+
+def get_rom(variable: str, *, decode: bool = False):
+    # TODO: Properly fix for El Capitan, which does not print the XML representation even though we say to
+
+    rom = ioreg.IORegistryEntryFromPath(ioreg.kIOMasterPortDefault, "IODeviceTree:/rom".encode())
+
+    value = ioreg.IORegistryEntryCreateCFProperty(rom, variable, ioreg.kCFAllocatorDefault, ioreg.kNilOptions)
+
+    ioreg.IOObjectRelease(rom)
+
+    if not value:
+        return None
+
+    value = ioreg.corefoundation_to_native(value)
+
+    if decode and isinstance(value, bytes):
+        value = value.strip(b"\0").decode()
+    return value
+
+
+def download_file(link, location):
+    print("- Attempting download from following link:")
+    print(link)
+    if Path(location).exists():
+        print("- Removing old file")
+        Path(location).unlink()
+    response = requests.get(link, stream=True)
+    with location.open("wb") as file:
+        count = 0
+        for chunk in response.iter_content(1024 * 1024 * 4):
+            file.write(chunk)
+            count += len(chunk)
+            cls()
+            print("- Downloading package")
+            print(f"- {count / 1024 / 1024}MB Downloaded")
+    checksum = hashlib.sha256()
+    with location.open("rb") as file:
+        chunk = file.read(1024 * 1024 * 16)
+        while chunk:
+            checksum.update(chunk)
+            chunk = file.read(1024 * 1024 * 16)
+    return checksum
+
+
+def enable_apfs(fw_feature):
+    fw_feature |= 2 ** 19  # Enable FW_FEATURE_SUPPORTS_APFS
+    return fw_feature
+
+def enable_apfs_extended(fw_feature):
+    fw_feature |= 2 ** 20  # Enable FW_FEATURE_SUPPORTS_APFS_EXTRA
+    return fw_feature
+
+def enable_large_basesystem(fw_feature):
+    fw_feature |= 2 ** 35  # Enable FW_FEATURE_SUPPORTS_LARGE_BASESYSTEM
+    return fw_feature
+
+
+# def menu(title, prompt, menu_options, add_quit=True, auto_number=False, in_between=[], top_level=False):
+#     return_option = ["Q", "Quit", None] if top_level else ["B", "Back", None]
+#     if add_quit: menu_options.append(return_option)
+
+#     cls()
+#     header(title)
+#     print()
+
+#     for i in in_between: print(i)
+#     if in_between: print()
+
+#     for index, option in enumerate(menu_options):
+#         if auto_number and not (index == (len(menu_options) - 1) and add_quit):
+#             option[0] = str((index + 1))
+#         print(option[0] + ".  " + option[1])
+
+#     print()
+#     selected = input(prompt)
+
+#     keys = [option[0].upper() for option in menu_options]
+#     if not selected or selected.upper() not in keys:
+#         return
+#     if selected.upper() == return_option[0]:
+#         return -1
+#     else:
+#         menu_options[keys.index(selected.upper())][2]() if menu_options[keys.index(selected.upper())][2] else None
+
+
+class TUIMenu:
+    def __init__(self, title, prompt, options=None, return_number_instead_of_direct_call=False, add_quit=True, auto_number=False, in_between=None, top_level=False, loop=False):
+        self.title = title
+        self.prompt = prompt
+        self.in_between = in_between or []
+        self.options = options or []
+        self.return_number_instead_of_direct_call = return_number_instead_of_direct_call
+        self.auto_number = auto_number
+        self.add_quit = add_quit
+        self.top_level = top_level
+        self.loop = loop
+        self.added_quit = False
+
+    def add_menu_option(self, name, description="", function=None, key=""):
+        self.options.append([key, name, description, function])
+
+    def start(self):
+        return_option = ["Q", "Quit"] if self.top_level else ["B", "Back"]
+        if self.add_quit and not self.added_quit:
+            self.add_menu_option(return_option[1], function=None, key=return_option[0])
+            self.added_quit = True
+
+        while True:
+            cls()
+            header(self.title)
+            print()
+
+            for i in self.in_between:
+                print(i)
+            if self.in_between:
+                print()
+
+            for index, option in enumerate(self.options):
+                if self.auto_number and not (index == (len(self.options) - 1) and self.add_quit):
+                    option[0] = str((index + 1))
+                print(option[0] + ".  " + option[1])
+                for i in option[2]:
+                    print("\t" + i)
+
+            print()
+            selected = input(self.prompt)
+
+            keys = [option[0].upper() for option in self.options]
+            if not selected or selected.upper() not in keys:
+                if self.loop:
+                    continue
+                else:
+                    return
+            if self.add_quit and selected.upper() == return_option[0]:
+                return -1
+            elif self.return_number_instead_of_direct_call:
+                return self.options[keys.index(selected.upper())][0]
+            else:
+                self.options[keys.index(selected.upper())][3]() if self.options[keys.index(selected.upper())][3] else None
+                if not self.loop:
+                    return
+
+
+class TUIOnlyPrint:
+    def __init__(self, title, prompt, in_between=None):
+        self.title = title
+        self.prompt = prompt
+        self.in_between = in_between or []
+
+    def start(self):
+        cls()
+        header(self.title)
+        print()
+
+        for i in self.in_between:
+            print(i)
+        if self.in_between:
+            print()
+
+        return input(self.prompt)

Resources/build.py

@@ -1,643 +0,0 @@
-# Commands for building the EFI and SMBIOS
-# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
-from __future__ import print_function
-
-import binascii
-import plistlib
-import shutil
-import subprocess
-import uuid
-import zipfile
-from pathlib import Path
-from datetime import date
-
-from Resources import Constants, ModelArray, utilities
-
-
-def human_fmt(num):
-    for unit in ["B", "KB", "MB", "GB", "TB", "PB"]:
-        if abs(num) < 1000.0:
-            return "%3.1f %s" % (num, unit)
-        num /= 1000.0
-    return "%.1f %s" % (num, "EB")
-
-
-def rmtree_handler(func, path, exc_info):
-    if exc_info[0] == FileNotFoundError:
-        return
-    raise  # pylint: disable=misplaced-bare-raise
-
-
-class BuildOpenCore:
-    def __init__(self, model, versions):
-        self.model = model
-        self.config = None
-        self.constants: Constants.Constants = versions
-
-    def hexswap(self, input_hex: str):
-        hex_pairs = [input_hex[i:i + 2] for i in range(0, len(input_hex), 2)]
-        hex_rev = hex_pairs[::-1]
-        hex_str = "".join(["".join(x) for x in hex_rev])
-        return hex_str.upper()
-
-    def build_efi(self):
-        utilities.cls()
-        if not Path(self.constants.build_path).exists():
-            Path(self.constants.build_path).mkdir()
-            print("Created build folder")
-        else:
-            print("Build folder already present, skipping")
-
-        if Path(self.constants.opencore_zip_copied).exists():
-            print("Deleting old copy of OpenCore zip")
-            Path(self.constants.opencore_zip_copied).unlink()
-        if Path(self.constants.opencore_release_folder).exists():
-            print("Deleting old copy of OpenCore folder")
-            shutil.rmtree(self.constants.opencore_release_folder, onerror=rmtree_handler)
-
-        print()
-        print(f"- Adding OpenCore v{self.constants.opencore_version} {self.constants.opencore_build}")
-        shutil.copy(self.constants.opencore_zip_source, self.constants.build_path)
-        zipfile.ZipFile(self.constants.opencore_zip_copied).extractall(self.constants.build_path)
-
-        print("- Adding config.plist for OpenCore")
-        # Setup config.plist for editing
-        shutil.copy(self.constants.plist_template, self.constants.oc_folder)
-        self.config = plistlib.load(Path(self.constants.plist_path).open("rb"))
-
-        # Set revision in config
-        self.config["#Revision"]["Build-Version"] = f"{self.constants.patcher_version} - {date.today()}"
-        self.config["#Revision"]["OpenCore-Version"] = f"{self.constants.opencore_version} - {self.constants.opencore_build} - {self.constants.opencore_commit}"
-        self.config["#Revision"]["Original-Model"] = self.model
-        self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Version"] = f"{self.constants.patcher_version}"
-
-        for name, version, path, check in [
-            # Essential kexts
-            ("Lilu.kext", self.constants.lilu_version, self.constants.lilu_path, lambda: True),
-            ("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path, lambda: True),
-            ("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path, lambda: self.model in ModelArray.MacPro71),
-            ("RestrictEvents.kext", self.constants.restrictevents_mbp_version, self.constants.restrictevents_mbp_path, lambda: self.model == "MacBookPro9,1"),
-            ("NightShiftEnabler.kext", self.constants.nightshift_version, self.constants.nightshift_path, lambda: self.model not in ModelArray.NightShiftExclude),
-            ("SMC-Spoof.kext", self.constants.smcspoof_version, self.constants.smcspoof_path, lambda: True),
-            # CPU patches
-            ("AppleMCEReporterDisabler.kext", self.constants.mce_version, self.constants.mce_path, lambda: self.model in ModelArray.DualSocket),
-            ("AAAMouSSE.kext", self.constants.mousse_version, self.constants.mousse_path, lambda: self.model in ModelArray.SSEEmulator),
-            ("telemetrap.kext", self.constants.telemetrap_version, self.constants.telemetrap_path, lambda: self.model in ModelArray.MissingSSE42),
-            ("CPUFriend.kext", self.constants.cpufriend_version, self.constants.cpufriend_path, lambda: self.model in ModelArray.X86PP),
-            # Ethernet patches
-            ("nForceEthernet.kext", self.constants.nforce_version, self.constants.nforce_path, lambda: self.model in ModelArray.EthernetNvidia),
-            ("MarvelYukonEthernet.kext", self.constants.marvel_version, self.constants.marvel_path, lambda: self.model in ModelArray.EthernetMarvell),
-            ("CatalinaBCM5701Ethernet.kext", self.constants.bcm570_version, self.constants.bcm570_path, lambda: self.model in ModelArray.EthernetBroadcom),
-            # Legacy audio
-            #("VoodooHDA.kext", self.constants.voodoohda_version, self.constants.voodoohda_path, lambda: self.model in ModelArray.LegacyAudio),
-            # IDE patch
-            ("AppleIntelPIIXATA.kext", self.constants.piixata_version, self.constants.piixata_path, lambda: self.model in ModelArray.IDEPatch),
-            # Hibernation Tests
-            #("CpuTscSync.kext", self.constants.cputscsync, self.constants.cputscsync_path, lambda: True),
-            #("HibernationFixup.kext", self.constants.hibernationfixup, self.constants.hibernationfixup_path, lambda: True),
-        ]:
-            self.enable_kext(name, version, path, check)
-
-        # WiFi patches
-        # TODO: -a is not supported in Lion and older, need to add proper fix
-        if self.constants.detected_os > self.constants.lion:
-            wifi_devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            wifi_devices = [i for i in wifi_devices if i["vendor-id"] == binascii.unhexlify("E4140000") and i["class-code"] == binascii.unhexlify("00800200")]
-        else:
-            wifi_devices = ""
-            print("- Can't run Wifi hardware detection on Snow Leopard and older")
-        if self.constants.wifi_build is True:
-            print("- Skipping Wifi patches on request")
-        elif not self.constants.custom_model and wifi_devices and self.hexswap(binascii.hexlify(wifi_devices[0]["device-id"]).decode()[:4]) in ModelArray.nativeWifi:
-            print("- Found supported WiFi card, skipping wifi patches")
-        else:
-            if self.model in ModelArray.WifiAtheros:
-                self.enable_kext("IO80211HighSierra.kext", self.constants.io80211high_sierra_version, self.constants.io80211high_sierra_path)
-                self.get_kext_by_bundle_path("IO80211HighSierra.kext/Contents/PlugIns/AirPortAtheros40.kext")["Enabled"] = True
-
-            if self.model in ModelArray.WifiBCM94331:
-                self.enable_kext("AirportBrcmFixup.kext", self.constants.airportbcrmfixup_version, self.constants.airportbcrmfixup_path)
-                self.get_kext_by_bundle_path("AirportBrcmFixup.kext/Contents/PlugIns/AirPortBrcmNIC_Injector.kext")["Enabled"] = True
-
-                if self.model in ModelArray.EthernetNvidia:
-                    # Nvidia chipsets all have the same path to ARPT
-                    property_path = "PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)"
-                if self.model in ("MacBookAir2,1", "MacBookAir3,1", "MacBookAir3,2"):
-                    property_path = "PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)"
-                elif self.model in ("iMac7,1", "iMac8,1"):
-                    property_path = "PciRoot(0x0)/Pci(0x1C,0x4)/Pci(0x0,0x0)"
-                elif self.model in ("iMac13,1", "iMac13,2"):
-                    property_path = "PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)"
-                elif self.model == "MacPro5,1":
-                    property_path = "PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)"
-                else:
-                    # Assumes we have a laptop with Intel chipset
-                    property_path = "PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)"
-                print("- Applying fake ID for WiFi")
-                self.config["DeviceProperties"]["Add"][property_path] = {"device-id": binascii.unhexlify("ba430000"), "compatible": "pci14e4,43ba"}
-            if self.model in ModelArray.WifiBCM94322:
-                self.enable_kext("IO80211Mojave.kext", self.constants.io80211mojave_version, self.constants.io80211mojave_path)
-                self.get_kext_by_bundle_path("IO80211Mojave.kext/Contents/PlugIns/AirPortBrcm4331.kext")["Enabled"] = True
-
-        # CPUFriend
-        pp_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/PlatformPlugin/{self.model}/Info.plist")
-        if self.model in ModelArray.X86PP:
-            Path(self.constants.pp_kext_folder).mkdir()
-            Path(self.constants.pp_contents_folder).mkdir()
-            shutil.copy(pp_map_path, self.constants.pp_contents_folder)
-            self.get_kext_by_bundle_path("CPUFriendDataProvider.kext")["Enabled"] = True
-
-        # HID patches
-        if self.model in ModelArray.LegacyHID:
-            print("- Adding IOHIDFamily patch")
-            self.get_item_by_kv(self.config["Kernel"]["Patch"], "Identifier", "com.apple.iokit.IOHIDFamily")["Enabled"] = True
-
-        # SSDT patches
-        if self.model in ModelArray.pciSSDT:
-            print("- Adding SSDT-CPBG.aml")
-            self.get_item_by_kv(self.config["ACPI"]["Add"], "Path", "SSDT-CPBG.aml")["Enabled"] = True
-            shutil.copy(self.constants.pci_ssdt_path, self.constants.acpi_path)
-
-        # USB Map
-        usb_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/AppleUSBMaps/Info.plist")
-        if usb_map_path.exists():
-            print(f"- Adding USB-Map.kext")
-            Path(self.constants.map_kext_folder).mkdir()
-            Path(self.constants.map_contents_folder).mkdir()
-            shutil.copy(usb_map_path, self.constants.map_contents_folder)
-            self.get_kext_by_bundle_path("USB-Map.kext")["Enabled"] = True
-
-        agdp_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/AppleGraphicsDevicePolicy/Info.plist")
-        agpm_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/AppleGraphicsPowerManagement/Info.plist")
-        amc_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/AppleMuxControl/Info.plist")
-
-        if self.model == "MacBookPro9,1":
-            print(f"- Adding Display Map Overrides")
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " agdpmod=vit9696"
-            Path(self.constants.agdp_kext_folder).mkdir()
-            Path(self.constants.agdp_contents_folder).mkdir()
-            Path(self.constants.agpm_kext_folder).mkdir()
-            Path(self.constants.agpm_contents_folder).mkdir()
-            Path(self.constants.amc_kext_folder).mkdir()
-            Path(self.constants.amc_contents_folder).mkdir()
-
-            shutil.copy(agdp_map_path, self.constants.agdp_contents_folder)
-            shutil.copy(agpm_map_path, self.constants.agpm_contents_folder)
-            shutil.copy(amc_map_path, self.constants.amc_contents_folder)
-            self.get_kext_by_bundle_path("AGDP-Override.kext")["Enabled"] = True
-            self.get_kext_by_bundle_path("AGPM-Override.kext")["Enabled"] = True
-            self.get_kext_by_bundle_path("AMC-Override.kext")["Enabled"] = True
-
-        # AGPM Patch
-        if self.model in ModelArray.DualGPUPatch:
-            print("- Adding dual GPU patch")
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " agdpmod=pikera"
-
-        # HiDPI OpenCanopy and FileVault
-        if self.model in ModelArray.HiDPIpicker:
-            print("- Setting HiDPI picker")
-            self.config["NVRAM"]["Add"]["4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"]["UIScale"] = binascii.unhexlify("02")
-
-
-        def nvidia_patch(self):
-            self.constants.custom_mxm_gpu = True
-            print("- Adding Nvidia Brightness Control patches")
-            if self.model in ["iMac11,1", "iMac11,2", "iMac11,3"]:
-                backlight_path = "PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"
-                self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
-                shutil.copy(self.constants.backlight_path, self.constants.kexts_path)
-                self.get_kext_by_bundle_path("AppleBacklightFixup.kext")["Enabled"] = True
-            elif self.model in ["iMac12,1", "iMac12,2"]:
-                backlight_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
-                self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
-                print("- Disabling unsupported iGPU")
-                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
-                shutil.copy(self.constants.backlight_path, self.constants.kexts_path)
-                self.get_kext_by_bundle_path("AppleBacklightFixup.kext")["Enabled"] = True
-            else:
-                print("- Failed to determine model")
-
-        def amd_patch(self):
-            self.constants.custom_mxm_gpu = True
-            print("- Adding AMD DRM patches")
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=80 unfairgva=1"
-            if self.model in ["iMac12,1", "iMac12,2"]:
-                print("- Disabling unsupported iGPU")
-                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
-
-
-        # Check GPU Vendor
-        if self.constants.metal_build is True:
-            print("- Adding Metal GPU patches on request")
-            if self.constants.imac_vendor == "AMD":
-                amd_patch(self)
-            elif self.constants.imac_vendor == "Nvidia":
-                nvidia_patch(self)
-            else:
-                print("- Failed to find vendor")
-        elif self.constants.custom_model == "None":
-            current_gpu: str = subprocess.run("system_profiler SPDisplaysDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-            self.constants.current_gpuv = [line.strip().split(": ", 1)[1] for line in current_gpu.split("\n") if line.strip().startswith(("Vendor"))][0]
-            self.constants.current_gpud = [line.strip().split(": ", 1)[1] for line in current_gpu.split("\n") if line.strip().startswith(("Device ID"))][0]
-            print(f"- Detected GPU: {self.constants.current_gpuv} {self.constants.current_gpud}")
-            if (self.constants.current_gpuv == "AMD (0x1002)") & (self.constants.current_gpud in ModelArray.AMDMXMGPUs):
-                amd_patch(self)
-            elif (self.constants.current_gpuv == "NVIDIA (0x10de)") & (self.constants.current_gpud in ModelArray.NVIDIAMXMGPUs):
-                nvidia_patch(self)
-        elif self.model in ModelArray.MacPro71:
-            print("- Adding Mac Pro, Xserve DRM patches")
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=128 unfairgva=1 -wegtree"
-
-
-        # Add OpenCanopy
-        print("- Adding OpenCanopy GUI")
-        shutil.rmtree(self.constants.resources_path, onerror=rmtree_handler)
-        shutil.copy(self.constants.gui_path, self.constants.oc_folder)
-        self.config["UEFI"]["Drivers"] = ["OpenCanopy.efi", "OpenRuntime.efi"]
-
-        # Add UGA to GOP layer
-        if self.model in ModelArray.UGAtoGOP:
-            print("- Adding UGA to GOP Patch")
-            self.config["UEFI"]["Output"]["GopPassThrough"] = True
-
-        # ThridPartDrives Check
-        if self.model not in ModelArray.NoSATAPatch:
-            print("- Adding SATA Hibernation Patch")
-            self.config["Kernel"]["Quirks"]["ThirdPartyDrives"] = True
-
-        #DEBUG Settings
-        if self.constants.verbose_debug is True:
-            print("- Enabling Verbose boot")
-            self.config["Kernel"]["Quirks"]["PanicNoKextDump"] = True
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -v debug=0x100"
-        if self.constants.kext_debug is True:
-            print("- Enabling DEBUG Kexts")
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -liludbgall"
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " msgbuf=1048576"
-        if self.constants.opencore_debug is True:
-            print("- Enabling DEBUG OpenCore")
-            self.config["Misc"]["Debug"]["Target"] = 67
-            self.config["Misc"]["Debug"]["DisplayLevel"] = 672151678018
-        if self.constants.showpicker is True:
-            print("- Enabling ShowPicker")
-            self.config["Misc"]["Boot"]["ShowPicker"] = True
-        else:
-            print("- Hiding picker and enabling PollAppleHotKeys")
-            self.config["Misc"]["Boot"]["ShowPicker"] = False
-        if self.constants.vault is True:
-            print("- Setting Vault configuration")
-            self.config["Misc"]["Security"]["Vault"] = "Secure"
-            self.get_tool_by__path("OpenShell.efi")["Enabled"] = False
-        if self.constants.sip_status is False:
-            print("- Disabling SIP")
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["csr-active-config"] = binascii.unhexlify("EF0F0000")
-            self.config["NVRAM"]["Delete"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"] += ["csr-active-config"]
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " amfi_get_out_of_my_way=1"
-        if self.constants.secure_status is False:
-            print("- Disabling SecureBootModel")
-            self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled"
-
-    def set_smbios(self):
-        spoofed_model = self.model
-        # TODO: Set check as global variable
-        if self.model in ModelArray.MacBookAir61:
-            print("- Spoofing to MacBookAir6,1")
-            spoofed_model = "MacBookAir6,1"
-            spoofed_board = "Mac-35C1E88140C3E6CF"
-        elif self.model in ModelArray.MacBookAir62:
-            print("- Spoofing to MacBookAir6,2")
-            spoofed_model = "MacBookAir6,2"
-            spoofed_board = "Mac-7DF21CB3ED6977E5"
-        elif self.model in ModelArray.MacBookPro111:
-            print("- Spoofing to MacBookPro11,1")
-            spoofed_model = "MacBookPro11,1"
-            spoofed_board = "Mac-189A3D4F975D5FFC"
-        elif self.model in ModelArray.MacBookPro113:
-            print("- Spoofing to MacBookPro11,3")
-            spoofed_model = "MacBookPro11,3"
-            spoofed_board = "Mac-2BD1B31983FE1663"
-        elif self.model in ModelArray.Macmini71:
-            print("- Spoofing to Macmini7,1")
-            spoofed_model = "Macmini7,1"
-            spoofed_board = "Mac-35C5E08120C7EEAF"
-        elif self.model in ModelArray.iMacPro11:
-            print("- Spoofing to iMacPro1,1")
-            spoofed_model = "iMacPro1,1"
-            spoofed_board = "Mac-7BA5B2D9E42DDD94"
-        elif self.model in ModelArray.iMac151:
-            # Check for upgraded GPUs on iMacs
-            if self.constants.metal_build is True:
-                print("- Spoofing to iMacPro1,1")
-                spoofed_model = "iMacPro1,1"
-                spoofed_board = "Mac-7BA5B2D9E42DDD94"
-            elif (self.constants.current_gpuv == "AMD (0x1002)") & (self.constants.current_gpud in ModelArray.AMDMXMGPUs) & (self.constants.custom_model == "None"):
-                print("- Spoofing to iMacPro1,1")
-                spoofed_model = "iMacPro1,1"
-                spoofed_board = "Mac-7BA5B2D9E42DDD94"
-            elif (self.constants.current_gpuv == "NVIDIA (0x10de)") & (self.constants.current_gpud in ModelArray.NVIDIAMXMGPUs) & (self.constants.custom_model == "None"):
-                print("- Spoofing to iMacPro1,1")
-                spoofed_model = "iMacPro1,1"
-                spoofed_board = "Mac-7BA5B2D9E42DDD94"
-            else:
-                print("- Spoofing to iMac15,1")
-                spoofed_model = "iMac15,1"
-                spoofed_board = "Mac-42FD25EABCABB274"
-        elif self.model in ModelArray.iMac144:
-            print("- Spoofing to iMac14,4")
-            spoofed_model = "iMac14,4"
-            spoofed_board = "Mac-81E3E92DD6088272"
-        elif self.model in ModelArray.MacPro71:
-            print("- Spoofing to MacPro7,1")
-            spoofed_model = "MacPro7,1"
-            spoofed_board = "Mac-27AD2F918AE68F61"
-        self.spoofed_model = spoofed_model
-        self.spoofed_board = spoofed_board
-        self.config["#Revision"]["Spoofed-Model"] = self.spoofed_model
-
-        # Setup menu
-        def minimal_serial_patch(self):
-            self.config["PlatformInfo"]["PlatformNVRAM"]["BID"] = self.spoofed_board
-            self.config["PlatformInfo"]["SMBIOS"]["BoardProduct"] = self.spoofed_board
-            self.config["PlatformInfo"]["UpdateNVRAM"] = True
-        def moderate_serial_patch(self):
-            self.config["PlatformInfo"]["Automatic"] = True
-            self.config["PlatformInfo"]["UpdateDataHub"] = True
-            self.config["PlatformInfo"]["UpdateNVRAM"] = True
-            self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
-            self.config["PlatformInfo"]["Generic"]["SystemProductName"] = self.spoofed_model
-        def adanced_serial_patch(self):
-            macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {self.spoofed_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            macserial_output = macserial_output.stdout.decode().strip().split(" | ")
-            self.config["PlatformInfo"]["Automatic"] = True
-            self.config["PlatformInfo"]["UpdateDataHub"] = True
-            self.config["PlatformInfo"]["UpdateNVRAM"] = True
-            self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
-            self.config["PlatformInfo"]["Generic"]["ROM"] = binascii.unhexlify("0016CB445566")
-            self.config["PlatformInfo"]["Generic"]["SystemProductName"] = self.spoofed_model
-            self.config["PlatformInfo"]["Generic"]["SystemSerialNumber"] = macserial_output[0]
-            self.config["PlatformInfo"]["Generic"]["MLB"] = macserial_output[1]
-            self.config["PlatformInfo"]["Generic"]["SystemUUID"] = str(uuid.uuid4()).upper()
-
-        if self.constants.serial_settings == "Moderate":
-            print("- Using Moderate SMBIOS patching")
-            moderate_serial_patch(self)
-        elif self.constants.serial_settings == "Advanced":
-            print("- Using Advanced SMBIOS patching")
-            adanced_serial_patch(self)
-        else:
-            print("- Using Minimal SMBIOS patching")
-            self.spoofed_model = self.model
-            minimal_serial_patch(self)
-
-        # USB Map Patching
-        new_map_ls = Path(self.constants.map_contents_folder) / Path("Info.plist")
-        map_config = plistlib.load(Path(new_map_ls).open("rb"))
-
-        for model_controller in ModelArray.ControllerTypes:
-            model_patch = f"{self.model}{model_controller}"
-            try:
-                # Avoid erroring out when specific identity not found
-                map_config["IOKitPersonalities_x86_64"][model_patch]["model"] = self.spoofed_model
-            except KeyError:
-                continue
-
-        plistlib.dump(map_config, Path(new_map_ls).open("wb"), sort_keys=True)
-
-        if self.model == "MacBookPro9,1":
-            new_agdp_ls = Path(self.constants.agdp_contents_folder) / Path("Info.plist")
-            new_agpm_ls = Path(self.constants.agpm_contents_folder) / Path("Info.plist")
-            new_amc_ls = Path(self.constants.amc_contents_folder) / Path("Info.plist")
-
-            agdp_config = plistlib.load(Path(new_agdp_ls).open("rb"))
-            agpm_config = plistlib.load(Path(new_agpm_ls).open("rb"))
-            amc_config = plistlib.load(Path(new_amc_ls).open("rb"))
-
-            agdp_config["IOKitPersonalities"]["AppleGraphicsDevicePolicy"]["ConfigMap"][self.spoofed_board] = agdp_config["IOKitPersonalities"]["AppleGraphicsDevicePolicy"]["ConfigMap"].pop(self.model)
-            agpm_config["IOKitPersonalities"]["AGPM"]["Machines"][self.spoofed_board] = agpm_config["IOKitPersonalities"]["AGPM"]["Machines"].pop(self.model)
-            amc_config["IOKitPersonalities"]["AppleMuxControl"]["ConfigMap"][self.spoofed_board] = amc_config["IOKitPersonalities"]["AppleMuxControl"]["ConfigMap"].pop(self.model)
-
-            plistlib.dump(agdp_config, Path(new_agdp_ls).open("wb"), sort_keys=True)
-            plistlib.dump(agpm_config, Path(new_agpm_ls).open("wb"), sort_keys=True)
-            plistlib.dump(amc_config, Path(new_amc_ls).open("wb"), sort_keys=True)
-
-    @staticmethod
-    def get_item_by_kv(iterable, key, value):
-        item = None
-        for i in iterable:
-            if i[key] == value:
-                item = i
-                break
-        return item
-
-    def get_kext_by_bundle_path(self, bundle_path):
-        kext = self.get_item_by_kv(self.config["Kernel"]["Add"], "BundlePath", bundle_path)
-        if not kext:
-            print(f"- Could not find kext {bundle_path}!")
-            raise IndexError
-        return kext
-
-    def get_tool_by__path(self, bundle_path):
-        tool = self.get_item_by_kv(self.config["Misc"]["Tools"], "Path", bundle_path)
-        if not tool:
-            print(f"- Could not find Tool {bundle_path}!")
-            raise IndexError
-        return tool
-
-    def enable_kext(self, kext_name, kext_version, kext_path, check=False):
-        kext = self.get_kext_by_bundle_path(kext_name)
-
-        if callable(check) and not check():
-            # Check failed
-            return
-
-        print(f"- Adding {kext_name} {kext_version}")
-        shutil.copy(kext_path, self.constants.kexts_path)
-        kext["Enabled"] = True
-
-    def cleanup(self):
-        print("- Cleaning up files")
-        plistlib.dump(self.config, Path(self.constants.plist_path).open("wb"), sort_keys=True)
-        for kext in self.constants.kexts_path.rglob("*.zip"):
-            with zipfile.ZipFile(kext) as zip_file:
-                zip_file.extractall(self.constants.kexts_path)
-            kext.unlink()
-
-        for item in self.constants.oc_folder.rglob("*.zip"):
-            with zipfile.ZipFile(item) as zip_file:
-                zip_file.extractall(self.constants.oc_folder)
-            item.unlink()
-
-        for i in self.constants.build_path.rglob("__MACOSX"):
-            shutil.rmtree(i)
-
-        Path(self.constants.opencore_zip_copied).unlink()
-
-    def sign_files(self):
-        if self.constants.vault is True:
-            print("- Vaulting EFI")
-            subprocess.run([self.constants.vault_path] + f"{self.constants.oc_folder}/".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
-    def build_opencore(self):
-        self.build_efi()
-        self.set_smbios()
-        self.cleanup()
-        self.sign_files()
-        print("")
-        print("Your OpenCore EFI has been built at:")
-        print(f"    {self.constants.opencore_release_folder}")
-        print("")
-        if self.constants.gui_mode is False:
-            input("Press [Enter] to go back.\n")
-
-    def copy_efi(self):
-        utilities.cls()
-        utilities.header(["Installing OpenCore to Drive"])
-
-        if not self.constants.opencore_release_folder.exists():
-            utilities.TUIOnlyPrint(
-                ["Installing OpenCore to Drive"],
-                "Press [Enter] to go back.\n",
-                [
-                    """OpenCore folder missing!
-Please build OpenCore first!"""
-                ],
-            ).start()
-            return
-
-        print("\nDisk picker is loading...")
-
-        all_disks = {}
-        # TODO: AllDisksAndPartitions is not supported in Snow Leopard and older
-        try:
-            # High Sierra and newer
-            disks = plistlib.loads(subprocess.run("diskutil list -plist physical".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        except ValueError:
-            # Sierra and older
-            disks = plistlib.loads(subprocess.run("diskutil list -plist".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        for disk in disks["AllDisksAndPartitions"]:
-            disk_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            try:
-                all_disks[disk["DeviceIdentifier"]] = {"identifier": disk_info["DeviceNode"], "name": disk_info["MediaName"], "size": disk_info["TotalSize"], "partitions": {}}
-                for partition in disk["Partitions"]:
-                    partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {partition['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-                    all_disks[disk["DeviceIdentifier"]]["partitions"][partition["DeviceIdentifier"]] = {
-                        "fs": partition_info.get("FilesystemType", partition_info["Content"]),
-                        "type": partition_info["Content"],
-                        "name": partition_info.get("VolumeName", ""),
-                        "size": partition_info["TotalSize"],
-                    }
-            except KeyError:
-                # Avoid crashing with CDs installed
-                continue
-        # TODO: Advanced mode
-        menu = utilities.TUIMenu(
-            ["Select Disk"],
-            "Please select the disk you would like to install OpenCore to: ",
-            in_between=["Missing disks? Ensure they have an EFI or FAT32 partition."],
-            return_number_instead_of_direct_call=True,
-            loop=True,
-        )
-        for disk in all_disks:
-            if not any(all_disks[disk]["partitions"][partition]["fs"] in ("msdos", "EFI") for partition in all_disks[disk]["partitions"]):
-                continue
-            menu.add_menu_option(f"{disk}: {all_disks[disk]['name']} ({human_fmt(all_disks[disk]['size'])})", key=disk[4:])
-
-        response = menu.start()
-
-        if response == -1:
-            return
-
-        disk_identifier = "disk" + response
-        selected_disk = all_disks[disk_identifier]
-
-        menu = utilities.TUIMenu(
-            ["Select Partition"],
-            "Please select the partition you would like to install OpenCore to: ",
-            return_number_instead_of_direct_call=True,
-            loop=True,
-            in_between=["Missing partitions? Ensure they are formatted as an EFI or FAT32.", "", "* denotes likely candidate."],
-        )
-        for partition in selected_disk["partitions"]:
-            if selected_disk["partitions"][partition]["fs"] not in ("msdos", "EFI"):
-                continue
-            text = f"{partition}: {selected_disk['partitions'][partition]['name']} ({human_fmt(selected_disk['partitions'][partition]['size'])})"
-            if selected_disk["partitions"][partition]["type"] == "EFI" or (
-                selected_disk["partitions"][partition]["type"] == "Microsoft Basic Data" and selected_disk["partitions"][partition]["size"] < 1024 * 1024 * 512
-            ):  # 512 megabytes:
-                text += " *"
-            menu.add_menu_option(text, key=partition[len(disk_identifier) + 1:])
-
-        response = menu.start()
-
-        if response == -1:
-            return
-
-        # TODO: Apple Script fails in Yosemite(?) and older
-        args = [
-            "osascript",
-            "-e",
-            f'''do shell script "diskutil mount {disk_identifier}s{response}"'''
-            ' with prompt "OpenCore Legacy Patcher needs administrator privileges to mount your EFI."'
-            " with administrator privileges"
-            " without altering line endings",
-        ]
-
-        if self.constants.detected_os > self.constants.yosemite:
-            result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        else:
-            result = subprocess.run(f"diskutil mount {disk_identifier}s{response}".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-        if result.returncode != 0:
-            if "execution error" in result.stderr.decode() and result.stderr.decode().strip()[-5:-1] == "-128":
-                # cancelled prompt
-                return
-            else:
-                utilities.TUIOnlyPrint(
-                    ["Copying OpenCore"], "Press [Enter] to go back.\n", ["An error occurred!"] + result.stderr.decode().split("\n") + ["", "Please report this to the devs at GitHub."]
-                ).start()
-                return
-
-        # TODO: Remount if readonly
-        drive_host_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk_identifier}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk_identifier}s{response}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        sd_type = drive_host_info["MediaName"]
-        try:
-            ssd_type = drive_host_info["SolidState"]
-        except KeyError:
-            ssd_type = False
-        mount_path = Path(partition_info["MountPoint"])
-        disk_type = partition_info["BusProtocol"]
-        utilities.cls()
-        utilities.header(["Copying OpenCore"])
-
-        if mount_path.exists():
-            if (mount_path / Path("EFI/OC")).exists():
-                print("- Removing preexisting EFI/OC folder")
-                shutil.rmtree(mount_path / Path("EFI/OC"), onerror=rmtree_handler)
-            if (mount_path / Path("System")).exists():
-                print("- Removing preexisting System folder")
-                shutil.rmtree(mount_path / Path("System"), onerror=rmtree_handler)
-            print("- Coping OpenCore onto EFI partition")
-            shutil.copytree(self.constants.opencore_release_folder / Path("EFI/OC"), mount_path / Path("EFI/OC"))
-            shutil.copytree(self.constants.opencore_release_folder / Path("System"), mount_path / Path("System"))
-            # Array filled with common SD Card names
-            # Note most USB-based SD Card readers generally report as "Storage Device", and no reliable way to detect further
-            if sd_type in ["SD Card Reader", "SD/MMC"]:
-                print("- Adding SD Card icon")
-                shutil.copy(self.constants.icon_path_sd, mount_path)
-            elif ssd_type is True:
-                print("- Adding SSD icon")
-                shutil.copy(self.constants.icon_path_ssd, mount_path)
-            elif disk_type == "USB":
-                print("- Adding External USB Drive icon")
-                shutil.copy(self.constants.icon_path_external, mount_path)
-            else:
-                print("- Adding Internal Drive icon")
-                shutil.copy(self.constants.icon_path_internal, mount_path)
-            print("- Cleaning install location")
-            subprocess.run(f"dot_clean '{mount_path}'".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            print("- OpenCore transfer complete")
-            print("\nPress [Enter] to continue.\n")
-            input()
-        else:
-            utilities.TUIOnlyPrint(["Copying OpenCore"], "Press [Enter] to go back.\n", ["EFI failed to mount!", "Please report this to the devs at GitHub."]).start()

Resources/device_probe.py

@@ -0,0 +1,452 @@
+# Hardware probing
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
+
+from __future__ import annotations
+
+import binascii
+import enum
+import itertools
+import subprocess
+from dataclasses import dataclass, field
+from typing import Any, ClassVar, Optional, Type, Union
+
+from Resources import PCIIDArray, Utilities, ioreg
+
+
+@dataclass
+class CPU:
+    name: str
+    flags: list[str]
+
+
+@dataclass
+class PCIDevice:
+    VENDOR_ID: ClassVar[int]  # Default vendor id, for subclasses.
+
+    vendor_id: int  # The vendor ID of this PCI device
+    device_id: int  # The device ID of this PCI device
+    class_code: int  # The class code of this PCI device
+
+    # ioregistryentry: Optional[ioreg.IORegistryEntry] = None
+    name: Optional[str] = None  # Name of IORegistryEntry
+    model: Optional[str] = None  # model property
+    acpi_path: Optional[str] = None
+    pci_path: Optional[str] = None
+
+    # def __getstate__(self):
+    #     state = self.__dict__.copy()
+    #     state.pop("ioregistryentry")
+    #     return state
+
+    @classmethod
+    def from_ioregistry(cls, entry: ioreg.io_registry_entry_t, anti_spoof=False):
+        properties: dict = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperties(entry, None, ioreg.kCFAllocatorDefault, ioreg.kNilOptions)[1])  # type: ignore
+        if anti_spoof and "IOName" in properties:
+            vendor_id, device_id = (int(i, 16) for i in properties["IOName"][3:].split(","))
+        else:
+            vendor_id, device_id = [int.from_bytes(properties[i][:4], byteorder="little") for i in ["vendor-id", "device-id"]]
+
+        device = cls(vendor_id, device_id, int.from_bytes(properties["class-code"][:6], byteorder="little"), name=ioreg.io_name_t_to_str(ioreg.IORegistryEntryGetName(entry, None)[1]))
+        if "model" in properties:
+            device.model = properties["model"].strip(b"\0").decode()
+        if "acpi_path" in properties:
+            device.acpi_path = properties["acpi-path"].strip(b"\0").decode()
+        device.populate_pci_path(entry)
+        return device
+
+    # @staticmethod
+    # def vendor_detect_old(device):
+    #     for i in [NVIDIA, AMD]:
+    #         if i.detect(device):
+    #             return i
+    #     return None
+
+    def vendor_detect(self, *, inherits: ClassVar[Any] = None, classes: list = None):
+        for i in classes or itertools.chain.from_iterable([subclass.__subclasses__() for subclass in PCIDevice.__subclasses__()]):
+            if issubclass(i, inherits or object) and i.detect(self):
+                return i
+        return None
+
+    @classmethod
+    def detect(cls, device):
+        return device.vendor_id == cls.VENDOR_ID and ((device.class_code == cls.CLASS_CODE) if getattr(cls, "CLASS_CODE", None) else True)  # type: ignore  # pylint: disable=no-member
+
+    # def acpi_path(self):
+    #     # Eventually
+    #     raise NotImplementedError
+
+    def populate_pci_path(self, original_entry: ioreg.io_registry_entry_t):
+        # Based off gfxutil logic, seems to work.
+        paths = []
+        entry = original_entry
+        while entry:
+            if ioreg.IOObjectConformsTo(entry, "IOPCIDevice".encode()):
+                location = [hex(int(i, 16)) for i in ioreg.io_name_t_to_str(ioreg.IORegistryEntryGetLocationInPlane(entry, "IOService".encode(), None)[1]).split(",") + ["0"]]
+                paths.append(f"Pci({location[0]},{location[1]})")
+            elif ioreg.IOObjectConformsTo(entry, "IOACPIPlatformDevice".encode()):
+                paths.append(f"PciRoot({hex(int(ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, '_UID', ioreg.kCFAllocatorDefault, ioreg.kNilOptions)) or 0))})")  # type: ignore
+                break
+            elif ioreg.IOObjectConformsTo(entry, "IOPCIBridge".encode()):
+                pass
+            else:
+                # There's something in between that's not PCI! Abort
+                paths = []
+                break
+            parent = ioreg.IORegistryEntryGetParentEntry(entry, "IOService".encode(), None)[1]
+            if entry != original_entry:
+                ioreg.IOObjectRelease(entry)
+            entry = parent
+        self.pci_path = "/".join(reversed(paths))
+
+
+@dataclass
+class GPU(PCIDevice):
+    arch: enum.Enum = field(init=False)  # The architecture, see subclasses.
+
+    def __post_init__(self):
+        self.detect_arch()
+
+    def detect_arch(self):
+        raise NotImplementedError
+
+
+@dataclass
+class WirelessCard(PCIDevice):
+    CLASS_CODE: ClassVar[int] = 0x028000  # 00800200 hexswapped
+    country_code: str = field(init=False)
+    chipset: enum.Enum = field(init=False)
+
+    def __post_init__(self):
+        self.detect_chipset()
+
+    @classmethod
+    def from_ioregistry(cls, entry: ioreg.io_registry_entry_t, anti_spoof=True):
+        device = super().from_ioregistry(entry, anti_spoof=anti_spoof)
+
+        matching_dict = {
+            "IOParentMatch": ioreg.corefoundation_to_native(ioreg.IORegistryEntryIDMatching(ioreg.IORegistryEntryGetRegistryEntryID(entry, None)[1])),
+            "IOProviderClass": "IO80211Interface",
+        }
+
+        interface = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, matching_dict, None)[1]), None)
+        if interface:
+            device.country_code = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(interface, "IO80211CountryCode", ioreg.kCFAllocatorDefault, ioreg.kNilOptions))  # type: ignore # If not present, will be None anyways
+        else:
+            device.country_code = None  # type: ignore
+
+        return device
+
+    def detect_chipset(self):
+        raise NotImplementedError
+
+
+@dataclass
+class NVMeController(PCIDevice):
+    CLASS_CODE: ClassVar[int] = 0x010802
+
+    aspm: Optional[int] = None
+    # parent_aspm: Optional[int] = None
+
+
+@dataclass
+class SATAController(PCIDevice):
+    CLASS_CODE: ClassVar[int] = 0x010601
+
+
+@dataclass
+class NVIDIA(GPU):
+    VENDOR_ID: ClassVar[int] = 0x10DE
+
+    class Archs(enum.Enum):
+        # pylint: disable=invalid-name
+        Fermi = "Fermi"
+        Tesla = "Tesla"
+        Kepler = "Kepler"
+        Unknown = "Unknown"
+
+    arch: Archs = field(init=False)
+
+    def detect_arch(self):
+        # G80/G80GL
+        if self.device_id in PCIIDArray.nvidia_ids.tesla_ids:
+            self.arch = NVIDIA.Archs.Tesla
+        elif self.device_id in PCIIDArray.nvidia_ids.fermi_ids:
+            self.arch = NVIDIA.Archs.Fermi
+        elif self.device_id in PCIIDArray.nvidia_ids.kepler_ids:
+            self.arch = NVIDIA.Archs.Kepler
+        else:
+            self.arch = NVIDIA.Archs.Unknown
+
+
+@dataclass
+class AMD(GPU):
+    VENDOR_ID: ClassVar[int] = 0x1002
+
+    class Archs(enum.Enum):
+        # pylint: disable=invalid-name
+        Legacy_GCN = "Legacy GCN"
+        TeraScale_1 = "TeraScale 1"
+        TeraScale_2 = "TeraScale 2"
+        Polaris = "Polaris"
+        Vega = "Vega"
+        Navi = "Navi"
+        Unknown = "Unknown"
+
+    arch: Archs = field(init=False)
+
+    def detect_arch(self):
+        if self.device_id in PCIIDArray.amd_ids.legacy_gcn_ids:
+            self.arch = AMD.Archs.Legacy_GCN
+        elif self.device_id in PCIIDArray.amd_ids.terascale_1_ids:
+            self.arch = AMD.Archs.TeraScale_1
+        elif self.device_id in PCIIDArray.amd_ids.terascale_2_ids:
+            self.arch = AMD.Archs.TeraScale_2
+        elif self.device_id in PCIIDArray.amd_ids.polaris_ids:
+            self.arch = AMD.Archs.Polaris
+        elif self.device_id in PCIIDArray.amd_ids.vega_ids:
+            self.arch = AMD.Archs.Vega
+        elif self.device_id in PCIIDArray.amd_ids.navi_ids:
+            self.arch = AMD.Archs.Navi
+        else:
+            self.arch = AMD.Archs.Unknown
+
+
+@dataclass
+class Intel(GPU):
+    VENDOR_ID: ClassVar[int] = 0x8086
+
+    class Archs(enum.Enum):
+        # pylint: disable=invalid-name
+        Iron_Lake = "Iron Lake"
+        Sandy_Bridge = "Sandy Bridge"
+        Ivy_Bridge = "Ivy Bridge"
+        Haswell = "Haswell"
+        Broadwell = "Broadwell"
+        Skylake = "Skylake"
+        Kaby_Lake = "Kaby Lake"
+        Coffee_Lake = "Coffee Lake"
+        Ice_Lake = "Ice Lake"
+        Unknown = "Unknown"
+
+    arch: Archs = field(init=False)
+
+    def detect_arch(self):
+        if self.device_id in PCIIDArray.intel_ids.iron_ids:
+            self.arch = Intel.Archs.Iron_Lake
+        elif self.device_id in PCIIDArray.intel_ids.sandy_ids:
+            self.arch = Intel.Archs.Sandy_Bridge
+        elif self.device_id in PCIIDArray.intel_ids.ivy_ids:
+            self.arch = Intel.Archs.Ivy_Bridge
+        elif self.device_id in PCIIDArray.intel_ids.haswell_ids:
+            self.arch = Intel.Archs.Haswell
+        elif self.device_id in PCIIDArray.intel_ids.broadwell_ids:
+            self.arch = Intel.Archs.Broadwell
+        elif self.device_id in PCIIDArray.intel_ids.skylake_ids:
+            self.arch = Intel.Archs.Skylake
+        elif self.device_id in PCIIDArray.intel_ids.kaby_lake_ids:
+            self.arch = Intel.Archs.Kaby_Lake
+        elif self.device_id in PCIIDArray.intel_ids.coffee_lake_ids:
+            self.arch = Intel.Archs.Coffee_Lake
+        elif self.device_id in PCIIDArray.intel_ids.ice_lake_ids:
+            self.arch = Intel.Archs.Ice_Lake
+        else:
+            self.arch = Intel.Archs.Unknown
+
+
+@dataclass
+class Broadcom(WirelessCard):
+    VENDOR_ID: ClassVar[int] = 0x14E4
+
+    class Chipsets(enum.Enum):
+        # pylint: disable=invalid-name
+        AirportBrcmNIC = "AirportBrcmNIC supported"
+        AirPortBrcm4360 = "AirPortBrcm4360 supported"
+        AirPortBrcm4331 = "AirPortBrcm4331 supported"
+        AirPortBrcm43224 = "AppleAirPortBrcm43224 supported"
+        Unknown = "Unknown"
+
+    chipset: Chipsets = field(init=False)
+
+    def detect_chipset(self):
+        if self.device_id in PCIIDArray.broadcom_ids.AirPortBrcmNIC:
+            self.chipset = Broadcom.Chipsets.AirportBrcmNIC
+        elif self.device_id in PCIIDArray.broadcom_ids.AirPortBrcm4360:
+            self.chipset = Broadcom.Chipsets.AirPortBrcm4360
+        elif self.device_id in PCIIDArray.broadcom_ids.AirPortBrcm4331:
+            self.chipset = Broadcom.Chipsets.AirPortBrcm4331
+        elif self.device_id in PCIIDArray.broadcom_ids.AppleAirPortBrcm43224:
+            self.chipset = Broadcom.Chipsets.AirPortBrcm43224
+        else:
+            self.chipset = Broadcom.Chipsets.Unknown
+
+
+@dataclass
+class Atheros(WirelessCard):
+    VENDOR_ID: ClassVar[int] = 0x168C
+
+    class Chipsets(enum.Enum):
+        # pylint: disable=invalid-name
+        # Well there's only one model but
+        AirPortAtheros40 = "AirPortAtheros40 supported"
+        Unknown = "Unknown"
+
+    chipset: Chipsets = field(init=False)
+
+    def detect_chipset(self):
+        if self.device_id in PCIIDArray.atheros_ids.AtherosWifi:
+            self.chipset = Atheros.Chipsets.AirPortAtheros40
+        else:
+            self.chipset = Atheros.Chipsets.Unknown
+
+
+@dataclass
+class Computer:
+    real_model: Optional[str] = None
+    real_board_id: Optional[str] = None
+    reported_model: Optional[str] = None
+    reported_board_id: Optional[str] = None
+    gpus: list[GPU] = field(default_factory=list)
+    igpu: Optional[GPU] = None  # Shortcut for IGPU
+    dgpu: Optional[GPU] = None  # Shortcut for GFX0
+    storage: list[PCIDevice] = field(default_factory=list)
+    wifi: Optional[WirelessCard] = None
+    cpu: Optional[CPU] = None
+    oclp_version: Optional[str] = None
+    opencore_version: Optional[str] = None
+    bluetooth_chipset: Optional[str] = None
+
+    @staticmethod
+    def probe():
+        computer = Computer()
+        computer.gpu_probe()
+        computer.dgpu_probe()
+        computer.igpu_probe()
+        computer.wifi_probe()
+        computer.storage_probe()
+        computer.smbios_probe()
+        computer.cpu_probe()
+        computer.bluetooth_probe()
+        return computer
+
+    def gpu_probe(self):
+        # Chain together two iterators: one for class code 00000300, the other for class code 00800300
+        devices = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(
+                ioreg.kIOMasterPortDefault, {"IOProviderClass": "IOPCIDevice", "IOPropertyMatch": [{"class-code": binascii.a2b_hex("00000300")}, {"class-code": binascii.a2b_hex("00800300")}]}, None
+            )[1]
+        )
+
+        for device in devices:
+            vendor: Type[GPU] = PCIDevice.from_ioregistry(device).vendor_detect(inherits=GPU)  # type: ignore
+            if vendor:
+                self.gpus.append(vendor.from_ioregistry(device))  # type: ignore
+            ioreg.IOObjectRelease(device)
+
+    def dgpu_probe(self):
+        device = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceNameMatching("GFX0".encode()), None)[1]), None)
+        if not device:
+            # No devices
+            return
+
+        vendor: Type[GPU] = PCIDevice.from_ioregistry(device).vendor_detect(inherits=GPU)  # type: ignore
+        if vendor:
+            self.dgpu = vendor.from_ioregistry(device)  # type: ignore
+        ioreg.IOObjectRelease(device)
+
+    def igpu_probe(self):
+        device = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceNameMatching("IGPU".encode()), None)[1]), None)
+        if not device:
+            # No devices
+            return
+
+        vendor: Type[GPU] = PCIDevice.from_ioregistry(device).vendor_detect(inherits=GPU)  # type: ignore
+        if vendor:
+            self.igpu = vendor.from_ioregistry(device)  # type: ignore
+        ioreg.IOObjectRelease(device)
+
+    def wifi_probe(self):
+        # result = subprocess.run("ioreg -r -c IOPCIDevice -a -d2".split(), stdout=subprocess.PIPE).stdout.strip()
+        devices = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(
+                ioreg.kIOMasterPortDefault,
+                {"IOProviderClass": "IOPCIDevice", "IOPropertyMatch": {"class-code": binascii.a2b_hex(Utilities.hexswap(hex(WirelessCard.CLASS_CODE)[2:].zfill(8)))}},
+                None,
+            )[1]
+        )
+
+        for device in devices:
+            vendor: Type[WirelessCard] = PCIDevice.from_ioregistry(device, anti_spoof=True).vendor_detect(inherits=WirelessCard)  # type: ignore
+            if vendor:
+                self.wifi = vendor.from_ioregistry(device, anti_spoof=True)  # type: ignore
+                break
+            ioreg.IOObjectRelease(device)
+
+    def storage_probe(self):
+        sata_controllers = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(
+                ioreg.kIOMasterPortDefault,
+                {"IOProviderClass": "IOPCIDevice", "IOPropertyMatch": [{"class-code": binascii.a2b_hex(Utilities.hexswap(hex(SATAController.CLASS_CODE)[2:].zfill(8)))}]},
+                None,
+            )[1]
+        )
+        nvme_controllers = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(
+                ioreg.kIOMasterPortDefault, {"IOProviderClass": "IONVMeController", "IOParentMatch": {"IOProviderClass": "IOPCIDevice"}, "IOPropertyMatch": {"IOClass": "IONVMeController"}}, None
+            )[1]
+        )
+        for device in sata_controllers:
+            self.storage.append(SATAController.from_ioregistry(device))
+            ioreg.IOObjectRelease(device)
+        for device in nvme_controllers:
+            parent = ioreg.IORegistryEntryGetParentEntry(device, "IOService".encode(), None)[1]
+            ioreg.IOObjectRelease(device)
+
+            aspm: Union[int, bytes] = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(parent, "pci-aspm-default", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)) or 0  # type: ignore
+            if isinstance(aspm, bytes):
+                aspm = int.from_bytes(aspm, byteorder="little")
+
+            controller = NVMeController.from_ioregistry(parent)
+            controller.aspm = aspm
+
+            if controller.vendor_id != 0x106B:
+                self.storage.append(controller)
+
+            ioreg.IOObjectRelease(parent)
+
+    def smbios_probe(self):
+        # Reported model
+        entry = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceMatching("IOPlatformExpertDevice".encode()), None)[1]))
+        self.reported_model = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, "model", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)).strip(b"\0").decode()  # type: ignore
+        translated = subprocess.run("sysctl -in sysctl.proc_translated".split(), stdout=subprocess.PIPE).stdout.decode()
+        if translated:
+            board = "target-type"
+        else:
+            board = "board-id"
+        self.reported_board_id = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, board, ioreg.kCFAllocatorDefault, ioreg.kNilOptions)).strip(b"\0").decode()  # type: ignore
+        ioreg.IOObjectRelease(entry)
+
+        # Real model
+        # TODO: We previously had logic for OC users using iMacPro1,1 with incorrect ExposeSensitiveData. Add logic?
+        self.real_model = Utilities.get_nvram("oem-product", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True) or self.reported_model
+        self.real_board_id = Utilities.get_nvram("oem-board", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True) or self.reported_board_id
+
+        # OCLP version
+        self.oclp_version = Utilities.get_nvram("OCLP-Version", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True)
+        self.opencore_version = Utilities.get_nvram("opencore-version", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True)
+
+    def cpu_probe(self):
+        self.cpu = CPU(
+            subprocess.run("sysctl machdep.cpu.brand_string".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip(),
+            subprocess.run("sysctl machdep.cpu.features".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip().split(" "),
+        )
+
+    def bluetooth_probe(self):
+        usb_data: str = subprocess.run("system_profiler SPUSBDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
+        if "BRCM2070 Hub" in usb_data:
+            self.bluetooth_chipset = "BRCM2070 Hub"
+        elif "BRCM2046 Hub" in usb_data:
+            self.bluetooth_chipset = "BRCM2046 Hub"
+        elif "BRCM20702 Hub" in usb_data:
+            self.bluetooth_chipset = "BRCM20702 Hub"
+        elif "Bluetooth":
+            self.bluetooth_chipset = "Generic"

Resources/ioreg.py

@@ -0,0 +1,253 @@
+# Handle misc CLI menu options
+# Copyright (C) 2020-2021, Dhinak G
+
+from __future__ import annotations
+
+from typing import NewType, Union
+import subprocess
+
+try:
+	import objc
+except ImportError:
+	subprocess.run(["pip3", "install", "pyobjc"], stdout=subprocess.PIPE)
+	try:
+		import objc
+	except ImportError:
+		raise Exception("Missing PyObjc library!\nPlease run the following before starting OCLP:\npip3 install pyobjc")
+
+from CoreFoundation import CFRelease, kCFAllocatorDefault  # type: ignore # pylint: disable=no-name-in-module
+from Foundation import NSBundle  # type: ignore # pylint: disable=no-name-in-module
+from PyObjCTools import Conversion
+
+IOKit_bundle = NSBundle.bundleWithIdentifier_("com.apple.framework.IOKit")
+
+# pylint: disable=invalid-name
+io_name_t_ref_out = b"[128c]"  # io_name_t is char[128]
+const_io_name_t_ref_in = b"r*"
+CFStringRef = b"^{__CFString=}"
+CFDictionaryRef = b"^{__CFDictionary=}"
+CFAllocatorRef = b"^{__CFAllocator=}"
+# pylint: enable=invalid-name
+
+# https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/ObjCRuntimeGuide/Articles/ocrtTypeEncodings.html
+functions = [
+    ("IORegistryEntryCreateCFProperties", b"IIo^@" + CFAllocatorRef + b"I"),
+    ("IOServiceMatching", CFDictionaryRef + b"r*"),
+    ("IOServiceGetMatchingServices", b"II" + CFDictionaryRef + b"o^I"),
+    ("IOIteratorNext", b"II"),
+    ("IORegistryEntryGetParentEntry", b"IIr*o^I"),
+    ("IOObjectRelease", b"II"),
+    ("IORegistryEntryGetName", b"IIo" + io_name_t_ref_out),
+    ("IOObjectGetClass", b"IIo" + io_name_t_ref_out),
+    ("IOObjectCopyClass", CFStringRef + b"I"),
+    ("IOObjectCopySuperclassForClass", CFStringRef + CFStringRef),
+    ("IORegistryEntryGetChildIterator", b"IIr*o^I"),
+    ("IORegistryCreateIterator", b"IIr*Io^I"),
+    ("IORegistryEntryCreateIterator", b"IIr*Io^I"),
+    ("IORegistryIteratorEnterEntry", b"II"),
+    ("IORegistryIteratorExitEntry", b"II"),
+    ("IORegistryEntryCreateCFProperty", b"@I" + CFStringRef + CFAllocatorRef + b"I"),
+    ("IORegistryEntryGetPath", b"IIr*oI"),
+    ("IORegistryEntryCopyPath", CFStringRef + b"Ir*"),
+    ("IOObjectConformsTo", b"II" + const_io_name_t_ref_in),
+    ("IORegistryEntryGetLocationInPlane", b"II" + const_io_name_t_ref_in + b"o" + io_name_t_ref_out),
+    ("IOServiceNameMatching", CFDictionaryRef + b"r*"),
+    ("IORegistryEntryGetRegistryEntryID", b"IIo^Q"),
+    ("IORegistryEntryIDMatching", CFDictionaryRef + b"Q"),
+    ("IORegistryEntryFromPath", b"II" + const_io_name_t_ref_in),
+]
+
+variables = [("kIOMasterPortDefault", b"I")]
+
+# pylint: disable=invalid-name
+pointer = type(None)
+
+kern_return_t = NewType("kern_return_t", int)
+boolean_t = int
+
+io_object_t = NewType("io_object_t", object)
+io_name_t = bytes
+io_string_t = bytes
+
+# io_registry_entry_t = NewType("io_registry_entry_t", io_object_t)
+io_registry_entry_t = io_object_t
+io_iterator_t = NewType("io_iterator_t", io_object_t)
+
+CFTypeRef = Union[int, float, bytes, dict, list]
+
+IOOptionBits = int
+mach_port_t = int
+CFAllocatorType = type(kCFAllocatorDefault)
+
+NULL = 0
+
+kIOMasterPortDefault: mach_port_t
+kNilOptions: IOOptionBits = NULL
+
+# IOKitLib.h
+kIORegistryIterateRecursively = 1
+kIORegistryIterateParents = 2
+
+# pylint: enable=invalid-name
+
+
+# kern_return_t IORegistryEntryCreateCFProperties(io_registry_entry_t entry, CFMutableDictionaryRef * properties, CFAllocatorRef allocator, IOOptionBits options);
+def IORegistryEntryCreateCFProperties(entry: io_registry_entry_t, properties: pointer, allocator: CFAllocatorType, options: IOOptionBits) -> tuple[kern_return_t, dict]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFMutableDictionaryRef IOServiceMatching(const char * name);
+def IOServiceMatching(name: bytes) -> dict:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IOServiceGetMatchingServices(mach_port_t masterPort, CFDictionaryRef matching CF_RELEASES_ARGUMENT, io_iterator_t * existing);
+def IOServiceGetMatchingServices(masterPort: mach_port_t, matching: dict, existing: pointer) -> tuple[kern_return_t, io_iterator_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# io_object_t IOIteratorNext(io_iterator_t iterator);
+def IOIteratorNext(iterator: io_iterator_t) -> io_object_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetParentEntry(io_registry_entry_t entry, const io_name_t plane, io_registry_entry_t * parent);
+def IORegistryEntryGetParentEntry(entry: io_registry_entry_t, plane: io_name_t, parent: pointer) -> tuple[kern_return_t, io_registry_entry_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IOObjectRelease(io_object_t object);
+def IOObjectRelease(object: io_object_t) -> kern_return_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetName(io_registry_entry_t entry, io_name_t name);
+def IORegistryEntryGetName(entry: io_registry_entry_t, name: pointer) -> tuple[kern_return_t, bytes]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IOObjectGetClass(io_object_t object, io_name_t className);
+def IOObjectGetClass(object: io_object_t, className: pointer) -> tuple[kern_return_t, bytes]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFStringRef IOObjectCopyClass(io_object_t object);
+def IOObjectCopyClass(object: io_object_t) -> str:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFStringRef IOObjectCopySuperclassForClass(CFStringRef classname)
+def IOObjectCopySuperclassForClass(classname: str) -> str:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetChildIterator(io_registry_entry_t entry, const io_name_t plane, io_iterator_t * iterator);
+def IORegistryEntryGetChildIterator(entry: io_registry_entry_t, plane: io_name_t, iterator: pointer) -> tuple[kern_return_t, io_iterator_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryCreateIterator(mach_port_t masterPort, const io_name_t plane, IOOptionBits options, io_iterator_t * iterator)
+def IORegistryCreateIterator(masterPort: mach_port_t, plane: io_name_t, options: IOOptionBits, iterator: pointer) -> tuple[kern_return_t, io_iterator_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryCreateIterator(io_registry_entry_t entry, const io_name_t plane, IOOptionBits options, io_iterator_t * iterator)
+def IORegistryEntryCreateIterator(entry: io_registry_entry_t, plane: io_name_t, options: IOOptionBits, iterator: pointer) -> tuple[kern_return_t, io_iterator_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryIteratorEnterEntry(io_iterator_t iterator)
+def IORegistryIteratorEnterEntry(iterator: io_iterator_t) -> kern_return_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryIteratorExitEntry(io_iterator_t iterator)
+def IORegistryIteratorExitEntry(iterator: io_iterator_t) -> kern_return_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFTypeRef IORegistryEntryCreateCFProperty(io_registry_entry_t entry, CFStringRef key, CFAllocatorRef allocator, IOOptionBits options);
+def IORegistryEntryCreateCFProperty(entry: io_registry_entry_t, key: str, allocator: CFAllocatorType, options: IOOptionBits) -> CFTypeRef:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetPath(io_registry_entry_t entry, const io_name_t plane, io_string_t path);
+def IORegistryEntryGetPath(entry: io_registry_entry_t, plane: io_name_t, path: pointer) -> tuple[kern_return_t, io_string_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFStringRef IORegistryEntryCopyPath(io_registry_entry_t entry, const io_name_t plane)
+def IORegistryEntryCopyPath(entry: io_registry_entry_t, plane: bytes) -> str:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# boolean_t IOObjectConformsTo(io_object_t object, const io_name_t className)
+def IOObjectConformsTo(object: io_object_t, className: bytes) -> boolean_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetLocationInPlane(io_registry_entry_t entry, const io_name_t plane, io_name_t location)
+def IORegistryEntryGetLocationInPlane(entry: io_registry_entry_t, plane: io_name_t, location: pointer) -> tuple[kern_return_t, bytes]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFMutableDictionaryRef IOServiceNameMatching(const char * name);
+def IOServiceNameMatching(name: bytes) -> dict:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetRegistryEntryID(io_registry_entry_t entry, uint64_t * entryID)
+def IORegistryEntryGetRegistryEntryID(entry: io_registry_entry_t, entryID: pointer) -> tuple[kern_return_t, int]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFMutableDictionaryRef IORegistryEntryIDMatching(uint64_t entryID);
+def IORegistryEntryIDMatching(entryID: int) -> dict:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# io_registry_entry_t IORegistryEntryFromPath(mach_port_t mainPort, const io_string_t path)
+def IORegistryEntryFromPath(mainPort: mach_port_t, path: io_string_t) -> io_registry_entry_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+objc.loadBundleFunctions(IOKit_bundle, globals(), functions)  # type: ignore # pylint: disable=no-member
+objc.loadBundleVariables(IOKit_bundle, globals(), variables)  # type: ignore # pylint: disable=no-member
+
+
+def ioiterator_to_list(iterator: io_iterator_t):
+    # items = []
+    item = IOIteratorNext(iterator)  # noqa: F821
+    while item:
+        # items.append(next)
+        yield item
+        item = IOIteratorNext(iterator)  # noqa: F821
+    IOObjectRelease(iterator)  # noqa: F821
+    # return items
+
+
+def corefoundation_to_native(collection):
+    if collection is None:  # nullptr
+        return None
+    native = Conversion.pythonCollectionFromPropertyList(collection)
+    CFRelease(collection)
+    return native
+
+
+def native_to_corefoundation(native):
+    return Conversion.propertyListFromPythonCollection(native)
+
+
+def io_name_t_to_str(name):
+    return name.partition(b"\0")[0].decode()
+
+
+def get_class_inheritance(io_object):
+    classes = []
+    cls = IOObjectCopyClass(io_object)
+    while cls:
+        # yield cls
+        classes.append(cls)
+        CFRelease(cls)
+        cls = IOObjectCopySuperclassForClass(cls)
+    return classes

Resources/models.json

@@ -1,303 +0,0 @@
-[
-    {
-        "models": [
-            "MacBook5,1",
-            "MacBook5,2"
-        ],
-        "patches": [
-            "WifiBCM94322",
-            "LegacyAudio",
-            "MissingSSE42",
-            "EthernetNvidia",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBook6,1",
-            "MacBook7,1"
-        ],
-        "patches": [
-            "WifiBCM943224",
-            "LegacyAudio",
-            "MissingSSE42",
-            "EthernetNvidia",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBookAir2,1",
-            "MacBookAir3,1",
-            "MacBookAir3,2"
-        ],
-        "patches": [
-            "WifiBCM94322",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBookAir4,1",
-            "MacBookAir4,2"
-        ],
-        "patches": [
-            "WifiBCM94322",
-            "LegacyAudio",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBookAir5,1",
-            "MacBookAir5,2"
-        ],
-        "patches": [
-            "WifiBCM94322"
-        ]
-    },
-    {
-        "models": [
-            "MacBookPro3,1"
-        ],
-        "patches": [
-            "WifiAtheros",
-            "EthernetMarvell",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBookPro4,1"
-        ],
-        "patches": [
-            "WifiBCM94328",
-            "EthernetMarvell",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBookPro5,1",
-            "MacBookPro5,2",
-            "MacBookPro5,3",
-            "MacBookPro5,4",
-            "MacBookPro5,5"
-        ],
-        "patches": [
-            "WifiBCM94322",
-            "EthernetNvidia",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBookPro6,1",
-            "MacBookPro6,2"
-        ],
-        "patches": [
-            "WifiBCM943224",
-            "EthernetBroadcom",
-            "LegacyAudio",
-            "LegacyGPU",
-            "PCIBridge"
-        ]
-    },
-    {
-        "models": [
-            "MacBookPro7,1"
-        ],
-        "patches": [
-            "WifiBCM94322",
-            "EthernetNvidia",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBookPro8,1",
-            "MacBookPro8,2",
-            "MacBookPro8,3"
-        ],
-        "patches": [
-            "WifiBCM94331",
-            "EthernetBroadcom",
-            "LegacyAudio",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacBookPro9,1",
-            "MacBookPro9,2",
-            "MacBookPro10,1",
-            "MacBookPro10,2"
-        ],
-        "patches": [
-            "WifiBCM94331"
-        ]
-    },
-    {
-        "models": [
-            "MacMini3,1",
-            "MacMini4,1"
-        ],
-        "patches": [
-            "WifiBCM943224",
-            "EthernetNvidia",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "Macmini5,1",
-            "Macmini5,2",
-            "Macmini5,3"
-        ],
-        "patches": [
-            "WifiBCM94331",
-            "EthernetBroadcom",
-            "LegacyAudio",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "MacMini6,1",
-            "MacMini6,2"
-        ],
-        "patches": [
-            "WifiBCM94331"
-        ]
-    },
-    {
-        "models": [
-            "iMac7,1",
-            "iMac8,1"
-        ],
-        "patches": [
-            "WifiBCM94328",
-            "EthernetNvidia",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "iMac9,1"
-        ],
-        "patches": [
-            "WifiBCM94322",
-            "EthernetNvidia",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "iMac10,1"
-        ],
-        "patches": [
-            "WifiAtheros",
-            "EthernetNvidia",
-            "LegacyAudio",
-            "MissingSSE42",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "iMac11,1",
-            "iMac11,2",
-            "iMac11,3"
-        ],
-        "patches": [
-            "WifiAtheros",
-            "EthernetBroadcom",
-            "LegacyAudio",
-            "LegacyGPU",
-            "PCIBridge"
-        ]
-    },
-    {
-        "models": [
-            "iMac12,1",
-            "iMac12,2"
-        ],
-        "patches": [
-            "WifiAtheros",
-            "EthernetBroadcom",
-            "LegacyAudio",
-            "LegacyGPU"
-        ]
-    },
-    {
-        "models": [
-            "iMac13,1",
-            "iMac13,2"
-        ],
-        "patches": [
-            "WifiBCM94331"
-        ]
-    },
-    {
-        "models": [
-            "iMac14,1",
-            "iMac14,2",
-            "iMac14,3"
-        ],
-        "patches": []
-    },
-    {
-        "models": [
-            "MacPro3,1"
-        ],
-        "patches": [
-            "WifiAtheros",
-            "LegacyAudio",
-            "MissingSSE42",
-            "SSEEmulator",
-            "DualSocket"
-        ]
-    },
-    {
-        "models": [
-            "MacPro4,1"
-        ],
-        "patches": [
-            "WifiAtheros",
-            "DualSocket"
-        ]
-    },
-    {
-        "models": [
-            "MacPro5,1"
-        ],
-        "patches": [
-            "WifiBCM94322",
-            "DualSocket"
-        ]
-    },
-    {
-        "models": [
-            "Xserve3,1"
-        ],
-        "patches": [
-            "DualSocket"
-        ]
-    }
-]

Resources/utilities.py

@@ -1,124 +0,0 @@
-# Copyright (C) 2020-2021, Dhinak G
-from __future__ import print_function
-
-import os
-import math as m
-
-
-def header(lines):
-    lines = [i for i in lines if i is not None]
-    total_length = len(max(lines, key=len)) + 4
-    print("#" * (total_length))
-    for line in lines:
-        left_side = m.floor(((total_length - 2 - len(line.strip())) / 2))
-        print("#" + " " * left_side + line.strip() + " " * (total_length - len("#" + " " * left_side + line.strip()) - 1) + "#")
-    print("#" * total_length)
-
-
-def cls():
-    os.system('cls' if os.name == 'nt' else 'clear')
-
-# def menu(title, prompt, menu_options, add_quit=True, auto_number=False, in_between=[], top_level=False):
-#     return_option = ["Q", "Quit", None] if top_level else ["B", "Back", None]
-#     if add_quit: menu_options.append(return_option)
-
-#     cls()
-#     header(title)
-#     print()
-
-#     for i in in_between: print(i)
-#     if in_between: print()
-
-#     for index, option in enumerate(menu_options):
-#         if auto_number and not (index == (len(menu_options) - 1) and add_quit):
-#             option[0] = str((index + 1))
-#         print(option[0] + ".  " + option[1])
-
-#     print()
-#     selected = input(prompt)
-
-#     keys = [option[0].upper() for option in menu_options]
-#     if not selected or selected.upper() not in keys:
-#         return
-#     if selected.upper() == return_option[0]:
-#         return -1
-#     else:
-#         menu_options[keys.index(selected.upper())][2]() if menu_options[keys.index(selected.upper())][2] else None
-
-
-class TUIMenu():
-    def __init__(self, title, prompt, options=None, return_number_instead_of_direct_call=False, add_quit=True, auto_number=False, in_between=None, top_level=False, loop=False):
-        self.title = title
-        self.prompt = prompt
-        self.in_between = in_between or []
-        self.options = options or []
-        self.return_number_instead_of_direct_call = return_number_instead_of_direct_call
-        self.auto_number = auto_number
-        self.add_quit = add_quit
-        self.top_level = top_level
-        self.loop = loop
-        self.added_quit = False
-
-    def add_menu_option(self, name, description="", function=None, key=""):
-        self.options.append([key, name, description, function])
-
-    def start(self):
-        return_option = ["Q", "Quit"] if self.top_level else ["B", "Back"]
-        if self.add_quit and not self.added_quit:
-            self.add_menu_option(
-                return_option[1], function=None, key=return_option[0])
-            self.added_quit = True
-
-        while True:
-            cls()
-            header(self.title)
-            print()
-
-            for i in self.in_between:
-                print(i)
-            if self.in_between:
-                print()
-
-            for index, option in enumerate(self.options):
-                if self.auto_number and not (index == (len(self.options) - 1) and self.add_quit):
-                    option[0] = str((index + 1))
-                print(option[0] + ".  " + option[1])
-                for i in option[2]:
-                    print("\t" + i)
-
-            print()
-            selected = input(self.prompt)
-
-            keys = [option[0].upper() for option in self.options]
-            if not selected or selected.upper() not in keys:
-                if self.loop:
-                    continue
-                else:
-                    return
-            if self.add_quit and selected.upper() == return_option[0]:
-                return -1
-            elif self.return_number_instead_of_direct_call:
-                return self.options[keys.index(selected.upper())][0]
-            else:
-                self.options[keys.index(selected.upper())][3]() if self.options[keys.index(selected.upper())][3] else None
-                if not self.loop:
-                    return
-
-
-class TUIOnlyPrint():
-    def __init__(self, title, prompt, in_between=None):
-        self.title = title
-        self.prompt = prompt
-        self.in_between = in_between or []
-
-    def start(self):
-        cls()
-        header(self.title)
-        print()
-
-        for i in self.in_between:
-            print(i)
-        if self.in_between:
-            print()
-
-        return input(self.prompt)

create-offline-build.py

@@ -0,0 +1,14 @@
+import subprocess
+from Resources import Constants
+
+patcher_support_pkg_version = Constants.Constants().patcher_support_pkg_version
+binary_packages = ["10.14-Mojave", "10.15-Catalina", "11-Big-Sur", "12-Monterey"]
+
+for binary_package in binary_packages:
+    print(f"- Downloading {binary_package}...")
+    download_cmd = f"curl -LO https://github.com/dortania/PatcherSupportPkg/releases/download/{patcher_support_pkg_version}/{binary_package}.zip"
+    subprocess.run(download_cmd, shell=True)
+    print("- Moving into payloads")
+    move_cmd = f"mv {binary_package}.zip ./payloads/"
+    subprocess.run(move_cmd, shell=True)
+print("- Download complete")

docs/.vuepress/config.js

@@ -93,15 +93,26 @@ module.exports = {
             ]
 
         },
+        {
+            title: 'macOS Monterey',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'MONTEREY-DROP',
+            ]
+        },
         {
             title: 'Misc',
             collapsable: false,
             sidebarDepth: 1,
             children: [
+				'ACCEL',
 				'TROUBLESHOOTING',
 				'DEBUG',
+				'UPDATE',
 				'UNINSTALL',
 				'ICNS',
+				'WINDOWS',
             ]
         },
         {
@@ -119,9 +130,11 @@ module.exports = {
             collapsable: false,
             sidebarDepth: 1,
             children: [
+				'TESTED',
 				'TERMS',
 				'HOW',
 				'PATCHEXPLAIN',
+				'CLI',
             ]
 
         },

docs/ACCEL.md

@@ -0,0 +1,138 @@
+# Working Around Legacy Acceleration Issues
+
+* [Downloading older non-Metal Apps](#downloading-older-non-metal-apps)
+* [Unable to run Zoom](#unable-to-run-zoom)
+* [Unable to grant special permissions to apps (ie. Camera Access to Zoom)](#unable-to-grant-special-permissions-to-apps-ie-camera-access-to-zoom)
+* [Keyboard Backlight broken](#keyboard-backlight-broken)
+* [Photos and Maps Apps Heavily Distorted](#photos-and-maps-apps-heavily-distorted)
+* [Cannot press "Done" when editing a Sidebar Widget](#cannot-press-done-when-editing-a-sidebar-widget)
+* [Wake from sleep heavily distorted on AMD/ATI in macOS 11.3 and newer](#wake-from-sleep-heavily-distorted-on-amd-ati-in-macos-11-3-and-newer)
+* [Unable to switch GPUs on 2011 15" and 17" MacBook Pros](#unable-to-switch-gpus-on-2011-15-and-17-macbook-pros)
+* [Erratic Colours on ATI TeraScale 2 GPUs (HD5000/HD6000)](#erratic-colours-on-ati-terascale-2-gpus-hd5000-hd6000)
+
+The below page is for users experiencing issues with their overall usage of macOS Big Sur and the Legacy Graphics Acceleration patches. Note that the following GPUs currently do not have acceleration support in Big Sur:
+
+* Intel 3rd and 4th Gen - GMA series
+
+For those unfamiliar with what is considered a non-Metal GPU, see below chart:
+
+::: details macOS GPU Chart
+
+| Graphics Vendor | Architecture | Series | Supports Metal |
+| :--- | :--- | :--- | :--- |
+| ATI | TeraScale 1 | HD2000 - HD4000 | <span style="color:red">No</span> |
+| ^^ | TeraScale 2 | HD5000 - HD6000 | ^^ |
+| AMD | GCN (and newer) | HD7000+ | <span style="color:green">Yes</span> |
+| Nvidia | Tesla | 8000GT - GT300 |  <span style="color:red">No</span> |
+| ^^ | Fermi | GT400 - GT500 | ^^ | 
+| ^^ | Kepler | GT600 - GT700 | <span style="color:green">Yes</span> |
+| Intel | GMA | GMA900 - GMA3000 | <span style="color:red">No</span> |
+| ^^ | Iron Lake | HD series | ^^ |
+| ^^ | Sandy Bridge | HD3000 | ^^ |
+| ^^ | Ivy Bridge (and newer) | HD4000 | <span style="color:green">Yes</span> |
+
+:::
+
+Additionally we currently do not have macOS Monterey acceleration patches for non-Metal Macs. We recommend users either upgrade their Macs with a Metal GPU or remain on Big Sur until further development
+
+::: details Why there's no non-Metal patches for Monterey
+
+With macOS Monterey, please understand our current legacy acceleration patch sets are no longer functional. As of right now, only basic framebuffer and brightness control may be achieved, however proper animations and hardware acceleration is not available.
+
+This is due to numerous changes with Skylight and other macOS frameworks relying more and more on Metal functions and thus making it even more difficult to re-add legacy OpenGL support.
+
+> When can we expect acceleration support
+
+For the time being, please understand we cannot predict when there will be patch sets ready. Note that it took over 300 days from Big Sur's unveiling to achieve public acceleration for non-Metal GPUs. And with TeraScale 2 acceleration, this took almost 3 years to achieve public acceleration.
+
+So please be patient as developers are hard at work, however please expect no acceleration support in Monterey until next year at the minimum if not even later.
+
+:::
+
+## Downloading older non-Metal Apps
+
+Many Apple apps now have direct reliance on Metal for proper functioning, however legacy builds of these apps still do work in Big Sur. See below for archive of many apps such as Pages, iMovie, GarageBand.
+
+* [Apple Apps for Non-Metal Macs](https://archive.org/details/apple-apps-for-non-metal-macs)
+
+Note: This archive assumes that you own these copies of these apps through the Mac App Store, Dortania does not condone piracy
+
+## Unable to run Zoom
+
+Currently Zoom relies partially on Metal and so needs a small binary patch. Dosdude1 has provided a nice script for this:
+
+* [Zoom Non-Metal Fix](http://dosdude1.com/catalina/zoomnonmetal-new.command.zip)
+
+## Unable to grant special permissions to apps (ie. Camera Access to Zoom)
+
+With version 0.2.5, this issue should be full resolved
+
+::: details 0.2.4 and older Work-Around
+
+Due to the usage of `amfi_get_out_of_my_way=1`, macOS will fail to prompt users for special permissions upon application start as well as omit the entires in System Preferences. To work around this, we recommend users install [tccplus](https://github.com/jslegendre/tccplus) to manage permissions.
+
+Example usage with Discord and microphone permissions:
+
+```sh
+# Open Terminal and run the following commands
+cd ~/Downloads/
+chmod +x tccplus
+./tccplus add Microphone com.hnc.Discord
+```
+
+For those who may experience issues with `tccplus`, you can manually patch `com.apple.TCC` to add permissions:
+
+```sh
+# get app id (Zoom.us used in example):
+$ osascript -e 'id of app "zoom.us"'
+# output: us.zoom.xos
+
+$ sudo sqlite3 ~/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT or REPLACE INTO access VALUES('kTCCServiceMicrophone','us.zoom.xos',0,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1541440109);"
+
+$ sudo sqlite3 ~/Library/Application\ Support/com.apple.TCC/TCC.db "INSERT or REPLACE INTO access VALUES('kTCCServiceCamera','us.zoom.xos',0,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1541440109);"
+```
+
+:::
+
+## Keyboard Backlight broken
+
+Due to forcing `hidd` into spinning up with the fallback mode enabled, this can break the OS's recognition of backlight keyboards. Thankfully the drivers themselves still do operate so applications such as [LabTick](https://www.macupdate.com/app/mac/22151/lab-tick) are able to set the brightness manually.
+
+## Photos and Maps Apps Heavily Distorted
+
+Due to the Metal Backend, the enhanced color output of these apps seems to heavily break overall UI usage. To work around this, [users reported](https://forums.macrumors.com/threads/macos-11-big-sur-on-unsupported-macs-thread.2242172/post-29870324) forcing the color output of their monitor from Billions to Millions of colors helped greatly. Apps easily allowing this customization are [SwitchResX](https://www.madrau.com), [ResXreme](https://macdownload.informer.com/resxtreme/) and [EasyRes](http://easyresapp.com).
+
+## Cannot press "Done" when editing a Sidebar Widget
+
+To work around this, simply press Tab to hover over and press spacebar to simulate a click.
+
+## 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
+
+* 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:
+
+* [Install macOS 11.2.3 20D91](https://archive.org/details/install-mac-os-11.2.3-20-d-91)
+
+## Unable to switch GPUs on 2011 15" and 17" MacBook Pros
+
+Currently OpenCore Legacy Patcher, GPU switching between the iGPU and dGPU is broken. The simplest way to set a specific GPU is to disable the dGPU when you wish to remain on the more power efficient iGPU.
+
+The best way to achieve this is to boot Recovery (or Single User Mode if the dGPU refuses to function at all) and run the following command:
+
+```sh
+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 in theory. However, currently the proprietary DisplayLink driver refuses to function on legacy-patched systems, either resulting in a windowserver crash loop or no output at all. 
+
+## Erratic Colours on ATI TeraScale 2 GPUs (HD5000/HD6000)
+
+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.
+
+Applications that can set color depth are:
+
+* [SwitchResX](https://www.madrau.com)
+* [ResXtreme](https://macdownload.informer.com/resxtreme/)

docs/BENIFITS.md

@@ -2,20 +2,23 @@
 
 With OpenCore Legacy Patcher we recommend users go through the below table to understand what the benefits and drawbacks are compared to other patchers. There are positive and negatives to each and we feel transparency is most important when patching another users machine. There should be no grey areas where users may be mislead.
 
+* Note: [Patched Sur](https://github.com/BenSova/Patched-Sur) and [MicropatcherAutomator](https://github.com/moosethegoose2213/automator-for-barrykn-micropatcher) are iterations of [BarryKN's micropatcher](https://github.com/barrykn/big-sur-micropatcher) and therefore share many of the same benefits and limitations. Patched Sur is used for this comparison as it's the most common form of BarryKN's patcher users will find.
+
 | Features | [OpenCore Legacy Patcher](https://github.com/dortania/OpenCore-Legacy-Patcher/) | [Patched Sur](https://github.com/BenSova/Patched-Sur) |
 | :--- | :--- | :--- |
-| Over The Air Updates | <span style="color:#30BCD5">Native System Preferences, additionally supports Deltas (~2GB) for Metal GPUs</span> | <span style="color:red">Inside Patcher Sur app (~12GB), only available when InstallAssistants release</span> |
-| FileVault | <span style="color:#30BCD5">Supported on Metal GPUs</span> | <span style="color:red">Not supported</span> | 
-| System Integrity Protection | <span style="color:#30BCD5">Fully enabled on Metal GPUs</span> | <span style="color:red">Disabled for early 2013 and older</span> |
+| Over The Air Updates | <span style="color:#30BCD5">Native System Preferences, additionally supports Deltas (~2GB) for Metal GPUs</span> | <span style="color:red">Inside Patcher Sur app (~12GB), only available when InstallAssistants release.</span> InstallAssistants generally available same day as System Preference updates, however developer betas will lag behind by 1 day compared to OTAs |
+| FileVault | <span style="color:#30BCD5">Fully supported on all machines</span> | <span style="color:red">Not supported</span> |
+| System Integrity Protection | <span style="color:#30BCD5">Fully enabled on Metal GPUs</span> | <span style="color:red">Disabled for early 2013 and older during the patching process and first boot afterwards, otherwise enabled</span> |
 | APFS Snapshots | <span style="color:#30BCD5">Fully enabled</span> | <span style="color:red">Disabled</span> |
-| User facing | <span style="color:red">TUI interface</span> | <span style="color:#30BCD5">SwiftUI interface, more user friendly</span> | 
+| User facing | <span style="color:red">TUI interface</span> | <span style="color:#30BCD5">SwiftUI interface, more user friendly</span> |
 | Supported OSes | <span style="color:#30BCD5">10.7-11</span> | <span style="color:red">10.15-11</span> |
 | Firmware Patching | <span style="color:#30BCD5">None required</span> | <span style="color:red">Required for models without native APFS support</span> |
 | BootCamp Switching | <span style="color:red">Requires EFI Conversion for Start Disk support, otherwise still supported</span> | <span style="color:#30BCD5">Native</span> |
-| Brightness Control on Legacy GPUs | <span style="color:red">Not supported</span> | <span style="color:#30BCD5">Supported</span> |
-| WPA Wifi Support | <span style="color:#30BCD5">Native, stable</span> | <span style="color:red">Unstable</span> |
-| Legacy GPU Acceleration | <span style="color:red">Coming soon</span> | <span style="color:red">Coming soon</span> |
-| Brightness Control on Legacy GPUs | <span style="color:red">Coming soon</span> | <span style="color:#30BCD5">Supported</span> |
+| Non-Metal GPU Acceleration | <span style="color:#30BCD5">In active development</span>, see Acceleration Progress Tracker: [Link](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108) | <span style="color:red">Currently not researching</span> |
+| El Capitan-era Wifi cards | <span style="color:#30BCD5">Supported</span> | <span style="colorred">Not supported</span> |
+| WPA Wireless Support | <span style="color:#30BCD5">Supported</span> | <span style="color:red">Minority may experience issues on early 2013 and older Models</span> |
+| Personal Hotspot Support | <span style="color:#30BCD5">Native</span> | <span style="color:red">Often requires extra steps to achieve on early 2013 and older Models</span> |
 | HEVC/H.265 Support for Mac Pros and iMacs with Polaris+ GPUs | <span style="color:#30BCD5">Supported</span> | <span style="color:red">Not supported</span> |
-| Big Sur-styled Boot Picker |  <span style="color:#30BCD5">Available</span> | <span style="color:red">Not available</span> |
-| Hibernation Support | <span style="color:red">Not available</span> (Partially broken for some) | <span style="color:#30BCD5">Supported</span> |
+| Big Sur-styled Boot Picker |  <span style="color:#30BCD5">Available</span>, though as a shim to the original boot picker | <span style="color:red">Not available</span> |
+| Hibernation Support | <span style="color:#30BCD5">Supports 3rd party SATA SSDs on 2011 and older models in addition to stock drives</span> | <span style="color:red">Only supports stock drives on 2011 and older models</span> |
+| Sidecar Support | <span style="color:#30BCD5">Supports any Mac with Metal Intel iGPU</span>, artifacting way exhibited on high movement screen content | <span style="color:red">Not supported at all</span> |

docs/BOOT.md

@@ -2,7 +2,7 @@
 
 Now we finally get to boot OpenCore!
 
-Reboot machine while holding `Option` to select the EFI Boot entry with the OpenCore icon:
+Reboot machine while holding `Option` to select the EFI Boot entry with the OpenCore icon (holding the `Control` key will make this the default boot entry):
 
 * This will be the Mac Boot Picker
 
@@ -14,9 +14,8 @@ Now that you've loaded OpenCore, now select Install macOS!:
 
 ![](../images/oc-boot.png)
 
-
 After plenty of verbose booting, you will reach the installer screen! From there it's just like any normal macOS install. For an example of how the boot process looks, see the following video:
 
 * [OpenCore Legacy Patcher Boot Process](https://www.youtube.com/watch?v=AN3zsbQV_n4)
 
-# Once installed and booting, head to [Post-Installation](./POST-INSTALL.md)
+# Once installed and booting, head to [Post-Installation](./POST-INSTALL.md)

docs/BUILD.md

@@ -2,7 +2,7 @@
 
 Now that we have a macOS installer, lets now build our OpenCore configuration!
 
-First Download the latest release: 
+First Download the latest release:
 
 * [OpenCore Legacy Patcher Releases](https://github.com/dortania/Opencore-Legacy-Patcher/releases)
 
@@ -15,7 +15,7 @@ From here you have a couple important options:
 * Build OpenCore
 * Install OpenCore to USB/internal drive
 * Change Model
-* Patcher Settings 
+* Patcher Settings
 
 If you're patching for a different machine than you're running, please select "Change Model" and enter the updated SMBIOS. For more advanced users, you may also tweak the patcher's build settings via "Patcher Settings"
 
@@ -31,7 +31,6 @@ Next lets run `Install OpenCore to USB/internal drive`:
 | :--- | :--- |
 | ![](../images/disk-start.png) | ![](../images/disk-efi.png) |
 
-  * If you have issues, please ensure you install OpenCore onto a FAT32 partition to ensure your Mac is able to boot it. You will need to format your drive as GUID/GPT in Disk Utility
+* If you have issues, please ensure you install OpenCore onto a FAT32 partition to ensure your Mac is able to boot it. You will need to format your drive as GUID/GPT in Disk Utility
   
-
-# Once finished, head to [Booting OpenCore and macOS](./BOOT.md)
+# Once finished, head to [Booting OpenCore and macOS](./BOOT.md)

docs/CLI.md

@@ -0,0 +1,41 @@
+# Command Line Args
+
+With OpenCore Legacy Patcher, we include an extra binary called [OCLP-CLI](https://github.com/dortania/OpenCore-Legacy-Patcher/releases/). The purpose of this binary is to easily run our OpenCore build process for other programs to hook onto. Below is documentation on currently supported arguments.
+
+### Build Arguments
+
+* **--build**: Build OpenCore
+  * **--model xxxx**: override default model detection
+    * ex. **--model iMac11,2**
+  * **--metal_gpu xxxx**: override default GPU detection (ie. Nvidia, AMD)
+    * **--metal_gpu Nvidia**
+  * **--smbios_spoof xxxx**: set spoofing mode, defaults to Minimal if no arg provided (ie. Minimal, Moderate, Advanced)
+    * ex. **--smbios_spoof Moderate**
+  * **--verbose**: enable verbose booting
+  * **--debug_oc**: enable debug OpenCore
+  * **--debug_kext**: enable debug kexts
+  * **--skip_wifi**: skip wifi patch
+  * **--hide_picker**: hide OpenCore's picker
+  * **--disable_sip**: disables SIP
+  * **--disable_smb**: disables SecureBootModel
+  * **--vault**: enable OpenCore vaulting
+  
+Example usage:
+
+```bash
+./OCLP-CLI --build --verbose --debug_oc --debug_kext --model iMac11,2
+```
+
+Note, when building OpenCore the output folder will be next to the OCLP binary as OpenCore-RELEASE or OpenCore-DEBUG folder.
+
+### Patch System Arguments
+
+* **--patch_sys_vol**: patches root volume with detected hardware
+
+Example usage:
+
+```bash
+sudo ./OCLP-CLI --patch_sys_vol
+```
+
+Note, root volume patching needs to be run as sudo

docs/DEBUG.md

@@ -2,7 +2,7 @@
 
 For those who've hit an odd bug and unsure if it's user error or patcher, the below will tell you how to get more verbose debug information as well as logs to help [file issues with us](https://github.com/dortania/OpenCore-Legacy-Patcher/issues)
 
-* For users who are less experienced, we recommend asking on the [Unsupported Mac Discord Server](https://discord.gg/XbbWAsE) for help.
+* For users who are less experienced, we recommend asking on the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) for help.
 
 ## Debugging yourself
 
@@ -12,7 +12,6 @@ The easiest way to debug yourself is via Patcher Settings. Here there are many d
 * "Enable OpenCore DEBUG"
 * "Enable Kext DEBUG"
 
-
 When you've enabled these 3 options, rebuild OpenCore and install to your drive. This will provide much greater debug information as well as write logs to the EFI Partition.
 
 ## Obtaining OpenCore logs from disk
@@ -46,4 +45,4 @@ Now that you have proper logs, you can now [file issues with us](https://github.
 * Upload of your OpenCore log (if applicable)
 * Upload of your Kernel log (if applicable)
 
-Additionally, please search whether the issue has been reported before. This avoids having duplicate issues.
+Additionally, please search whether the issue has been reported before. This avoids having duplicate issues.

docs/DONATE.md

@@ -4,17 +4,22 @@ OpenCore Legacy Patcher is a hobby project for us developers, and while we love
 
 The best way to support us in all honesty is to donate any old hardware you no longer need, as this allows us to have machines to test locally and push fixes much faster. While we appreciate cash donations, this makes it much more difficult for us to handle as an organization.
 
-Main hardware we'd appreciate:
+Main sections of help we'd appreciate:
 
-* Any Mac you own
+* Donating any Mac you own
   * Does require SSE4,1 CPU to test on Sierra and newer however
-* Any legacy GPU supporting macOS
-  * Does not require to be Mac flashed
-  * Following generations would would be beneficial:
-    * Nvidia 8000 series through 500
-	* AMD/ATI 2000 series through 6000
+* 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
 
-If you have any legacy hardware you're willing to donate, please contact us at the following email:
+Additionally, hardware info dumps are greatly beneficial for us to determine what patches a machine might need:
+
+* [IORegistryExplorer](https://github.com/khronokernel/IORegistryClone/blob/master/ioreg-210.zip?raw=true)
+  * `File -> SaveAs` and open an issue on Github
+  * Note: We want IOReg dumps of hardware not running on OpenCore, instead running a clean, officially supported OS by the machine
+
+If you have any legacy hardware you're willing to donate or what to buy us something, please contact us at the following email:
 
 * khronokernel@icloud.com
 
@@ -22,9 +27,9 @@ Current hardware we own:
 
 | Model | CPU | GPU | Owner | Notes |
 | :--- | :--- | :--- | :--- | :--- |
+| MacBook7,1 | Penryn | GT320M | Dhinak | N/A |
 | MacBook7,1 | Penryn | GT320M | Mykola | N/A |
+| MacBookPro5,3 | Penryn | 9400M + 9600M | Dhinak | Display's partially broken |
+| Macmini4,1 | Penryn | GT320M | Dhinak | N/A |
 | iMac11,2 | Clarksdale | HD4670 | Mykola | N/A |
-
-
-<!-- | MacBookPro5,3 | Penryn | 9400M + 9600M | Dhinak | Display's partially broken | -->
-<!-- | Macmini4,1 | Penryn | GT320M | Dhinak | N/A | -->
+| MacPro3,1 | Penryn | HD5770, RX570, GT710 | Mykola | N/A |

docs/HOW.md

@@ -6,4 +6,4 @@ OpenCore Legacy Patcher itself is actually quite a "dumb" program, and essential
 
 To understand a bit more of how OpenCore is able revive older Macs in such a native-like way, we need to go over *how* OpenCore works with your Mac:
 
-![](../images/oc-explained.png)
+![](../images/oc-explained.png)

docs/ICNS.md

@@ -2,12 +2,10 @@
 
 For users who want to customize your setup to be more personal, OpenCore does allow for custom icons and images in the boot picker.
 
-
 * [Custom OpenCore icons](#custom-opencore-icons)
 * [Custom Mac Boot Picker icons](#custom-mac-boot-picker-icons)
 * [Installing updated icons](#installing-updated-icons)
 
-
 # Custom OpenCore icons
 
 To generate custom OpenCore icons, you'll need the following:
@@ -32,7 +30,6 @@ To generate custom OpenCore icons, you'll need the following:
   
 Note, for each image we recommend having one of double the size. This ensures that icons are scaled correctly since .icns support dedicated images depending on HiDPI or not.
 
-
 Once you have a custom image you want to use(for example, as a background), download the [latest release of OpenCorePkg](https://github.com/acidanthera/OpenCorePkg/releases) and enter the `Utilities/icnspack/` folder:
 
 ![](../images/icnspack-folder.png)
@@ -42,6 +39,7 @@ Now `cd` this folder in terminal and run the following:
 ```sh
 ./icnspack Background.icns <insert_x1_image> <insert_x2_image>
 ```
+
 Once done, you'll see your custom icon generated in `icnspack`'s folder:
 
 ![](../images/icnspack-done.png)
@@ -54,7 +52,7 @@ To generate legacy icons, you'll need the following:
 
 * A machine running macOS 10.4 through 10.11
 * Icon Composer.app (Requires Apple Developer Account for official download)
-  * Users without the developer account can find a mirrors here: 
+  * Users without the developer account can find a mirrors here:
     * [Icon Composer 10.6](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/main/docs/Icon-Composer-10.6.zip)
     * [Icon Composer 10.11](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/main/docs/Icon-Composer-10.11.zip)
 * PNG Image you wish to convert
@@ -102,4 +100,4 @@ To update the Mac Boot Picker icons is actually quite simple, on the root of you
 
 ![](../images/mac-icns-drive.png)
 
-Now reboot and you'll see the new icon!
+Now reboot and you'll see the new icon!

docs/INSTALLER.md

@@ -12,7 +12,13 @@ This doc is centered around downloading and writing the macOS installer to a USB
 The simplest way to download macOS installs would be to use installinstallmacos:
 
 ```sh
-mkdir ~/macOS-installer && cd ~/macOS-installer && curl -O https://raw.githubusercontent.com/munki/macadmin-scripts/main/installinstallmacos.py && sudo python installinstallmacos.py
+[ ! -d ~/macOS-installer/ ] && mkdir ~/macOS-installer; cd ~/macOS-installer; [ ! -f ~/macOS-installer/installinstallmacos.py ] && curl -O https://raw.githubusercontent.com/munki/macadmin-scripts/main/installinstallmacos.py ; sudo python installinstallmacos.py
+```
+
+* Note: On El Capitan (10.11) and older, you'll need to specify a catalog at the end of the command:
+
+```
+--catalogurl https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog
 ```
 
 ![](../images/munki.png)

docs/LICENSE.md

@@ -9,10 +9,13 @@ This patcher is made of multiple external applications from different people and
   * [AirportBrcmFixup](https://github.com/acidanthera/AirportBrcmFixup/blob/master/LICENSE.txt)
   * [CPUFriend](https://github.com/acidanthera/CPUFriend/blob/master/LICENSE)
   * [RestrictEvents](https://github.com/acidanthera/RestrictEvents/blob/master/LICENSE.txt)
-  * [NightShiftEnabler](https://github.com/cdf/NightShiftEnabler/blob/master/LICENSE.txt)
+  * [FeatureUnlock](https://github.com/acidanthera/FeatureUnlock/blob/master/LICENSE.txt)
+  * [Innie](https://github.com/cdf/Innie/blob/master/LICENSE.txt)
+* GPL 2.0
+  * [NVMeFix](https://github.com/acidanthera/NVMeFix/blob/master/LICENSE.txt)
 * All rights reserved to respective authors
   * [AAAMouSSE](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/) - Syncretic
   * [telemetrap](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/post-28447707) - Syncretic
   * Apple Binaries - Apple Inc.
 
-Remaining files within OpenCore Legacy Patcher are copyrighted to their respective author.
+Remaining files within OpenCore Legacy Patcher are copyrighted 2020-2021 Mykola Grymalyuk & Dhinak G. For integration into other projects, please request written permission.

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:
+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:
 
 ```bash
 system_profiler SPHardwareDataType | grep 'Model Identifier'
@@ -16,16 +16,15 @@ The below table will list all supported and unsupported functions of the patcher
 * [Mac Pro](#mac-pro)
 * [Xserve](#xserve)
 
-Note: In this patcher, Brightness Control is tied to GPU acceleration
-
-Note 2: For setups that require AppleHDA patching, we highly advise users instead opt of a USB Audio adapter to avoid root patching. This ensures that [DELTA](./TERMS.md) updates, FileVault, SIP and other security features can stay in-tact.
-
 Regarding OS support, see below:
 
 | Support Entry | Supported OSes | Description | Comment |
 | :--- | :--- | :--- | :--- |
-| HostOS | macOS 10.7-11 | Refers to OSes where running OpenCore-Patcher.app are supported | Supports 10.7+ if [python 3.6 or higher](https://www.python.org/downloads/) is manually installed, simply run the `OpenCore-Patcher.command` located in the repo |
-| TargetOS | macOS 11 | Refers to OSes that can be patched to run with OpenCore | Unofficially supports 10.4 and newer, no support provided via this patcher |
+| HostOS | macOS 10.9 - macOS 11 | 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 | 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. |
+
+* macOS Monterey support is currently in beta and is not recommended for everyday users. The below page is meant to represent macOS Big Sur support and may not correctly reflect Monterey's support on each model
+  * Recommend looking at the [macOS Monterey Support page](./MONTEREY-DROP.md) for a better idea of Monterey's current status
 
 ### MacBook
 
@@ -34,24 +33,27 @@ 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 [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- No Keyboard and Trackpad<br/>- No USB<br/>- No Ethernet<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
-| MacBook5,1 | Late 2008 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- Trackpad Issues |
-| MacBook5,2 | Early 2009 | ^^ | ^^ |
-| MacBook6,1 | Late 2009 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/> |
+| 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<br/>- Brightness control partially supported |
+| MacBook6,1 | Late 2009 | ^^ | - GPU Acceleration in Public Beta, see current issues ([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/> |
 | MacBook7,1 | Mid-2010 | ^^ | ^^ |
+| MacBook8,1 | Mid-2015 | ^^ | <span style="color:green"> Everything is supported</span> |
 
 ### 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> | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
-| MacBookAir3,1 | Late 2010 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76)) |
+| 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)) |
+| 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,2 | ^^ | ^^ | ^^ |
+| MacBookAir6,1 | Mid-2013, Early 2014 | ^^ | ^^ |
+| MacBookAir6,2 | ^^ | ^^ | ^^ |
 
 ### MacBook Pro
 
@@ -61,9 +63,9 @@ Regarding OS support, see below:
 | MacBookPro1,2 | ^^ | ^^ | ^^ |
 | MacBookPro2,1 | Late 2006 | ^^ | 32-Bit Firmware limitation |
 | MacBookPro2,2 | Late 2006 | ^^ | ^^ |
-| MacBookPro3,1 | Mid-2007 | ^^ | - Requires SSE4.1 CPU |
-| MacBookPro4,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
-| MacBookPro5,1 | Late 2008 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76)) |
+| 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)) |
+| MacBookPro5,1 | Late 2008 | ^^ | ^^ |
 | MacBookPro5,2 | Early 2009 | ^^ | ^^ |
 | MacBookPro5,3 | Mid-2009 | ^^ | ^^ |
 | MacBookPro5,4 | ^^ | ^^ | ^^ |
@@ -78,6 +80,9 @@ Regarding OS support, see below:
 | MacBookPro9,2 | ^^ | ^^ | ^^ |
 | MacBookPro10,1 | Mid-2012, Early 2013 | ^^ | ^^ |
 | MacBookPro10,2 | Late 2012, Early 2013 | ^^ | ^^ |
+| MacBookPro11,1 | Late 2013, Mid-2014 | ^^ | ^^ |
+| MacBookPro11,2 | ^^ | ^^ | ^^ |
+| MacBookPro11,3 | ^^ | ^^ | ^^ |
 
 ### Mac mini
 
@@ -85,7 +90,7 @@ 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> | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76)) |
+| 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)) |
 | Macmini4,1 | Mid-2010 | ^^ | ^^ |
 | Macmini5,1 | Mid-2011 | ^^ | ^^ |
 | Macmini5,2 | ^^ | ^^ | ^^ |
@@ -102,10 +107,10 @@ 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<br/>- No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>  |
-| iMac8,1 | Early 2008 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
-| iMac9,1 | Early 2009 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/> |
-| iMac10,1 | Late 2009 | ^^ | ^^ |
+| 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/>- Brightness control partially supported on Nvidia GPUs, AMD unsupported<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)))<br/>- Brightness control partially supported on Nvidia GPUs, AMD unsupported |
+| 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)) |
 | iMac11,1 | ^^ | ^^ | ^^ |
 | iMac11,2 | Mid-2010 | ^^ | ^^ |
 | iMac11,3 | ^^ | ^^ | ^^ |
@@ -113,12 +118,14 @@ Regarding OS support, see below:
 | iMac12,2 | ^^ | ^^ | ^^ |
 | iMac13,1 | Late 2012 | ^^ | <span style="color:green"> Everything is supported</span> |
 | iMac13,2 | ^^ | ^^ | ^^ |
-| iMac13,2 | ^^ | ^^ | ^^ |
+| iMac13,3 | ^^ | ^^ | ^^ |
 | iMac14,1 | Late 2013 | ^^ | ^^ |
 | iMac14,2 | ^^ | ^^ | ^^ |
 | iMac14,3 | ^^ | ^^ | ^^ |
+| iMac14,4 | Mid-2014 | ^^ | ^^ |
+| iMac15,1 | Late 2014, Mid-2015 | ^^ | [Display will output to 4k instead of 5k](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/359) | 
 
-* 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-2012 Graphics Card Upgrade Guide](https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/?post=17425857#post-17425857)
+* 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)
 
 ### Mac Pro
 
@@ -126,19 +133,16 @@ 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> | - Pottential instability with built-in USB 1.1 ports (recommend using a USB 2.0 hub)<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76)) |
+| 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> |
 | MacPro5,1 | Mid-2010, Mid-2012 | ^^ | ^^ |
 
-* For MacPro3,1, we **highly** advise users instead opt for a USB Audio Adapter instead of running any Root Volume Patches. This will ensure your machine is as stable and security rich as possible
-
-
 ### Xserve
 
 | SMBIOS | Year | Supported | Comment |
 | :--- | :--- | :--- | :--- |
 | Xserve1,1 | Mid-2006 | <span style="color:red"> NO </span> | 32-Bit Firmware limitation |
-| Xserve2,1 | Early 2008 | ^^ | ^^ |
-| Xserve3,1 | Early 2009 | <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 </span> | <span style="color:green"> Everything is supported as long as GPU is Metal capable </span> |
+| Xserve3,1 | Early 2009 | ^^ | ^^ |
 
-# Once you've verified your hardware is supported, head to [Download and build macOS Installers](./INSTALLER.md)
+# Once you've verified your hardware is supported, head to [Download and build macOS Installers](./INSTALLER.md)

docs/MONTEREY-DROP.md

@@ -0,0 +1,122 @@
+# macOS Monterey Support
+
+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:
+
+* iMac14,4
+* iMac15,1
+* MacBook8,1
+* MacBookAir6,1
+* MacBookAir6,2
+* MacBookPro11,1
+* MacBookPro11,2
+* MacBookPro11,3
+
+All of these models now have support in OpenCore Legacy Patcher. Note iMac15,1 does have [an unfortunate firmware bug preventing resolutions above 4k](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/359) with OpenCore Legacy Patcher
+
+## Current Hardware Drawbacks:
+
+### macOS 12.0 Beta 4 issue on 2012 to early 2013 machines
+
+Currently in macOS 12.0 Beta 4, many Ivy Bridge Macs have experienced Bluetooth issues relating to their BCM20702 chipset. Currently the exact issue is unknown however is assumed to be a bug on Apple's end. Recommend downgrading to macOS 12.0 Beta 3 till resolved:
+
+* [12.0 Beta 3 (21A5284e) InstallAssistant (Direct)](http://swcdn.apple.com/content/downloads/02/08/071-63739-A_G5RYVW5JHT/dfz5gp3s0jm9vl7m30oewq141zkpv8edr8/InstallAssistant.pkg)
+* [12.0 Beta 3 (21A5284e) InstallAssistant (archive.org)](https://archive.org/details/12.0-21a5284e-beta-3)
+
+A temporary fix is to restart the BlueTool and bluetoothd process with each boot, note it may not work for all users:
+
+```sh
+sudo killall -9 BlueTool bluetoothd
+```
+
+## Previously Broken Hardware
+
+::: details Wireless Support Dropped (Resolved in 0.2.5 and newer)
+
+* Broadcom BCM94328, BCM94322 and Atheros Wireless Chipsets lost support
+
+The following models lost Bluetooth support in macOS Monterey due to their legacy Wireless chipset:
+
+* iMac12,x and older
+* Macmini3,1 and older
+* MacBook5,x and older
+* MacBookAir2,1 and older
+* MacBookPro7,1 and older
+* MacPro5,1 and older
+
+Note: BCM943224, BCM94331, BCM94360 and BCM943602 are still fully support by OpenCore Legacy Patcher
+
+:::
+
+::: details Bluetooth Support Dropped (Resolved in 0.2.5 and newer)
+
+* BRCM2046 and BRCM2070 Bluetooth Chipsets lost support
+
+The following models lost Bluetooth support in macOS Monterey due to their legacy Bluetooth chipset:
+
+* iMac12,x and older
+* Macmini5,1 and older
+* MacBook7,1 and older
+* MacBookAir4,1 and older
+* MacBookPro8,1 and older
+* MacPro5,1 and older
+
+Note: Native BRCM20702 and BRCM20703 are still fully support by OpenCore Legacy Patcher
+
+::: details Dropped Firmwares
+
+Here are the firmwares macOS Monterey Dropped (previously located within IOBluetoothUSBDFU.kext):
+
+* 2046_820F.dfu
+* 2046_8210.dfu
+* 2046_8213.dfu
+* 2046_8215.dfu
+* 2046_8216.dfu
+* 2046_8217.dfu
+* 2070_821A.dfu
+* 2070_821B.dfu
+* 2070_8218.dfu
+* 20702_821D.dfu
+* 20702_821F.dfu
+* 20702_828A.dfu
+* 20702_828B.dfu
+* 20702_828C.dfu
+* 20702_8281.dfu
+* 20702_8286.dfu
+
+:::
+
+::: details Ivy Bridge iGPU Acceleration (Resolved in 0.1.7 and newer)
+
+* Intel HD4000 iGPUs lost support
+
+By default these machines require root volume patches to gain graphics acceleration in Monterey. OpenCore Legacy Patcher supports readding support however SIP can no longer be enabled due to root patching:
+
+* Macmini6,x
+* MacBookAir5,x
+* MacBookPro9,x
+* MacBookPro10,x
+
+:::
+
+::: details Non-Metal Acceleration (Resolved in 0.2.5 and newer)
+
+* Non-Metal GPUs no longer have working acceleration patches:
+  * Intel Ironlake and Sandy Bridge iGPUs
+  * Nvidia Tesla and Fermi GPUs
+  * AMD TeraScale 1 and 2 GPUs
+
+The following machines cannot gain graphics acceleration at all in Monterey, only basic framebuffer and brightness control (iMac8,1/9,1 and MacBook5,2 excluded):
+
+* iMac12,x and older
+* Macmini5,x and older
+* MacBook7,1 and older
+* MacBookAir4,x and older
+* MacBookPro8,x and older
+
+Note: iMac10,1 through iMac12,x can be upgraded with Metal GPUs, [see here for more info](https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/)
+
+:::

docs/PATCHEXPLAIN.md

@@ -100,11 +100,12 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
   * Reason: Fixes DRM support on models with upgraded AMD Metal GPUs
   * Logic: Adds args to NVRAM
   * Models: Models with upgraded AMD Metal GPUs
+
 ### UEFI -> ProtocolOverrides
 
 * GopPassThrough
   * Reason: Used for proper output on machines with UGA firmware but GOP GPU
-  * Logic: Provide GOP protocol instances on top of UGA protocol instances 
+  * Logic: Provide GOP protocol instances on top of UGA protocol instances
   * Models: MacPro3,1, MacBook4,1 iMac7,1-8,1
   
 :::
@@ -191,7 +192,6 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
   * Models: All models require
 :::
 
-
 ## On-Disk Patches
 
 Unfortunately certain on-disk patches are required to achieve full functionality. Below is a breakdown of patches supported
@@ -225,10 +225,16 @@ Note, GPU Acceleration Patches are not public yet, the below section is simply d
 * Nvidia Binaries
   * GeForceGA.bundle
   * GeForceTesla.kext
+    * Skip IOFree Panic - Mojave+
+      * At Offset `0x5CF9A` replace following bytes with `0xEB`
+    * Avoids `addMemoryRegion/removeMemoryRegion` calls
+      * At Offset `0x5527` and `0x77993`, replace following bytes with `0x909090909090`
   * GeForceTeslaGLDriver.bundle
   * GeForceTeslaVADriver.bundle
   * NVDANV50HalTesla.kext
   * NVDAResmanTesla.kext
+    * 0x1ea59a - 0x1ea5b3: nop
+    * Replace VSLGestalt to IOLockLock or any other known symbol of the same length.
 
 * AMD/ATI Binaries
   * AMD2400Controller.kext
@@ -267,6 +273,8 @@ Note, GPU Acceleration Patches are not public yet, the below section is simply d
   * AppleIntelHD3000GraphicsGLDriver.bundle
   * AppleIntelHD3000GraphicsVADriver.bundle
   * AppleIntelSNBGraphicsFB.kext
+    * Board ID Patch
+      * Replace original Board ID with updated model
   * AppleIntelSNBVA.bundle
 
 ### Frameworks

docs/POST-INSTALL.md

@@ -2,6 +2,7 @@
 
 * [Booting without USB drive](#booting-without-usb-drive)
 * [Booting seamlessly without Verbose or OpenCore Picker](#booting-seamlessly-without-verbose-or-opencore-picker)
+* [Applying Post Install Volume Patches](#applying-post-install-volume-patches)
 
 ## Booting without USB drive
 
@@ -27,9 +28,29 @@ Here you can change different patcher settings, however the main interest is:
 
 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.
 
-**Note**: For users who need Post-Install Volume patches for Audio support, you **must** disable the following settings in "Patcher Settings" when building and installing your new OpenCore:
+## 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 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 2: NVRAM may need to be reset to ensure SIP is correctly re-enabled
+
+## Applying Post Install Volume Patches
+
+**Note**: For users who need Post-Install Volume patches for legacy video acceleration support, you **must** disable the following settings in "Patcher Settings" when building and installing your new OpenCore:
 
 * SIP: Disabled
 * SecureBootModel: Disabled
 
-Once set, rebuild OpenCore, install to drive and reboot. Then, Post-Install Volume patches will run just fine
+Once set, rebuild OpenCore, install to drive and reboot. Then, Post-Install Volume patches will run just fine
+
+To apply the Post-Install Volume patches [to test out the Beta Graphics Acceleration Patches system](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108), select option #3 as shown below:
+
+![](../images/root-patch.png)
+
+And go ahead to option #1 and let the OCLP patcher apply the needed legacy video patches.
+
+![](../images/root-patcher-2.png)
+
+Reboot your system and check out the now working graphics acceleration on your legacy system. This is still Beta software.

docs/START.md

@@ -5,12 +5,20 @@ This is a sophisticated boot loader used to inject and patch data in memory, ins
 * System Integrity Protection, FileVault 2, .im4m Secure Boot and Vaulting
 * Native OTA OS DELTA updates on all Macs
 * Recovery OS, Safe Mode and Single-user Mode booting
+* WPA Wifi and Personal Hotspot support
 
 While many PC users from the Hackintosh community are familiar with OpenCore, OpenCore was designed as Mac and PC agnostic ensuring both platforms can use it easily. And with OpenCore Legacy Patcher, we help automate the process making running with OpenCore that much easier.
 
-For advanced troubleshooting, we highly recommend users check out the [Unsupported Mac Discord Server](https://discord.gg/XbbWAsE) as this is generally the quickest way to get a hold of us developers and get help from the community.
+For advanced troubleshooting, we highly recommend users check out the [OpenCore Patcher Paradise Discord Server](https://discord.gg/rqdPgH8xSN) as this is generally the quickest way to get a hold of us developers and get help from the community.
 
-For those who wish to support this patcher, please see the [Supporting the Patcher page](./DONATE.md) 
+For those who wish to support this patcher, please see the [Supporting the Patcher page](./DONATE.md)
+
+## Patcher Warnings
+
+Since this patcher tricks macOS into thinking you're running a newer Mac, certain functionality may be broken:
+
+* Boot Camp Assistant.app
+  * We recommend following our [guide on getting a UEFI Windows Install working](./WINDOWS.md). Legacy MBR Based installs won't show up in OpenCore
 
 ## How do I get started?
 

docs/TERMS.md

@@ -7,7 +7,7 @@ With OpenCore Legacy Patcher, we use a lot of different terms to refer to hardwa
 Term | Description
 --- | ---
 **macOS**        | Apple's own UNIX based OS used for Mac machines and "What makes a Mac a Mac".
-**Windows**      | Microsoft's proprietary OS that is used and supported on a wide range of devices (stay with this OS if you don't want headaches)
+**Windows**      | Microsoft's proprietary OS that is used and supported on a wide range of devices
 **Linux**        | Family of open source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991, by Linus Torvalds. Linux is typically packaged in a Linux distribution. Note that while macOS and Linux may be UNIX-based, they're vastly different.
 **Bootloader**   | Piece of software that loads an OS, usually made by the OS creators. OpenCore is technically not a bootloader per se (see boot manager explanation down below). Apple's Boot.efi would be the actual boot loader in a Mac.
 **Boot Manager** | Piece of software that manages bootloaders – we have many of these: Clover, systemd-boot, OpenCore, rEFInd, rEFIt... These are generally seen as prepping the system for the actual boot loader.
@@ -26,7 +26,7 @@ Term | Description
 **IOKit**   | Backbone of how Kernel Extentions (Kexts) probe and attach onto hardware, starts quickly after kernel initates
 **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 unmotified otherwise ~12GB updates will occur.
+**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.
 ---
 Term | Description
 --- | ---

docs/TESTED.md

@@ -0,0 +1,118 @@
+# 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.
+
+### MacBook
+
+| SMBIOS | Tested | Tester | Comment |
+| :--- | :--- | :--- | :--- |
+| MacBook4,1 | <span style="color:#30BCD5"> YES </span> | Mami | - Stock Model<br/>- Couldn't install due to broke USB support |
+| MacBook5,1 | ^^ | air.man | - Stock Model<br/>- Patcher version 0.0.19 |
+| MacBook5,2 | ^^ | Finder352 | ^^ |
+| MacBook6,1 | ^^ | Finder352 | ^^ |
+| MacBook7,1 | ^^ | MykolaG | ^^ |
+| ^^ | ^^ | Jazzzny | ^^ |
+| ^^ | ^^ | AlexSakha67 | - Stock Model<br/>- Patcher version 0.0.20 |
+
+### MacBook Air
+
+| SMBIOS | Tested | Tester | Comment |
+| :--- | :--- | :--- | :--- |
+| MacBookAir2,1 | No reports | N/A | N/A |
+| MacBookAir3,1 | ^^ | ^^ | ^^ |
+| MacBookAir3,2 | <span style="color:#30BCD5"> YES </span> | houser42 | - Stock model <br/>- Patcher version unknown |
+| MacBookAir4,1 | No reports | N/A | N/A |
+| MacBookAir4,2 | ^^ | ^^ | ^^ |
+| MacBookAir5,1 | <span style="color:#30BCD5"> YES </span> | Ausdauersportler | - Stock Model<br/>- Patcher version 0.0.9 |
+| ^^ | ^^ | webg3 | Stock Model |
+| MacBookAir5,2 | ^^ | Bab-droid | - Stock Model<br/>- Patcher version 0.0.19 |
+| ^^ | ^^ | K-Hobert | - Stock model <br/>- Patcher version unknown |
+| ^^ | ^^ | cboukouv | - Stock model <br/>- Patcher version 0.0.21 |
+
+### MacBook Pro
+
+| SMBIOS | Tested | Tester | Comment |
+| :--- | :--- | :--- | :--- |
+| MacBookPro4,1 | <span style="color:#30BCD5"> YES </span> | cboukouv | - Stock model <br/>- Patcher version 0.0.19 |
+| MacBookPro5,1 | ^^ | GURU_Jasho#5736 | - Stock model <br/>- Patcher version 0.0.21 |
+| MacBookPro5,2 | ^^ | hvds | ^^ |
+| MacBookPro5,3 | ^^ | kommtzeitkonrad | - Stock model <br/>- Patcher version 0.0.22 |
+| MacBookPro5,4 | No reports | N/A | N/A |
+| MacBookPro5,5 | ^^ | ^^ | ^^ |
+| MacBookPro6,1 | ^^ | ^^ | ^^ |
+| MacBookPro6,2 | <span style="color:#30BCD5"> YES </span> | Jakeluke | - Stock model, dGPU broken <br/>- Patcher version unknown |
+| MacBookPro7,1 | ^^ | fussel132 | - Stock model <br/>-Patcher version v0.1.2 |
+| MacBookPro8,1 | ^^ | AvaQueen | - Stock model <br/>- Patcher version 0.0.19 |
+| MacBookPro8,2 | ^^ | air.man | - Stock model, dGPU disabled <br/>- Patcher version 0.0.22 |
+| ^^ | ^^ | cboukouv | - Stock model <br/>- Patcher version 0.0.19 |
+| MacBookPro8,3 | ^^ | lulujyc | - Stock model, dGPU disabled <br/>- Patcher version 0.1.4 |
+| MacBookPro9,1 | <span style="color:#30BCD5"> YES </span> | jbdamiano | - Stock model <br/>- Patcher version 0.0.19 |
+| ^^ | ^^ | dennes544 | ^^|
+| ^^ | ^^ | cgrazy | ^^ |
+| ^^ | ^^ | LIPA85 | ^^ |
+| MacBookPro9,2 | ^^ | alexx17xx | - Stock model <br/>- Patcher version 0.0.19 |
+| ^^ | ^^ | Arvxistanx | ^^ |
+| ^^ | ^^ | CyberDroid1 | - Stock model<br/>- Patcher version 0.0.16 |
+| ^^ | ^^ | woefi | - BCM94331CAX upgrade<br/>- Patcher version 0.0.13 |
+| ^^ | ^^ | whgmkeller | - Stock model<br/>- Patcher version 0.0.11 |
+| ^^ | ^^ | vinaypundith | - Patcher version 0.0.7 |
+| MacBookPro10,1 | ^^ | traviswparker | - Stock model <br/>- Patcher version 0.0.14 |
+| ^^ | ^^ | il-rollino | - Upgraded BCM94360CSAX <br/>- Patcher version 0.0.21 |
+| MacBookPro10,2 | No reports | N/A | N/A |
+
+### Mac mini
+
+| SMBIOS | Tested | Tester | Comment |
+| :--- | :--- | :--- | :--- |
+| Macmini3,1 | No reports | N/A | N/A |
+| Macmini4,1 | ^^ | ^^ | ^^ |
+| Macmini5,1 | ^^ | ^^ | ^^ |
+| Macmini5,2 | ^^ | ^^ | ^^ |
+| Macmini5,3 | ^^ | ^^ | ^^ |
+| Macmini6,1 | <span style="color:#30BCD5"> YES </span> | cicofz | - Stock model <br/>- Patcher version 0.0.21 |
+| ^^ | ^^ | Stig124 | - Stock model <br/>- Patcher version 0.0.19 |
+| ^^ | ^^ | mwidjaya | - Stock model <br/>- Patcher version 0.0.18 |
+| Macmini6,2 | ^^ | Shelbs | - Stock model <br/>- Patcher version 0.0.16 |
+
+### iMac
+
+| SMBIOS | Tested | Tester | Comment |
+| :--- | :--- | :--- | :--- |
+| iMac7,1 | No reports | N/A | N/A |
+| iMac8,1 | <span style="color:#30BCD5"> YES </span> | EduCovas | - Stock Model<br/>- Patcher version 0.0.21 |
+| iMac9,1 | ^^ | Allanrfox | ^^ |
+| ^^ | ^^ | Jakeluke | ^^ |
+| iMac10,1 | ^^ | Ausdauersportler | - Upgraded with WX4150 |
+| iMac11,1 | ^^ | internetzel | - Upgraded with RX580 mobile |
+| iMac11,2 | ^^ | MykolaG | - Stock Model<br/>- Patcher version 0.0.21 |
+| ^^ | ^^ | iMac-iPad | - Stock Model<br/>- Patcher version 0.0.21 |
+| ^^ | ^^ | vinaypundith | - Patcher version 0.0.19 |
+| iMac11,3 | ^^ | Ausdauersportler | - Upgraded with Polaris GPU<br/>- Upgraded BCM943602CDP<br/>- Patcher version 0.0.21 |
+| iMac12,1 | ^^ | shnockdu | - Upgraded with Kepler GPU<br/>- Patcher version 0.0.21 |
+| ^^ | ^^ | StephN999 | - Upgraded WX4150 GPU<br/>- Upgraded BCM94360CD<br/>- Patcher version 0.0.21 |
+| iMac12,2 | ^^ | Ausdauersportler | - Upgraded with Polaris GPU<br/>- Upgraded BCM943602CDP<br/>- Patcher version 0.0.21 |
+| iMac13,1 | ^^ | alexx17xx | - Stock Model<br/>- Patcher version 0.0.19 |
+| iMac13,2 | ^^ | Alain13 | ^^ |
+| ^^ | ^^ | algernonpule | - Stock Model<br/>- Patcher version 0.0.19 |
+| iMac13,3 | No reports | N/A | N/A |
+| iMac14,1 | <span style="color:#30BCD5"> YES </span> | woefi | - Upgraded NVMe<br/>- Patcher version 0.0.21 |
+| ^^ | ^^ | mikeboss | - Stock Model<br/>- Patcher version 0.0.19 |
+| iMac14,2 | ^^ | OKonnel | - Stock Model<br/>- Patcher version 0.0.22 |
+| ^^ | ^^ | mibaxx | - Stock Model<br/>- Patcher version 0.0.21 |
+| iMac14,3 | No reports | N/A | N/A |
+
+### Mac Pro
+
+| SMBIOS | Tested | Tester | Comment |
+| :--- | :--- | :--- | :--- |
+| MacPro3,1 | <span style="color:#30BCD5"> YES </span> | MykolaG | - Upgraded with RX 470 and BCM94360CD<br/>- Stock Bluetooth card removed<br/>- Patcher version 0.1.6 |
+| ^^ | ^^ | christiann | - Upgraded with RX 560 and BCM94322<br/>- Stock Bluetooth card removed<br/>- Patcher version 0.0.21 |
+| ^^ | ^^ | gw463 | - Upgraded GTX 680<br/>- Upgraded BCM94360<br/>- Patcher version 0.0.22 |
+| ^^ | ^^ | AlexSakha67 | - Upgraded R9 280<br/>- Patcher version 0.0.20 |
+| ^^ | ^^ | nekton1 | - Upgraded GTX 680<br/>- Patcher version 0.0.20 |
+| ^^ | ^^ | Pri-est | - Patcher version 0.0.9 |
+| ^^ | ^^ | vinaypundith | - Upgraded GTX 680<br/>- Upgraded BCM94360CD<br/>- Patcher version 0.0.6 |
+| MacPro4,1 | ^^ | ^^ | - Patcher version 0.0.9 |
+| MacPro5,1 | ^^ | woefi | - Upgraded with RX 580<br/>- Patcher version 0.0.21 |
+| ^^ | ^^ | Mabrouk Oscar | - Patcher version 0.0.21 |
+| ^^ | ^^ | astuffedtiger | - MacPro4,1 flashed to 5,1<br/>- Patcher version 0.0.18 |

docs/TROUBLESHOOTING.md

@@ -9,6 +9,7 @@ Here are some common errors users may experience while using this patcher:
 * [Booting with a non-flashed GPU](#booting-with-a-non-flashed-gpu)
 * [How to Boot Big Sur Recovery](#how-to-boot-big-sur-recovery)
 * [Stuck on "Your Mac needs a firmware update"](#stuck-on-your-mac-needs-a-firmware-update)
+* [No Brightness Control](#no-brightness-control)
 
 ## Stuck on `This version of Mac OS X is not supported on this platform`
 
@@ -46,6 +47,7 @@ sudo bless --verbose --file /Volumes/VOLNAME/EFI/OC/OpenCore.efi --folder /Volum
 
 * 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"
 
 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.
 
@@ -57,5 +59,12 @@ By default, the patcher will try to hide extra boot options such as recovery fro
 
 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 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.
+## 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.
+
+To work-around, we recommend user try out the below app:
+
+* [Brightness Slider](https://actproductions.net/free-apps/brightness-slider/)

docs/UNINSTALL.md

@@ -3,9 +3,13 @@
 To remove OpenCore is actually quite simply:
 
 1. Remove OpenCore either from the USB or internal drive
-  * You'll need to mount the drive's EFI partition, and delete the EFI folder
-  * [See here for example how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
-2. Reset NVRAM
-  * [Reset NVRAM or PRAM on your Mac](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.
+* You'll need to mount the drive's EFI partition, and delete the EFI/OC folder as well as the System folder
+  * Note **do not** delete the entire EFI folder, this will likely break any existing Windows and Linux installations
+* [See here for example how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
+
+2. Reset NVRAM
+
+* [Reset NVRAM or PRAM on your Mac](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.

docs/UPDATE.md

@@ -0,0 +1,22 @@
+# Updating OpenCore and Co
+
+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.
+
+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:
+
+![](../images/first-run.png)
+
+Then simply rebuild your OpenCore build and install again. Then voila, OpenCore is updated!
+
+To check what version of OpenCore and Patcher version you're currently running, you can run the following in terminal:
+
+```bash
+# OpenCore Version
+nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:opencore-version
+# Patcher Version
+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!

docs/WINDOWS.md

@@ -0,0 +1,88 @@
+# Installing UEFI Windows 10
+
+* 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.
+
+* Note: UEFI Windows is generally quite usable for Arrendale and newer models, however machines with Penryn CPUs may experience issues
+* Recommended Models:
+  * MacBookAir4,x and newer
+  * MacBookPro8,x and newer
+  * Macmini5,x and newer
+  * iMac11,x and newer
+  * MacPro4,1 and newer
+  * Xserve3,1 and newer
+
+Once you know your model is supported, you're good to go with the rest of this guide
+
+## Disk Formatting
+
+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
+
+First, lets format out drives as follows:
+
+### USB Drive Formatting
+
+Open Disk Utility in macOS and format the USB Drive as ExFat with MBR 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):
+
+![](../images/windows-partition-1.png)
+
+If you plan to use the same hard drive for macOS and Windows, we recommend creating a dedicated partition just for OpenCore. This lets Windows have the ESP to itself and OpenCore can stay within it's own bubble.
+
+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
+
+![](../images/windows-partition-2.png)
+
+## Creating the Installer
+
+First up, lets grab Windows's Installer at the below link:
+
+* [Download Windows 10 Disc Image (ISO File)](https://www.microsoft.com/en-ca/software-download/windows10ISO)
+
+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):
+
+```
+rsync -r -P /Volumes/CCCOMA_X64/ /Volumes/W10USB
+```
+
+![](../images/rsync-progess.png)
+
+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
+
+![](../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
+
+![](../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
+
+![](../images/oc-windows-done.png)
+
+## Troubleshooting
+
+### iMac12,x Bluescreen after driver installation
+
+Currently Intel's iGPU drivers for the HD 3000 series do not support UEFI booting in Windows. Recommended solution is to simply disable: [iMac 12,1 Windows 10 Boot Loop – Fix Intel Graphics issue](https://zzq.org/?p=39)

entitlements.plist

@@ -4,5 +4,7 @@
 <dict>
 	<key>com.apple.security.cs.disable-library-validation</key>
 	<true/>
+	<key>com.apple.security.cs.disable-executable-page-protection</key>
+	<true/>
 </dict>
 </plist>

merge_gui.py

@@ -0,0 +1,10 @@
+# Updates build version in OCLP-GUI during CI builds
+# Copyright (C) 2021 Mykola Grymalyuk
+import plistlib
+from pathlib import Path
+from Resources import Constants
+
+app_path = Path.cwd() / Path ("OpenCore Patcher.app/Contents/Info.plist")
+info = plistlib.load(Path(app_path).open("rb"))
+info["CFBundleShortVersionString"] = Constants.Constants().patcher_version
+plistlib.dump(info, Path(app_path).open("wb"), sort_keys=True)

payloads/ACPI/Source/SSDT-CPBG.dsl

@@ -0,0 +1,27 @@
+/* Disable the non-existant Co-processor Bridge found on Arrendale, 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.
+ *
+ * This SSDT reports the device as disabled avoiding the probing.
+ * Not required for macOS 11.2 and newer, however recommended to alliviate pottential issues
+ */
+DefinitionBlock ("", "SSDT", 2, "DRTNIA", "CPBGoff", 0x00001000)
+{
+    External (_SB_.CPBG, DeviceObj)
+
+    Scope (_SB.CPBG)
+    {
+        Method (_STA, 0, NotSerialized)  // _STA: Status
+        {
+            If (_OSI ("Darwin"))
+            {
+                Store ("Disabling incompatible CPBG Device", Debug)
+                Return (Zero) // Disable only in macOS incase Windows or Linux requires
+            }
+            Else
+            {
+                Return (0x0F)
+            }
+        }
+    }
+}

payloads/ACPI/Source/SSDT-PCI.dsl

@@ -0,0 +1,165 @@
+/* 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.
+ *
+ * Source:
+ * https://egpu.io/forums/pc-setup/fix-dsdt-override-to-correct-error-12/
+ */
+DefinitionBlock ("", "SSDT", 2, "DRTNIA", "WinPCI", 0x00000000)
+{
+    External (_SB_.PCI0, DeviceObj)
+
+    Scope (\_SB.PCI0)
+    {
+        Store ("Injecting new BUF0 BuffObj", Debug)
+        Name (BUF0, ResourceTemplate ()
+        {
+            WordBusNumber (ResourceProducer, MinFixed, MaxFixed, PosDecode,
+                0x0000,             // Granularity
+                0x0000,             // Range Minimum
+                0x00FF,             // Range Maximum
+                0x0000,             // Translation Offset
+                0x0100,             // Length
+                ,, )
+            DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
+                0x00000000,         // Granularity
+                0x00000000,         // Range Minimum
+                0x00000CF7,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00000CF8,         // Length
+                ,, , TypeStatic, DenseTranslation)
+            IO (Decode16,
+                0x0CF8,             // Range Minimum
+                0x0CF8,             // Range Maximum
+                0x01,               // Alignment
+                0x08,               // Length
+                )
+            DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
+                0x00000000,         // Granularity
+                0x00000D00,         // Range Minimum
+                0x0000FFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x0000F300,         // Length
+                ,, , TypeStatic, DenseTranslation)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000A0000,         // Range Minimum
+                0x000BFFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00020000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000C0000,         // Range Minimum
+                0x000C3FFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000C4000,         // Range Minimum
+                0x000C7FFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000C8000,         // Range Minimum
+                0x000CBFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000CC000,         // Range Minimum
+                0x000CFFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000D0000,         // Range Minimum
+                0x000D3FFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000D4000,         // Range Minimum
+                0x000D7FFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000D8000,         // Range Minimum
+                0x000DBFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000DC000,         // Range Minimum
+                0x000DFFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000E0000,         // Range Minimum
+                0x000E3FFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000E4000,         // Range Minimum
+                0x000E7FFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000E8000,         // Range Minimum
+                0x000EBFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000EC000,         // Range Minimum
+                0x000EFFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00004000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x000F0000,         // Range Minimum
+                0x000FFFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00010000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0x00000000,         // Range Minimum
+                0xFEAFFFFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0xFEB00000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            DWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x00000000,         // Granularity
+                0xFED40000,         // Range Minimum
+                0xFED44FFF,         // Range Maximum
+                0x00000000,         // Translation Offset
+                0x00005000,         // Length
+                ,, , AddressRangeMemory, TypeStatic)
+            QWordMemory (ResourceProducer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite,
+                0x0000000000000000, // Granularity
+                0x0000000C20000000, // Range Minimum,  set it to 48.5GB
+                0x0000000E0FFFFFFF, // Range Maximum,  set it to 56.25GB
+                0x0000000000000000, // Translation Offset
+                0x00000001F0000000, // Length calculated by Range Max - Range Min.
+                ,, , AddressRangeMemory, TypeStatic)
+        })
+    }
+}

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/Info.plist

@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16B2657</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>AppleHDA</string>
-	<key>CFBundleGetInfoString</key>
-	<string>AppleHDA 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.apple.driver.AppleHDA</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Apple HDA Driver</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9P107g</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17G55</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13internal</string>
-	<key>DTXcode</key>
-	<string>0930</string>
-	<key>DTXcodeBuild</key>
-	<string>9P107g</string>
-	<key>IOKitPersonalities</key>
-	<dict>
-		<key>HDA Driver</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleHDA</string>
-			<key>IOClass</key>
-			<string>AppleHDADriver</string>
-			<key>IOProbeScore</key>
-			<integer>0</integer>
-			<key>IOProviderClass</key>
-			<string>AppleHDACodec</string>
-			<key>InputSampleLatency</key>
-			<integer>0</integer>
-			<key>MultiDisplayPorts</key>
-			<array>
-				<integer>32</integer>
-				<integer>35</integer>
-				<integer>66</integer>
-			</array>
-			<key>OutputSampleLatency</key>
-			<integer>0</integer>
-			<key>SampleOffsetPad</key>
-			<integer>0</integer>
-			<key>SystemSpecificSampleOffsetPad</key>
-			<array>
-				<dict>
-					<key>LayoutID</key>
-					<integer>8</integer>
-					<key>SampleOffsetPad</key>
-					<integer>260</integer>
-				</dict>
-			</array>
-		</dict>
-		<key>HDA Generic Codec Driver</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleHDA</string>
-			<key>IOClass</key>
-			<string>AppleHDACodecGeneric</string>
-			<key>IOHDACodecFunctionGroupType</key>
-			<integer>1</integer>
-			<key>IOProviderClass</key>
-			<string>IOHDACodecFunction</string>
-		</dict>
-		<key>HDMI DP HDA Driver</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleHDA</string>
-			<key>IOClass</key>
-			<string>AppleHDAHDMI_DPDriver</string>
-			<key>IOProbeScore</key>
-			<integer>1</integer>
-			<key>IOPropertyMatch</key>
-			<dict>
-				<key>HDMIDPAudioCapabilities</key>
-				<true/>
-			</dict>
-			<key>IOProviderClass</key>
-			<string>AppleHDACodec</string>
-			<key>InputSampleLatency</key>
-			<integer>0</integer>
-			<key>MultiDisplayPorts</key>
-			<array>
-				<integer>32</integer>
-				<integer>35</integer>
-				<integer>66</integer>
-			</array>
-			<key>OutputSampleLatency</key>
-			<integer>0</integer>
-			<key>SampleOffsetPad</key>
-			<integer>0</integer>
-			<key>SystemSpecificSampleOffsetPad</key>
-			<array>
-				<dict>
-					<key>LayoutID</key>
-					<integer>8</integer>
-					<key>SampleOffsetPad</key>
-					<integer>260</integer>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>AppleHDA 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>com.apple.driver.AppleHDAController</key>
-		<string>1.7.2a1</string>
-		<key>com.apple.driver.DspFuncLib</key>
-		<string>1.5.2a1</string>
-		<key>com.apple.iokit.IOAudioFamily</key>
-		<string>200.5</string>
-		<key>com.apple.iokit.IOGraphicsFamily</key>
-		<string>2.0</string>
-		<key>com.apple.iokit.IOHDAFamily</key>
-		<string>265.88</string>
-		<key>com.apple.iokit.IONDRVSupport</key>
-		<string>2.0</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.private</key>
-		<string>8.0.0</string>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleHDAController.kext/Contents/Info.plist

@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16B2657</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>AppleHDAController</string>
-	<key>CFBundleGetInfoString</key>
-	<string>AppleHDAController 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.apple.driver.AppleHDAController</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>HDA Controller Driver</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9P107g</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17G55</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13internal</string>
-	<key>DTXcode</key>
-	<string>0930</string>
-	<key>DTXcodeBuild</key>
-	<string>9P107g</string>
-	<key>IOKitPersonalities</key>
-	<dict>
-		<key>BuiltInHDA</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleHDAController</string>
-			<key>CodecAddressFilterArray</key>
-			<array>
-				<dict>
-					<key>CodecAddressMask</key>
-					<data>
-					AQAAAA==
-					</data>
-					<key>LayoutID</key>
-					<integer>16392</integer>
-					<key>PCIVendorDeviceID</key>
-					<integer>282987200</integer>
-				</dict>
-				<dict>
-					<key>CodecAddressMask</key>
-					<data>
-					AQAAAA==
-					</data>
-					<key>LayoutID</key>
-					<integer>0</integer>
-					<key>PCIVendorDeviceID</key>
-					<integer>282987200</integer>
-				</dict>
-				<dict>
-					<key>CodecAddressMask</key>
-					<data>
-					CQAAAA==
-					</data>
-					<key>LayoutID</key>
-					<integer>65</integer>
-					<key>PCIVendorDeviceID</key>
-					<integer>282987200</integer>
-				</dict>
-				<dict>
-					<key>CodecAddressMask</key>
-					<data>
-					AQAAAA==
-					</data>
-					<key>LayoutID</key>
-					<integer>73</integer>
-					<key>PCIVendorDeviceID</key>
-					<integer>282987200</integer>
-				</dict>
-			</array>
-			<key>DPAlwaysDisplayRouting</key>
-			<array>
-				<integer>3</integer>
-				<integer>33</integer>
-				<integer>35</integer>
-				<integer>88</integer>
-			</array>
-			<key>DPAudioDeviceExclusion</key>
-			<array>
-				<dict>
-					<key>ManufacturerID</key>
-					<integer>1552</integer>
-					<key>ProductID</key>
-					<integer>10130</integer>
-				</dict>
-			</array>
-			<key>HighFIFOLimitSupport</key>
-			<array/>
-			<key>HwFactoryPrefixTranslation</key>
-			<array>
-				<dict>
-					<key>LayoutID</key>
-					<integer>78</integer>
-					<key>SourceDID</key>
-					<integer>43584</integer>
-					<key>StandInDID</key>
-					<integer>43568</integer>
-					<key>VID</key>
-					<integer>4098</integer>
-				</dict>
-				<dict>
-					<key>LayoutID</key>
-					<integer>78</integer>
-					<key>SourceDID</key>
-					<integer>43576</integer>
-					<key>StandInDID</key>
-					<integer>43568</integer>
-					<key>VID</key>
-					<integer>4098</integer>
-				</dict>
-				<dict>
-					<key>LayoutID</key>
-					<integer>79</integer>
-					<key>SourceDID</key>
-					<integer>43584</integer>
-					<key>StandInDID</key>
-					<integer>43568</integer>
-					<key>VID</key>
-					<integer>4098</integer>
-				</dict>
-				<dict>
-					<key>LayoutID</key>
-					<integer>79</integer>
-					<key>SourceDID</key>
-					<integer>43576</integer>
-					<key>StandInDID</key>
-					<integer>43568</integer>
-					<key>VID</key>
-					<integer>4098</integer>
-				</dict>
-			</array>
-			<key>IOClass</key>
-			<string>AppleHDAController</string>
-			<key>IOPCIClassMatch</key>
-			<string>0x04010000&amp;0xFFFD0000</string>
-			<key>IOProviderClass</key>
-			<string>IOPCIDevice</string>
-			<key>RequireMaxBusStall</key>
-			<array>
-				<dict>
-					<key>Layouts</key>
-					<array/>
-					<key>MaxBusStall</key>
-					<integer>15000</integer>
-				</dict>
-			</array>
-		</dict>
-		<key>BuiltInHDA9D70</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleHDAController</string>
-			<key>DPAlwaysDisplayRouting</key>
-			<array>
-				<integer>3</integer>
-				<integer>33</integer>
-				<integer>35</integer>
-				<integer>88</integer>
-			</array>
-			<key>DPAudioDeviceExclusion</key>
-			<array>
-				<dict>
-					<key>ManufacturerID</key>
-					<integer>1552</integer>
-					<key>ProductID</key>
-					<integer>10130</integer>
-				</dict>
-			</array>
-			<key>HighFIFOLimitSupport</key>
-			<array/>
-			<key>HwFactoryPrefixTranslation</key>
-			<array>
-				<dict>
-					<key>LayoutID</key>
-					<integer>78</integer>
-					<key>SourceDID</key>
-					<integer>43584</integer>
-					<key>StandInDID</key>
-					<integer>43568</integer>
-					<key>VID</key>
-					<integer>4098</integer>
-				</dict>
-				<dict>
-					<key>LayoutID</key>
-					<integer>78</integer>
-					<key>SourceDID</key>
-					<integer>43576</integer>
-					<key>StandInDID</key>
-					<integer>43568</integer>
-					<key>VID</key>
-					<integer>4098</integer>
-				</dict>
-				<dict>
-					<key>LayoutID</key>
-					<integer>79</integer>
-					<key>SourceDID</key>
-					<integer>43584</integer>
-					<key>StandInDID</key>
-					<integer>43568</integer>
-					<key>VID</key>
-					<integer>4098</integer>
-				</dict>
-				<dict>
-					<key>LayoutID</key>
-					<integer>79</integer>
-					<key>SourceDID</key>
-					<integer>43576</integer>
-					<key>StandInDID</key>
-					<integer>43568</integer>
-					<key>VID</key>
-					<integer>4098</integer>
-				</dict>
-			</array>
-			<key>IOClass</key>
-			<string>AppleHDA8086_9D70Controller</string>
-			<key>IONameMatch</key>
-			<array>
-				<string>pci8086,9d70</string>
-			</array>
-			<key>IOProbeScore</key>
-			<integer>2</integer>
-			<key>IOProviderClass</key>
-			<string>IOPCIDevice</string>
-			<key>RequireMaxBusStall</key>
-			<array>
-				<dict>
-					<key>Layouts</key>
-					<array/>
-					<key>MaxBusStall</key>
-					<integer>15000</integer>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>AppleHDAController 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>OSBundleCompatibleVersion</key>
-	<string>1.0.0d1</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>com.apple.iokit.IOAudioFamily</key>
-		<string>200.5</string>
-		<key>com.apple.iokit.IOGraphicsFamily</key>
-		<string>2.0</string>
-		<key>com.apple.iokit.IOHDAFamily</key>
-		<string>265.88</string>
-		<key>com.apple.iokit.IOPCIFamily</key>
-		<string>1.1</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.private</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.unsupported</key>
-		<string>12.0</string>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleHDAController.kext/Contents/_CodeSignature/CodeResources

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>version.plist</key>
-		<data>
-		MkagQ8RqPBVBLjUnVDMdBf0bdbA=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>version.plist</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			8wv4uOE1w0u8JZr9RrUO5KJOO06smBjE2sAJ1esrGNQ=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleHDAController.kext/Contents/version.plist

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildAliasOf</key>
-	<string>AppleHDA</string>
-	<key>BuildVersion</key>
-	<string>603</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>ProjectName</key>
-	<string>AppleHDA</string>
-	<key>SourceVersion</key>
-	<string>281052000000000</string>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleHDAHALPlugIn.bundle/Contents/Info.plist

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16B2657</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>AppleHDAHALPlugIn</string>
-	<key>CFBundleGetInfoString</key>
-	<string>AppleHDAHALPlugIn 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.apple.audio.AppleHDAHALPlugIn</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Apple HDA HAL Plug-in</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleSignature</key>
-	<string>aaud</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9P107g</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17G1z</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13internal</string>
-	<key>DTXcode</key>
-	<string>0930</string>
-	<key>DTXcodeBuild</key>
-	<string>9P107g</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>AppleHDAHALPlugIn 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleHDAHALPlugIn.bundle/Contents/_CodeSignature/CodeResources

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>version.plist</key>
-		<data>
-		a5qT6AxomQnjhCdw2wlr7bw85F0=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>version.plist</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			rz/HdLGPMBsupqNzQAn+OYfnsy1yG4sxFrDcxsshYUY=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleHDAHALPlugIn.bundle/Contents/version.plist

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildAliasOf</key>
-	<string>AppleHDA</string>
-	<key>BuildVersion</key>
-	<string>186</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>ProjectName</key>
-	<string>AppleHDA_frameworks</string>
-	<key>SourceVersion</key>
-	<string>281052000000000</string>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleHDAHardwareConfigDriver.kext/Contents/_CodeSignature/CodeResources

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>version.plist</key>
-		<data>
-		MkagQ8RqPBVBLjUnVDMdBf0bdbA=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>version.plist</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			8wv4uOE1w0u8JZr9RrUO5KJOO06smBjE2sAJ1esrGNQ=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleHDAHardwareConfigDriver.kext/Contents/version.plist

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildAliasOf</key>
-	<string>AppleHDA</string>
-	<key>BuildVersion</key>
-	<string>603</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>ProjectName</key>
-	<string>AppleHDA</string>
-	<key>SourceVersion</key>
-	<string>281052000000000</string>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleMikeyDriver.kext/Contents/Info.plist

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16B2657</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>AppleMikeyDriver</string>
-	<key>CFBundleGetInfoString</key>
-	<string>AppleMikeyDriver 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.apple.driver.AppleMikeyDriver</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Apple Mikey Driver</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9P107g</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17G55</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13internal</string>
-	<key>DTXcode</key>
-	<string>0930</string>
-	<key>DTXcodeBuild</key>
-	<string>9P107g</string>
-	<key>IOKitPersonalities</key>
-	<dict>
-		<key>AppleMikeyDriver</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleMikeyDriver</string>
-			<key>IOClass</key>
-			<string>AppleMikeyDriver</string>
-			<key>IONameMatch</key>
-			<array>
-				<string>mikey</string>
-				<string>MKY0</string>
-				<string>MKY1</string>
-			</array>
-			<key>IOProviderClass</key>
-			<string>AppleSMBusDevice</string>
-		</dict>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>AppleMikeyDriver 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>com.apple.driver.AppleSMBusController</key>
-		<string>1.0.1d0</string>
-		<key>com.apple.iokit.IOACPIFamily</key>
-		<string>1.2.0a1</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0.0b3</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>8.0.0b3</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0.0b3</string>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0.0b3</string>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleMikeyDriver.kext/Contents/_CodeSignature/CodeResources

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>version.plist</key>
-		<data>
-		MkagQ8RqPBVBLjUnVDMdBf0bdbA=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>version.plist</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			8wv4uOE1w0u8JZr9RrUO5KJOO06smBjE2sAJ1esrGNQ=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/AppleMikeyDriver.kext/Contents/version.plist

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildAliasOf</key>
-	<string>AppleHDA</string>
-	<key>BuildVersion</key>
-	<string>603</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>ProjectName</key>
-	<string>AppleHDA</string>
-	<key>SourceVersion</key>
-	<string>281052000000000</string>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/DspFuncLib.kext/Contents/Info.plist

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16B2657</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>DspFuncLib</string>
-	<key>CFBundleGetInfoString</key>
-	<string>DspFuncLib 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.apple.driver.DspFuncLib</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Apple Dsp Function Library</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9P107g</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17G55</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13internal</string>
-	<key>DTXcode</key>
-	<string>0930</string>
-	<key>DTXcodeBuild</key>
-	<string>9P107g</string>
-	<key>IOKitPersonalities</key>
-	<dict/>
-	<key>NSHumanReadableCopyright</key>
-	<string>DspFuncLib 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>OSBundleCompatibleVersion</key>
-	<string>1.0.0a1</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>com.apple.driver.AppleEFINVRAM</key>
-		<string>2.0.0</string>
-		<key>com.apple.iokit.IOAudioFamily</key>
-		<string>1.7.0fc16</string>
-		<key>com.apple.kext.OSvKernDSPLib</key>
-		<string>1.9</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0.0b3</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>8.0.0b3</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0.0b3</string>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0.0b3</string>
-		<key>com.apple.kpi.private</key>
-		<string>8.0.0b3</string>
-		<key>com.apple.vecLib.kext</key>
-		<string>1.0</string>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/DspFuncLib.kext/Contents/_CodeSignature/CodeResources

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>version.plist</key>
-		<data>
-		MkagQ8RqPBVBLjUnVDMdBf0bdbA=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>version.plist</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			8wv4uOE1w0u8JZr9RrUO5KJOO06smBjE2sAJ1esrGNQ=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/DspFuncLib.kext/Contents/version.plist

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildAliasOf</key>
-	<string>AppleHDA</string>
-	<key>BuildVersion</key>
-	<string>603</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>ProjectName</key>
-	<string>AppleHDA</string>
-	<key>SourceVersion</key>
-	<string>281052000000000</string>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/IOHDAFamily.kext/Contents/Info.plist

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16B2657</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>IOHDAFamily</string>
-	<key>CFBundleGetInfoString</key>
-	<string>IOHDAFamily 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.apple.iokit.IOHDAFamily</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>I/O Kit High Definition Audio Family</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9P107g</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17G55</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13internal</string>
-	<key>DTXcode</key>
-	<string>0930</string>
-	<key>DTXcodeBuild</key>
-	<string>9P107g</string>
-	<key>IOKitPersonalities</key>
-	<dict>
-		<key>HD Audio Codec</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.iokit.IOHDAFamily</string>
-			<key>IOClass</key>
-			<string>IOHDACodecDriver</string>
-			<key>IOProviderClass</key>
-			<string>IOHDACodecDevice</string>
-		</dict>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>IOHDAFamily 281.52, Copyright © 2000-2017 Apple Inc. All rights reserved.</string>
-	<key>OSBundleCompatibleVersion</key>
-	<string>1.0.0d1</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0.0</string>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/IOHDAFamily.kext/Contents/_CodeSignature/CodeResources

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>version.plist</key>
-		<data>
-		MkagQ8RqPBVBLjUnVDMdBf0bdbA=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>version.plist</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			8wv4uOE1w0u8JZr9RrUO5KJOO06smBjE2sAJ1esrGNQ=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

payloads/Apple/Extensions/Audio/AppleHDA.kext/Contents/PlugIns/IOHDAFamily.kext/Contents/version.plist

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildAliasOf</key>
-	<string>AppleHDA</string>
-	<key>BuildVersion</key>
-	<string>603</string>
-	<key>CFBundleShortVersionString</key>
-	<string>281.52</string>
-	<key>CFBundleVersion</key>
-	<string>281.52</string>
-	<key>ProjectName</key>
-	<string>AppleHDA</string>
-	<key>SourceVersion</key>
-	<string>281052000000000</string>
-</dict>
-</plist>