Fix function cast

Fix board ID call
Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/571
2026-04-15 13:18:56 +10:00 · 2021-10-15 16:09:47 -06:00 · 2021-10-15 09:33:34 -06:00 · 2021-10-15 09:23:05 -06:00 · 2021-10-14 19:05:34 -06:00 · 2021-10-13 15:06:43 -06:00
111 changed files with 8913 additions and 4352 deletions
--- a/.flake8
+++ b/.flake8
@@ -1,4 +1,4 @@
 [flake8]
 extend-ignore = E501, E203
 per-file-ignores =
-    Resources/Constants.py:E704
+    Resources/constants.py:E704
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,34 +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)
-
-For in-depth hardware logs, we highly encourage users to run [IORegistryExplorer](https://github.com/khronokernel/IORegistryClone/blob/master/ioreg-210.zip?raw=true) and send the output
-* ie. `File -> SaveAs`
-
-**Additional context**
-Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.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
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
--- a/.github/workflows/build-app-offline.yml
+++ b/.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 ./payloads/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-Offline.app.zip
+          tag: ${{ github.ref }}
+          file_glob: true
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/build-app.yml
@@ -1,4 +1,4 @@
-name: CI - Build App
+name: CI - Build TUI

 on:
  push:
@@ -8,31 +8,26 @@ on:

 jobs:
  build:
-    name: Build App
-    runs-on: self-hosted
+    name: Build TUI
+    runs-on: x86_64_mojave
    steps:
      - uses: actions/checkout@v2
-
-      - name: Install Python Dependencies
-        run: pip3 install --upgrade pyinstaller requests
-
-      - run: pyinstaller OpenCore-Patcher.spec
+      - 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 --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
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/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.app
-          path: OpenCore-Patcher.app.zip
+          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.app.zip
+          file: OpenCore-Patcher-TUI.app.zip
          tag: ${{ github.ref }}
          file_glob: true
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -1,32 +0,0 @@
-name: CI - Build CLI
-
-on:
-  push:
-  workflow_dispatch:
-  release:
-    types: [published]
-
-jobs:
-  build:
-    name: Build CLI
-    runs-on: self-hosted
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Python Dependencies
-        run: pip3 install --upgrade pyinstaller requests
-
-      - run: pyinstaller OCLP-CLI.spec
-      - run: cd dist; zip ../OCLP-CLI.zip OCLP-CLI
-      - name: Upload Binary 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: OCLP-CLI.zip
-          tag: ${{ github.ref }}
-          file_glob: true
--- a/.github/workflows/build-gui.yml
+++ b/.github/workflows/build-gui.yml
@@ -0,0 +1,49 @@
+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 OpenCore-Patcher.spec
+      - run: cd dist; cp OpenCore-Patcher ../; cd ..; mv OpenCore-Patcher 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 --insecure
+      - 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 ./payloads/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 ./payloads/entitlements.plist -o runtime "OpenCore Patcher.app/Contents/Resources/oclpd"'
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements ./payloads/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
+      - 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
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 .DS_Store
 OCLP-GUI.command
 /payloads/Apple
-/payloads/Apple.zip
+/payloads/*.zip
 /payloads/__MACOSX
 /App
 /Build-Folder
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,147 @@
 # OpenCore Legacy Patcher changelog

+## 0.3.0
+- Fix Nvidia Tesla Acceleration in Monterey Beta 7+
+  - Add missing NVDAStartup
+- Allow configuring GMUX usage for Windows
+   - Applicable for iGPU+dGPU MacBook Pros
+- Allow usage of legacy AppleHDA
+   - Only use for machines that cannot achieve audio support normally
+   - Main usage for Macs without boot screen output
+- Revert iMacPro1,1 SMBIOS usage on Mac Pros and Xserves
+  - Resolves display output issues on Legacy GCN
+- Limit SIP bits flipped when disabled
+  - 0xFEF -> 0xE03
+      - `CSR_ALLOW_UNTRUSTED_KEXTS`
+      - `CSR_ALLOW_UNRESTRICTED_FS`
+      - `CSR_ALLOW_UNAPPROVED_KEXTS`
+      - `CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE`
+      - `CSR_ALLOW_UNAUTHENTICATED_ROOT`
+- Fix Kepler DisplayPort output
+  - Apply `agdpmod=vit9696` patch
+- Add Syncretic's SurPlus 11.3+ Race Condition Patch
+  - [Source](https://github.com/reenigneorcim/SurPlus)
+- Downgrade Nvidia Kepler Bundles to 11.0 Beta 3
+  - Resolves crashing at high loads, credit to [Jackluke](https://github.com/jacklukem) for discovery
+- Add Legacy GMUX patchsets
+  - Applicable for dual GPU MacBookPro5,x and demuxed MacBookPro8,x
+- Increment Binaries:
+  - PatcherSupportPkg 0.1.7 release
+  - RestrictEvents  1.0.5 rolling (2430ed0)
+- Limit MacBookPro6,2 G State
+  - Works around crashing when switching GPUs
+- Fix OTA updates on T2 SMBIOS
+- Allow iMac13,x iGPU usage always
+  - Due to both Kepler and Ivy needing root patching, no benefit to disable the iGPU
+- Refactor Hardware Model building
+- Resolve dGPU output on MacBookPro10,1
+- Add Panel ID `9cd6` for iMac11,3
+  - Resolves Brightness control
+- Add AppleGVA patch set for HD3000 machines
+  - Mainly applicable for iMac12,x and iGPU-only MacBooks
+- Add EFICheckDisabler
+  - Based off stripped RestrictEvents.kext
+- Add SimpleMSR to disable missing battery throttling on Nehalem+ MacBooks
+- Implement software demux patch set for 2011 15/17" MacBook Pros
+  - Alternative to hardware demux
+  - Adds [AMDGPUWakeHandler](https://github.com/blackgate/AMDGPUWakeHandler)
+- Add Legacy GCN support for iMac11,x and iMac12,x with upgraded GPUs
+  - Note: iMac12,x with legacy GCN will fail to wake
+- Fix Beta 10 Bluetooth
+  - Works around new Broadcom/CSR vendor checks in `bluetoothd`
+
+## 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
@@ -17,17 +155,21 @@
  - 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)
@@ -68,6 +210,7 @@
  - 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
@@ -84,6 +227,7 @@
 - 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
@@ -99,9 +243,11 @@
 - 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)
@@ -120,6 +266,7 @@
 - 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
@@ -145,6 +292,7 @@
  - 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
@@ -164,9 +312,11 @@
 - 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
@@ -187,6 +337,7 @@
 - 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
@@ -195,11 +346,13 @@
 - 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)
@@ -215,6 +368,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+)
@@ -233,6 +387,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
@@ -243,12 +398,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
@@ -264,12 +421,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
@@ -278,70 +437,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
+
 - Initial developer preview
--- a/OCLP-CLI.command
+++ b/OCLP-CLI.command
@@ -1,219 +0,0 @@
-#!/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
-
-
-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])
-
-        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("--skip_wifi", help="Skip wifi patches", 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("--disable_amfi", help="Disable AMFI", action="store_true", required=False)
-
-        # Building args requiring value values
-        parser.add_argument("--model", action="store", help="Set custom model", required=False)
-        parser.add_argument("--metal_gpu", action="store", help="Set Metal GPU Vendor", required=False)
-        parser.add_argument("--smbios_spoof", action="store", help="Set SMBIOS patching mode", 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("--terascale_2", help="Enable TeraScale 2 Acceleration", 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.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.skip_wifi:
-            print("- Set wifi skip configuration")
-            self.constants.wifi_build = 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.disable_amfi = True
-        if args.metal_gpu:
-            if args.metal_gpu == "Nvidia":
-                print("- Set Metal GPU patches to Nvidia")
-                self.constants.metal_build = True
-                self.constants.imac_vendor = "Nvidia"
-            elif args.metal_gpu == "AMD":
-                print("- Set Metal GPU patches to AMD")
-                self.constants.metal_build = True
-                self.constants.imac_vendor = "AMD"
-            else:
-                print(f"- Unknown GPU arg passed: {args.metal_gpu}")
-                self.constants.metal_build = False
-                self.constants.imac_vendor = "None"
-        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.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.build_opencore()
-        if args.patch_sys_vol:
-            if args.terascale_2:
-                print("- Set TeraScale 2 Accel configuration")
-                self.constants.terascale_2_patch = 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):
-        # Defaults
-        self.constants.sip_status = True
-        self.constants.secure_status = False  # Default false for Monterey
-        self.constants.disable_amfi = False
-
-        if model in ModelArray.LegacyGPU:
-            if (
-                host_is_target
-                and self.computer.dgpu
-                and self.computer.dgpu.arch
-                in [
-                    device_probe.AMD.Archs.Legacy_GCN,
-                    device_probe.AMD.Archs.Polaris,
-                    device_probe.AMD.Archs.Vega,
-                    device_probe.AMD.Archs.Navi,
-                    device_probe.NVIDIA.Archs.Kepler,
-                ]
-            ):
-                # Building on device and we have a native, supported GPU
-                self.constants.sip_status = True
-                # self.constants.secure_status = True  # Monterey
-                self.constants.disable_amfi = False
-            else:
-                self.constants.sip_status = False  # Unsigned kexts
-                self.constants.secure_status = False  # Root volume modified
-                self.constants.disable_amfi = True  # Unsigned binaries
-        if model in ModelArray.ModernGPU:
-            if host_is_target and model in ["iMac13,1", "iMac13,3"] and self.computer.dgpu:
-                # Some models have a supported dGPU, others don't
-                self.constants.sip_status = True
-                # self.constants.secure_status = True  # Monterey
-                # self.constants.disable_amfi = False  # Signed bundles, Don't need to explicitly set currently
-            else:
-                self.constants.sip_status = False  # Unsigned kexts
-                self.constants.secure_status = False  # Modified root volume
-                # self.constants.disable_amfi = False  # 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"
-
-    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()
-
-
-OpenCoreLegacyPatcher()
-
-# Example arg for OCLP command line
-# ./OCLP-CLI --build --verbose --debug_oc --debug_kext --model iMac11,2
--- a/OCLP-CLI.spec
+++ b/OCLP-CLI.spec
@@ -1,34 +0,0 @@
-# -*- 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'],
-             binaries=[],
-             datas=[('payloads', 'payloads'), ('Resources', 'Resources')],
-             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 )
--- a/OpenCore-Patcher.command
+++ b/OpenCore-Patcher.command
@@ -3,247 +3,40 @@

 from __future__ import print_function

-import platform
 import subprocess
 import sys
+from pathlib import Path

-from Resources import Build, CliMenu, Constants, ModelArray, SysPatch, Utilities, device_probe
+from resources import build, cli_menu, constants, utilities, device_probe, os_probe, defaults, arguments
+from data import model_array


 class OpenCoreLegacyPatcher:
    def __init__(self):
-        print("Loading...")
-        self.constants = Constants.Constants()
+        print("- Loading...")
+        self.constants = constants.Constants()
+        self.generate_base_data()
+        if utilities.check_cli_args() is None:
+            self.main_menu()
+
+    def generate_base_data(self):
+        self.constants.detected_os = os_probe.detect_kernel_major()
+        self.constants.detected_os_minor = os_probe.detect_kernel_minor()
+        self.constants.detected_os_build = os_probe.detect_kernel_build()
        self.constants.computer = device_probe.Computer.probe()
+        self.constants.recovery_status = utilities.check_recovery()
        self.computer = self.constants.computer
-        self.constants.detected_os = int(platform.uname().release.partition(".")[0])
-        self.set_defaults(self.computer.real_model, True)
-
-        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()
-
-    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.disable_amfi = False
-
-        if model in ModelArray.LegacyGPU:
-            if (
-                host_is_target
-                and self.computer.dgpu
-                and self.computer.dgpu.arch
-                in [
-                    device_probe.AMD.Archs.Legacy_GCN,
-                    device_probe.AMD.Archs.Polaris,
-                    device_probe.AMD.Archs.Vega,
-                    device_probe.AMD.Archs.Navi,
-                    device_probe.NVIDIA.Archs.Kepler,
-                ]
-            ):
-                # Building on device and we have a native, supported GPU
-                self.constants.sip_status = True
-                # self.constants.secure_status = True  # Monterey
-                self.constants.disable_amfi = False
-            else:
-                self.constants.sip_status = False  # Unsigned kexts
-                self.constants.secure_status = False  # Root volume modified
-                self.constants.disable_amfi = True  # Unsigned binaries
-        if model in ModelArray.ModernGPU:
-            if host_is_target and model in ["iMac13,1", "iMac13,3"] and self.computer.dgpu:
-                # Some models have a supported dGPU, others don't
-                self.constants.sip_status = True
-                # self.constants.secure_status = True  # Monterey
-                # self.constants.disable_amfi = False  # Signed bundles, Don't need to explicitly set currently
-            else:
-                self.constants.sip_status = False  # Unsigned kexts
-                self.constants.secure_status = False  # Modified root volume
-                # self.constants.disable_amfi = False  # 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"
-
-    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 change_model(self):
-        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_models = input(f"Print list of valid options for macOS {self.constants.os_support}? (y/n)")
-            if print_models.lower() in {"y", "yes"}:
-                print("\n".join(ModelArray.SupportedSMBIOS))
-                input("\nPress [ENTER] to continue")
+        defaults.generate_defaults.probe(self.computer.real_model, True, self.constants)
+        if utilities.check_cli_args() is not None:
+            print("- Detected arguments, switching to CLI mode")
+            self.constants.gui_mode = True  # Assumes no user interaction is required
+            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")
+            arguments.arguments().parse_arguments(self.constants)
        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)
-            options = [
-                [f"Enable Verbose Mode:\t\tCurrently {self.constants.verbose_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_verbose],
-                [f"Enable OpenCore DEBUG:\t\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\t\tCurrently {self.constants.kext_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_kext],
-                [f"Set ShowPicker Mode:\t\tCurrently {self.constants.showpicker}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_showpicker],
-                [f"Set Vault Mode:\t\t\tCurrently {self.constants.vault}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_vault],
-                [f"Allow FireWire Boot:\t\tCurrently {self.constants.firewire_boot}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_firewire],
-                [f"Allow NVMe Boot:\t\t\tCurrently {self.constants.nvme_boot}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_nvme],
-                [
-                    f"Enable TeraScale 2 Acceleration:\tCurrently {self.constants.terascale_2_patch}",
-                    CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).enable_terascale,
-                ],
-                [f"Disable AMFI:\t\t\tCurrently {self.constants.disable_amfi}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).set_amfi],
-                [
-                    f"Set SIP and SecureBootModel:\tSIP: {self.constants.sip_status} SBM: {self.constants.secure_status}",
-                    CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_sip,
-                ],
-                [
-                    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 Patch 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 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"Assume Metal GPU Always:\t\tCurrently {self.constants.imac_vendor}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_metal],
-                [f"Set SMBIOS Mode:\t\t\tCurrently {self.constants.serial_settings}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_serial],
-                [f"DRM Preferences:\t\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,
-                ],
-                [f"Override SMBIOS Spoof:\t\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],
-                ["Set SeedUtil Status", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).set_seedutil],
-            ]
-
-            for option in options:
-                menu.add_menu_option(option[0], function=option[1])
-
-            response = menu.start()
-
-    def credits(self):
-        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 and Innie"""
-            ],
-        ).start()
-
-    def PatchVolume(self):
-        Utilities.cls()
-        Utilities.header(["Patching System Volume"])
-        big_sur = """Patches Root volume to fix misc issues such as:
-
- Graphics Acceleration for non-Metal GPUs
-  - Nvidia: Tesla - Fermi (8000-500 series)
-  - Intel: Ironlake - Sandy Bridge
-  - 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.
-
-Supported Options:
-
-1. Patch System Volume
-2. Unpatch System Volume (Experimental)
-B. Exit
-        """
-        monterey = """Patches Root volume to fix misc issues such as:
-
- Graphics Acceleration
-  - Intel: Ivy Bridge (4000 series iGPUs)
- Basic Framebuffer and brightness Control (No acceleration)
-  - Nvidia: Tesla - Fermi (8000-500 series)
-  - Intel: Ironlake - Sandy Bridge
-  - 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.
-
-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)
-        else:
-            print(default)
-            no_patch = True
-        change_menu = input("Patch System Volume?: ")
-        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")
+            print("- No arguments present, loading TUI")

    def main_menu(self):
        response = None
@@ -253,11 +46,13 @@ B. Exit
                f"Selected Model: {self.constants.custom_model or self.computer.real_model}",
            ]

-            if (self.constants.custom_model or self.computer.real_model) not in ModelArray.SupportedSMBIOS and self.constants.allow_oc_everywhere is False:
+            if (self.constants.custom_model or self.computer.real_model) not in model_array.SupportedSMBIOS and self.constants.allow_oc_everywhere is False:
                in_between = [
                    "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.',
+                    '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.computer.real_model == "iMac7,1" and "SSE4.1" not in self.computer.cpu.flags:
                in_between = [
@@ -270,18 +65,18 @@ B. Exit
            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.computer.real_model) in ModelArray.SupportedSMBIOS) or self.constants.allow_oc_everywhere is True
+                [["Build OpenCore", build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).build_opencore]]
+                if ((self.constants.custom_model or self.computer.real_model) in model_array.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],
+                ["Install OpenCore to USB/internal drive", build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).copy_efi],
+                ["Post-Install Volume Patch", cli_menu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).PatchVolume],
+                ["Change Model", cli_menu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).change_model],
+                ["Patcher Settings", cli_menu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).patcher_settings],
+                ["Credits", cli_menu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).credits],
            ]

            for option in options:
@@ -293,4 +88,4 @@ B. Exit
            subprocess.run("""osascript -e 'tell application "Terminal" to close first window' & exit""", shell=True)


-OpenCoreLegacyPatcher().main_menu()
+OpenCoreLegacyPatcher()
--- a/OpenCore-Patcher.spec
+++ b/OpenCore-Patcher.spec
@@ -1,13 +1,14 @@
 # -*- mode: python ; coding: utf-8 -*-
 import sys, os
 sys.path.append(os.path.abspath(os.getcwd()))
-from Resources import Constants
+from resources import constants
 block_cipher = None


 a = Analysis(['OpenCore-Patcher.command'],
+             pathex=['resources', 'data'],
             binaries=[],
-             datas=[('payloads', 'payloads'), ('Resources', 'Resources')],
+             datas=[('payloads', 'payloads')],
             hiddenimports=[],
             hookspath=[],
             runtime_hooks=[],
@@ -34,10 +35,10 @@ exe = EXE(pyz,
          console=True )
 app = BUNDLE(exe,
         name='OpenCore-Patcher.app',
-         icon="OC-Patcher.icns",
+         icon="payloads/OC-Patcher.icns",
         bundle_identifier=None,
         info_plist={
-             "CFBundleShortVersionString": Constants.Constants().patcher_version,
+             "CFBundleShortVersionString": constants.Constants().patcher_version,
             "CFBundleExecutable": "MacOS/Launcher",
             "NSHumanReadableCopyright": "Copyright 2020-2021 Dortania"
         })
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
             <h1>OpenCore Legacy Patcher</h1>
 </div>

-A python program 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.
+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:

@@ -20,7 +20,8 @@ Note: Only clean-installs and upgrades are supported, macOS Big Sur installs alr

 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)
+* 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

@@ -28,7 +29,12 @@ To get aid with the patcher, we recommend joining the [OpenCore Patcher Paradise

 * [OpenCore Legacy Patcher's Issue's tab](https://github.com/dortania/OpenCore-Legacy-Patcher/issues)

-Nightly builds can be found here courteous of nightly.link: [Nightly OpenCore-Patcher.app](https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app/main/OpenCore-Patcher.app.zip)
+Nightly builds can be found here courteous of nightly.link: 
+
+* [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)

 ## Credits

@@ -49,11 +55,18 @@ Nightly builds can be found here courteous of nightly.link: [Nightly OpenCore-Pa
  * 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) and [BarryKN](https://github.com/BarryKN)
+  * [AAAMouSSE](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/), [telemetrap](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/post-28447707) and [SurPlus](https://github.com/reenigneorcim/SurPlus)
+* [dosdude1](https://github.com/dosdude1)
+  * Main author of GUI
+  * Development of previous patchers, laying out much of what needs to be patched
+* [parrotgeek1](https://github.com/parrotgeek1)
+  * [VMM Patch Set](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/4a8f61a01da72b38a4b2250386cc4b497a31a839/payloads/Config/config.plist#L1222-L1281)
+* [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
+* [arter97](https://github.com/arter97/)
+  * [SimpleMSR](https://github.com/arter97/SimpleMSR/) to disable firmware throttling in Nehalem+ MacBooks without batteries
 * MacRumors and Unsupported Mac Communities
  * Endless testing, reporting issues
 * Apple
--- a/Resources/CliMenu.py
+++ b/Resources/CliMenu.py
@@ -1,479 +0,0 @@
-# Handle misc CLI menu options
-# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
-from __future__ import print_function
-import subprocess
-
-from Resources import Constants, Utilities
-
-
-class MenuOptions:
-    def __init__(self, model, versions):
-        self.model = model
-        self.constants: Constants.Constants = versions
-
-    def change_verbose(self):
-        Utilities.cls()
-        Utilities.header(["Set Verbose mode"])
-        change_menu = input("Enable Verbose mode(y/n): ")
-        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
-        else:
-            print("Invalid option")
-
-    def change_oc(self):
-        Utilities.cls()
-        Utilities.header(["Set OpenCore DEBUG mode"])
-        change_menu = input("Enable OpenCore DEBUG mode(y/n): ")
-        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"
-        else:
-            print("Invalid option")
-
-    def change_kext(self):
-        Utilities.cls()
-        Utilities.header(["Set Kext DEBUG mode"])
-        change_menu = input("Enable Kext DEBUG mode(y/n): ")
-        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
-        else:
-            print("Invalid option")
-
-    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
-Patcher assumes based on stock configuration (ie. iMac10,x-12,x)
-
-Valid Options:
-
-1. None(stock GPU)
-2. Nvidia GPU
-3. AMD GPU
-
-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
-            self.constants.imac_vendor = "None"
-        elif change_menu == "2":
-            self.constants.metal_build = True
-            self.constants.imac_vendor = "Nvidia"
-        elif change_menu == "3":
-            self.constants.metal_build = True
-            self.constants.imac_vendor = "AMD"
-        else:
-            print("Invalid option")
-
-    def change_serial(self):
-        Utilities.cls()
-        Utilities.header(["Set SMBIOS Mode"])
-        print(
-            """This section is for setting how OpenCore generates the SMBIOS
-Recommended for adanced users who want control how serials are handled
-
-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
-
-Note: For new users we recommend leaving as default(1. Minimal)
-        """
-        )
-        change_menu = input("Set SMBIOS Mode(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"
-        else:
-            print("Invalid option")
-
-    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,
-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): ")
-        if change_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.showpicker = True
-        elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.showpicker = False
-        else:
-            print("Invalid option")
-
-    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
-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 security reasons, OpenShell will be disabled when Vault is set.
-
-        """
-        )
-        change_menu = input("Enable Vault(y/n): ")
-        if change_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.vault = True
-        elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.vault = False
-        else:
-            print("Invalid option")
-
-    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.
-Only disable is absolutely necessary. SIP value = 0xFEF
-
-Valid options:
-
-1. Enable Both
-2. Disable SIP only
-3. Disable SecureBootModel Only
-4. Disable Both
-
-        """
-        )
-        change_menu = input("Set SIP and SecureBootModel(ie. 1): ")
-        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
-        else:
-            print("Invalid option")
-
-    def set_amfi(self):
-        Utilities.cls()
-        Utilities.header(["Disable 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): ")
-        if change_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.disable_amfi = True
-        elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.disable_amfi = False
-        else:
-            print("Invalid option")
-
-    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. System/Library/CoreServices/boot.efi (default)
-2. EFI/BOOT/BOOTx64.efi
-3. Exit
-
-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.boot_efi = False
-        elif change_menu == "2":
-            self.constants.boot_efi = True
-        else:
-            print("Invalid option")
-
-    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): ")
-        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
-        else:
-            print("Invalid option")
-
-    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): ")
-        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"
-        else:
-            print("Invalid option")
-
-    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)
-        """
-        )
-        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: ")
-        else:
-            print("Invalid option")
-
-    def custom_color_thing(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: Custom Color
-2. Reset
-        """
-        )
-        change_menu = input("Set custom CPU Name(1,2,3): ")
-        if change_menu == "1":
-            print("")
-            # temp_tk_root = tk.Tk()
-            # temp_tk_root.wm_withdraw()
-            # self.constants.custom_color = colorchooser.askcolor(title="Choose color")
-            # temp_tk_root.destroy()
-        elif change_menu == "2":
-            self.constants.custom_color = ""
-        else:
-            print("Invalid option")
-
-    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): ")
-        if change_menu == "y":
-            self.constants.disallow_cpufriend = True
-        elif change_menu == "n":
-            self.constants.disallow_cpufriend = False
-        else:
-            print("Invalid option")
-
-    def set_seedutil(self):
-        Utilities.cls()
-        Utilities.header(["Set SeedUtil Status"])
-        print(
-            """Used for setting OS Update Preferences
-
-Valid options:
-1. Public Release Seed (Default)
-2. Public Beta Seed
-3. Developer Beta Seed
-4. Check SeedUtil's current status
-        """
-        )
-
-        change_menu = input("Set update status(Press [ENTER] to exit): ")
-        if change_menu == "1":
-            subprocess.run(["sudo", "/System/Library/PrivateFrameworks/Seeding.framework/Versions/A/Resources/seedutil", "unenroll"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        elif change_menu == "2":
-            subprocess.run(["sudo", "/System/Library/PrivateFrameworks/Seeding.framework/Versions/A/Resources/seedutil", "unenroll"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            subprocess.run(
-                ["sudo", "/System/Library/PrivateFrameworks/Seeding.framework/Versions/A/Resources/seedutil", "enroll", "PublicSeed"], stdout=subprocess.PIPE
-            ).stdout.decode().strip().encode()
-        elif change_menu == "3":
-            subprocess.run(["sudo", "/System/Library/PrivateFrameworks/Seeding.framework/Versions/A/Resources/seedutil", "unenroll"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            subprocess.run(
-                ["sudo", "/System/Library/PrivateFrameworks/Seeding.framework/Versions/A/Resources/seedutil", "enroll", "DeveloperSeed"], stdout=subprocess.PIPE
-            ).stdout.decode().strip().encode()
-        elif change_menu == "4":
-            result = subprocess.run(["sudo", "/System/Library/PrivateFrameworks/Seeding.framework/Versions/A/Resources/seedutil", "current"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            result = [i.partition(":")[2] for i in result.stdout.decode().split("\n") if "Currently enrolled in" in i][0]
-            print(f"SeedUtil Current Status: {result}")
-            input("\nPress [ENTER] to continue")
-            self.set_seedutil()
-        else:
-            print("Returning to main menu")
-
-    def set_smbios(self):
-        Utilities.cls()
-        Utilities.header(["Override SMBIOS Spoof"])
-        print(
-            """Change model OpenCore spoofs Mac too
-
-Valid options:
-1. Default set by OpenCore (Default)
-2. User Override
-3. Disable all spoofing (unsupported configuration)
-        """
-        )
-
-        change_menu = input("Set SMBIOS status: ")
-        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
-        else:
-            print("Returning to main menu")
-
-    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): ")
-        if change_menu == "y":
-            self.constants.firewire_boot = True
-        elif change_menu == "n":
-            self.constants.firewire_boot = False
-        else:
-            print("Invalid option")
-
-    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): ")
-        if change_menu == "y":
-            self.constants.nvme_boot = True
-        elif change_menu == "n":
-            self.constants.nvme_boot = False
-        else:
-            print("Invalid option")
-
-    def enable_terascale(self):
-        Utilities.cls()
-        Utilities.header(["Enable TeraScale 2 Acceleration"])
-        print(
-            """
-Currently TeraScale 2 graphics acceleration is in beta with
-some unfortunate bugs on login including strobing colours
-until the user forces Million Colours on the Display with
-SwitchResX or resXtreme
-
-Users sensitive to seizures should avoid using TeraScale 2
-patches or ask someone to handle inital setup to ensure
-no issues
-
-Note: Acceleration only applies to macOS Big Sur
-        """
-        )
-
-        change_menu = input("Enable TS2 Acceleration?(y/n): ")
-        if change_menu == "y":
-            self.constants.terascale_2_patch = True
-        elif change_menu == "n":
-            self.constants.terascale_2_patch = False
-        else:
-            print("Invalid option")
--- a/Resources/ModelArray.py
+++ b/Resources/ModelArray.py
@@ -1,957 +0,0 @@
-# Lists all models and required patches
-# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
-SupportedSMBIOS = [
-    # MacBook
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBook8,1",
-    # MacBook Air
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookAir4,1",
-    "MacBookAir4,2",
-    "MacBookAir5,1",
-    "MacBookAir5,2",
-    "MacBookAir6,1",
-    "MacBookAir6,2",
-    # MacBook Pro
-    "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",
-    # Mac Mini
-    "Macmini3,1",
-    "Macmini4,1",
-    "Macmini5,1",
-    "Macmini5,2",
-    "Macmini5,3",
-    "Macmini6,1",
-    "Macmini6,2",
-    # iMac
-    "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",
-    # Mac Pro
-    "MacPro3,1",
-    "MacPro4,1",
-    "MacPro5,1",
-    # Xserve
-    "Xserve2,1",
-    "Xserve3,1",
-    "Dortania1,1",
-]
-
-# CPU patches
-
-MissingSSE42 = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookPro4,1",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro5,5",
-    "MacBookPro7,1",
-    "Macmini3,1",
-    "Macmini4,1",
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-    "iMac10,1",
-    "MacPro3,1",
-    "Xserve2,1",
-    "Dortania1,1",
-]
-
-SSEEmulator = ["MacPro3,1", "Xserve2,1", "Dortania1,1"]
-
-DualSocket = ["MacPro3,1", "MacPro4,1", "MacPro5,1", "Xserve2,1", "Xserve3,1", "Dortania1,1"]
-
-pciSSDT = ["MacBookPro6,1", "MacBookPro6,2", "iMac11,1", "iMac11,2", "iMac11,3", "Dortania1,1"]
-
-# Ethernet patches
-
-EthernetNvidia = [
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro5,5",
-    "Macmini3,1",
-    "iMac9,1",
-    "iMac10,1",
-    "Dortania1,1",
-]
-EthernetMarvell = ["MacBook4,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "Dortania1,1"]
-EthernetBroadcom = [
-    "MacBookAir4,1",
-    "MacBookAir4,2",
-    "MacBookPro6,1",
-    "MacBookPro6,2",
-    "MacBookPro7,1",
-    "MacBookPro8,1",
-    "MacBookPro8,2",
-    "MacBookPro8,3",
-    "Macmini4,1",
-    "Macmini5,1",
-    "Macmini5,2",
-    "Macmini5,3",
-    "iMac11,1",
-    "iMac11,2",
-    "iMac11,3",
-    "iMac12,1",
-    "iMac12,2",
-    "Dortania1,1",
-]
-
-# Wifi patches
-
-WifiAtheros = ["iMac10,1", "iMac11,1", "iMac11,2", "iMac11,3", "iMac12,1", "iMac12,2", "MacPro3,1", "MacPro4,1", "Dortania1,1"]
-
-WifiBCM94328 = ["MacBook4,1", "MacBookAir2,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "Dortania1,1"]
-
-WifiBCM94322 = [
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro5,5",
-    "MacBookPro7,1",
-    "Macmini3,1",
-    "iMac9,1",
-    "MacPro5,1",
-    "Dortania1,1",
-]
-
-WifiBCM94331 = [
-    "MacBook6,1",  # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBook7,1",  # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBookAir4,1",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookAir4,2",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookAir5,1",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookAir5,2",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro6,1",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro6,2",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro8,1",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro8,2",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro8,3",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro9,1",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro9,2",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro10,1",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro10,2",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "Macmini4,1",  # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "Macmini5,1",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "Macmini5,2",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "Macmini5,3",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "Macmini6,1",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "Macmini6,2",  # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "iMac13,1",  # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
-    "iMac13,2",  # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
-    "iMac13,3",  # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
-    "Dortania1,1",
-]
-
-# Audio
-
-LegacyAudio = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookAir4,1",
-    "MacBookAir4,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",
-    "Macmini3,1",
-    "Macmini4,1",
-    "Macmini5,1",
-    "Macmini5,2",
-    "Macmini5,3",
-    # "iMac7,1",
-    # "iMac8,1",
-    "iMac9,1",
-    "iMac10,1",
-    "iMac11,1",
-    "iMac11,2",
-    "iMac11,3",
-    "iMac12,1",
-    "iMac12,2",
-    "MacPro3,1",
-    "Dortania1,1",
-]
-
-nvidiaHDEF = [
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro5,5",
-    "MacBookPro7,1",
-    "Macmini3,1",
-    "Macmini4,1",
-    "iMac9,1",
-    "iMac10,1",
-]
-
-# GPU
-
-ModernGPU = [
-    "MacBookAir5,1",  # Intel 4000
-    "MacBookAir5,2",  # Intel 4000
-    "MacBookPro9,1",  # Intel 4000 + Nvidia 650M
-    "MacBookPro9,2",  # Intel 4000
-    "MacBookPro10,1",  # Intel 4000 + Nvidia 650M
-    "MacBookPro10,2",  # Intel 4000
-    "Macmini6,1",  # Intel 4000
-    "Macmini6,2",  # Intel 4000
-    "iMac13,1",  # Intel 4000
-    "iMac13,3",  # Intel 4000
-]
-
-LegacyGPU = [
-    "MacBook4,1",  # GMA X3100
-    "MacBook5,1",  # Nvidia 9000
-    "MacBook5,2",  # Nvidia 9000
-    "MacBook6,1",  # Nvidia 9000
-    "MacBook7,1",  # Nvidia 300
-    "MacBookAir2,1",  # Nvidia 9000
-    "MacBookAir3,1",  # Nvidia 300
-    "MacBookAir3,2",  # Nvidia 300
-    "MacBookAir4,1",  # Intel 3000
-    "MacBookAir4,2",  # Intel 3000
-    "MacBookPro4,1",  # Nvidia 8000
-    "MacBookPro5,1",  # Nvidia 9000
-    "MacBookPro5,2",  # Nvidia 9000
-    "MacBookPro5,3",  # Nvidia 9000
-    "MacBookPro5,4",  # Nvidia 9000
-    "MacBookPro5,5",  # Nvidia 9000
-    "MacBookPro6,1",  # Intel 100 + Nvidia 300
-    "MacBookPro6,2",  # Intel 100 + Nvidia 300
-    "MacBookPro7,1",  # Nvidia 300
-    "MacBookPro8,1",  # Intel 3000
-    "MacBookPro8,2",  # Intel 3000 + AMD 6000
-    "MacBookPro8,3",  # Intel 3000 + AMD 6000
-    "Macmini3,1",  # Nvidia 9000
-    "Macmini4,1",  # Nvidia 300
-    "Macmini5,1",  # Intel 3000
-    "Macmini5,2",  # AMD 6000
-    "Macmini5,3",  # Intel 3000
-    "iMac7,1",  # AMD 2000
-    "iMac8,1",  # Nvidia and AMD 2400
-    "iMac9,1",  # Nvidia 9000
-    "iMac10,1",  # Nvidia 9000 and AMD 4000
-    "iMac11,1",  # AMD 4000
-    "iMac11,2",  # AMD 4000 and 5000
-    "iMac11,3",  # AMD 5000
-    "iMac12,1",  # AMD 6000
-    "iMac12,2",  # AMD 6000
-    "Dortania1,1",  # RTX 3080
-]
-
-LegacyGPUNvidia = [
-    "MacBook5,1",  # Nvidia 9000
-    "MacBook5,2",  # Nvidia 9000
-    "MacBook6,1",  # Nvidia 9000
-    "MacBook7,1",  # Nvidia 300
-    "MacBookAir2,1",  # Nvidia 9000
-    "MacBookAir3,1",  # Nvidia 300
-    "MacBookAir3,2",  # Nvidia 300
-    "MacBookPro4,1",  # Nvidia 8000
-    "MacBookPro5,1",  # Nvidia 9000
-    "MacBookPro5,2",  # Nvidia 9000
-    "MacBookPro5,3",  # Nvidia 9000
-    "MacBookPro5,4",  # Nvidia 9000
-    "MacBookPro5,5",  # Nvidia 9000
-    "MacBookPro6,1",  # Intel 100 + Nvidia 300
-    "MacBookPro6,2",  # Intel 100 + Nvidia 300
-    "MacBookPro7,1",  # Nvidia 300
-    "Macmini3,1",  # Nvidia 9000
-    "Macmini4,1",  # Nvidia 300
-    "iMac9,1",  # Nvidia 9000
-    # "iMac10,1", # Nvidia 9000 and AMD 4000
-]
-
-LegacyGPUAMD = [
-    "MacBookPro8,2",  # Intel 3000 + AMD 6000
-    "MacBookPro8,3",  # Intel 3000 + AMD 6000
-    "Macmini5,2",  # AMD 6000
-    "iMac7,1",  # AMD 2000
-    # "iMac8,1", # Nvidia and AMD 2000
-    # "iMac10,1", # Nvidia 9000 and AMD 4000
-    "iMac11,1",  # AMD 4000
-    "iMac11,2",  # AMD 4000 and 5000
-    "iMac11,3",  # AMD 5000
-    "iMac12,1",  # AMD 6000
-    "iMac12,2",  # AMD 6000
-]
-
-LegacyGPUAMDIntelGen2 = [
-    "MacBookPro8,2",  # Intel 3000 + AMD 6000
-    "MacBookPro8,3",  # Intel 3000 + AMD 6000
-    "Macmini5,2",  # AMD 6000
-    "iMac12,1",  # AMD 6000
-    "iMac12,2",  # AMD 6000
-]
-
-LegacyGPUIntelGen1 = [
-    "MacBookPro6,1",  # Intel 100 + Nvidia 300
-    "MacBookPro6,2",  # Intel 100 + Nvidia 300
-]
-
-LegacyGPUIntelGen2 = [
-    "MacBookAir4,1",  # Intel 3000
-    "MacBookAir4,2",  # Intel 3000
-    "MacBookPro8,1",  # Intel 3000
-    "MacBookPro8,2",  # Intel 3000 + AMD 6000
-    "MacBookPro8,3",  # Intel 3000 + AMD 6000
-    "Macmini5,1",  # Intel 3000
-    "Macmini5,3",  # Intel 3000
-]
-
-LegacyBrightness = [
-    "MacBook5,2",
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-]
-
-LegacyHID = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookPro4,1",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro5,5",
-    "MacBookPro7,1",
-    "Macmini3,1",
-    "Macmini4,1",
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-    "iMac10,1",
-    "MacPro3,1",
-    "Dortania1,1",
-]
-
-NVMePatch = ["MacPro3,1", "MacPro4,1", "Xserve3,1", "Dortania1,1"]
-
-XhciSupport = [
-    "MacBookAir5,1",
-    "MacBookAir5,2",
-    "MacBookAir6,1",
-    "MacBookAir6,2",
-    "MacBookAir7,1",
-    "MacBookAir7,2",
-    "MacBookPro9,1",
-    "MacBookPro9,2",
-    "MacBookPro10,1",
-    "MacBookPro10,2",
-    "MacBookPro11,1",
-    "MacBookPro11,2",
-    "MacBookPro11,3",
-    "MacBookPro11,4",
-    "MacBookPro11,5",
-    "MacBookPro12,1",
-    "Macmini6,1",
-    "Macmini6,2",
-    "Macmini7,1",
-    "iMac13,1",
-    "iMac13,2",
-    "iMac13,3",
-    "iMac14,1",
-    "iMac14,2",
-    "iMac14,3",
-    "iMac15,1",
-    "iMac16,1",
-    "iMac16,2",
-    "MacPro6,1",
-    "Dortania1,1",
-]
-
-SidecarPatch = [
-    "MacBook8,1",
-    "MacBookAir5,1",
-    "MacBookAir5,2",
-    "MacBookAir6,1",
-    "MacBookAir6,2",
-    "MacBookAir7,1",
-    "MacBookAir7,2",
-    "MacBookPro9,1",
-    "MacBookPro9,2",
-    "MacBookPro10,1",
-    "MacBookPro10,2",
-    "MacBookPro11,1",
-    "MacBookPro11,2",
-    "MacBookPro11,3",
-    "MacBookPro11,4",
-    "MacBookPro11,5",
-    "MacBookPro12,1",
-    "MacBookPro13,1",
-    "MacBookPro13,2",
-    "MacBookPro13,3",
-    "MacBookPro14,1",
-    "MacBookPro14,2",
-    "MacBookPro14,3",
-    "Macmini6,1",
-    "Macmini6,2",
-    "Macmini7,1",
-    "Macmini8,1",
-    "iMac13,1",
-    "iMac13,2",
-    "iMac13,3",
-    "iMac14,1",
-    "iMac14,2",
-    "iMac14,3",
-    "iMac15,1",
-    "iMac16,1",
-    "iMac16,2",
-    "iMac17,1",
-    "iMac18,1",
-    "MacPro5,1",
-    "MacPro6,1",
-    "Dortania1,1",
-]
-
-DualGPUPatch = [
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro6,1",
-    "MacBookPro6,2",
-    "MacBookPro8,2",
-    "MacBookPro8,3",
-    "Macmini5,2",
-    "iMac12,1",
-    "iMac12,2",
-    "iMac13,1",
-    "iMac13,2",
-    "iMac14,2",
-    "iMac14,3",
-    "Dortania1,1",
-]
-
-DualGPUPatchRetina = [
-    "MacBookPro10,1",
-    "MacBookPro11,3",
-]
-
-IntelNvidiaDRM = [
-    "iMac13,1",
-    "iMac13,2",
-    "iMac14,2",
-    "iMac14,3",
-]
-
-HiDPIpicker = ["MacBook8,1", "MacBookPro10,1", "MacBookPro10,2", "MacBookPro11,1", "MacBookPro11,2", "MacBookPro11,3", "iMac15,1", "Dortania1,1"]
-
-IDEPatch = ["MacBook4,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "MacPro3,1", "Xserve2,1", "Dortania1,1"]
-
-# 11" Air
-MacBookAir61 = [
-    "MacBookAir3,1",
-    "MacBookAir4,1",
-    "MacBookAir5,1",
-    "MacBookAir6,1",
-]
-
-# Classic MacBook and 13" Air
-MacBookAir62 = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,2",
-    "MacBookAir4,2",
-    "MacBookAir5,2",
-    "MacBookAir6,2",
-]
-
-# Retina MacBook
-MacBook81 = [
-    "MacBook8,1",
-]
-
-# MacBook Pro 13"
-
-MacBookPro111 = [
-    "MacBookPro5,5",
-    "MacBookPro7,1",
-    "MacBookPro8,1",
-    "MacBookPro9,2",
-    "MacBookPro10,2",
-    "MacBookPro11,1",
-]
-
-# MacBook Pro 15" (iGPU)
-
-MacBookPro112 = ["MacBookPro11,2"]
-
-# MacBook Pro 15" and 17" (dGPU)
-
-MacBookPro113 = [
-    "MacBookPro4,1",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro6,1",
-    "MacBookPro6,2",
-    "MacBookPro8,2",
-    "MacBookPro8,3",
-    "MacBookPro9,1",
-    "MacBookPro10,1",
-    "MacBookPro11,3",
-]
-
-# Mac Mini
-
-Macmini71 = ["Macmini3,1", "Macmini4,1", "Macmini5,1", "Macmini5,2", "Macmini5,3", "Macmini6,1", "Macmini6,2"]
-# iMacPro = dGPU only iMacs
-iMacPro11 = [
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-    "iMac10,1",
-    "iMac11,1",
-    "iMac11,2",
-    "iMac11,3",
-    "iMac12,1",
-    "iMac12,2",
-]
-
-# iMac = AMD and Nvidia GPU with iGPU
-iMac151 = [
-    "iMac13,2",
-    "iMac14,2",
-    "iMac14,3",
-    "iMac15,1",
-]
-# iMac = Intel iGPU
-iMac144 = ["iMac13,1", "iMac14,1", "iMac14,4"]
-
-# Mac Pro and Xserve
-MacPro71 = ["MacPro3,1", "MacPro4,1", "MacPro5,1", "Xserve2,1", "Xserve3,1", "Dortania1,1"]
-
-XXerve = [
-    "Xserve3,1",
-]
-
-iXac = [
-    "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",
-]
-
-XacBookNormal = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-]
-
-XacBookAir = [
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookAir4,1",
-    "MacBookAir4,2",
-    "MacBookAir5,1",
-    "MacBookAir5,2",
-]
-
-XacBookPro = [
-    "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",
-]
-
-XacPro = [
-    "MacPro3,1",
-    "MacPro4,1",
-    "MacPro5,1",
-]
-
-Xacmini = [
-    "Macmini3,1",
-    "Macmini4,1",
-    "Macmini5,1",
-    "Macmini5,2",
-    "Macmini5,3",
-    "Macmini6,1",
-    "Macmini6,2",
-]
-
-ControllerTypes = [
-    "",
-    "-EHCI",
-    "-EHC1",
-    "-EHC2",
-    "-XHC1",
-    "-OHC1",
-    "-OHC2",
-    "-UHC1",
-    "-UHC2",
-    "-UHC3",
-    "-UHC4",
-    "-InternalHub-EHC1",
-    "-InternalHub-EHC1-InternalHub",
-    "-InternalHub-EHC2",
-    "-InternalHub",
-]
-
-upgradableMXMGPUs = ["iMac10,1", "iMac11,1", "iMac11,2", "iMac11,3", "iMac12,1", "iMac12,2", "Xserve3,1", "Dortania1,1"]
-
-NightShift = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookAir4,1",
-    "MacBookAir4,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",
-    "Macmini3,1",
-    "Macmini4,1",
-    "Macmini5,1",
-    "Macmini5,2",
-    "Macmini5,3",
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-    "iMac10,1",
-    "iMac11,1",
-    "iMac11,2",
-    "iMac11,3",
-    "iMac12,1",
-    "iMac12,2",
-    "MacPro3,1",
-    "MacPro4,1",
-    "MacPro5,1",
-    "Xserve2,1",
-    "Xserve3,1",
-    "Dortania1,1",
-]
-
-UGAtoGOP = [
-    "MacBook4,1",
-    "MacBookPro4,1",
-    "iMac7,1",
-    "iMac8,1",
-    "MacPro3,1",
-    "Xserve2,1",
-]
-
-SATAPatch = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookAir4,1",
-    "MacBookAir4,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",
-    "Macmini3,1",
-    "Macmini4,1",
-    "Macmini5,1",
-    "Macmini5,2",
-    "Macmini5,3",
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-    "iMac10,1",
-    "iMac11,1",
-    "iMac11,2",
-    "iMac11,3",
-    "iMac12,1",
-    "iMac12,2",
-    "MacPro3,1",
-    "MacPro4,1",
-    "MacPro5,1",
-    "Xserve2,1",
-    "Xserve3,1",
-    "Dortania1,1",
-]
-
-NoAPFSsupport = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBookAir2,1",
-    "MacBookPro4,1",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro5,5",
-    "Macmini3,1",
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-    "MacPro3,1",
-    "MacPro4,1",
-    "Xserve2,1",
-    "Xserve3,1",
-    "Dortania1,1",
-]
-
-NoRootPatch11 = [
-    "MacBookAir5,1",
-    "MacBookAir5,2",
-    "MacBookPro9,1",
-    "MacBookPro9,2",
-    "MacBookPro10,1",
-    "MacBookPro10,2",
-    "Macmini6,1",
-    "Macmini6,2",
-    "iMac13,1",
-    "iMac13,2",
-    "iMac13,3",
-    "iMac14,1",
-    "iMac14,2",
-    "iMac14,3",
-    "MacPro4,1",
-    "MacPro5,1",
-    "Xserve3,1",
-]
-
-NoExFat = [
-    "MacBook4,1",
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookPro4,1",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro5,5",
-    "MacBookPro6,1",
-    "MacBookPro6,2",
-    "MacBookPro7,1",
-    "Macmini3,1",
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-    "iMac10,1",
-    "iMac11,1",
-    "MacPro3,1",
-    "MacPro4,1",
-    "MacPro5,1",
-    "Xserve2,1",
-    "Xserve3,1",
-    "Dortania1,1",
-]
-
-SandyIGPU = [
-    "MacBookAir4,1",
-    "MacBookAir4,2",
-    "MacBookPro8,1",
-    "MacBookPro8,2",
-    "MacBookPro8,3",
-    "Macmini5,1",
-    "Macmini5,2",
-    "Macmini5,3",
-]
-
-windows_audio = [
-    "MacBookAir4,1",
-    "MacBookAir4,2",
-    "MacBookAir5,1",
-    "MacBookAir5,2",
-    "MacBookPro8,1",
-    "MacBookPro8,2",
-    "MacBookPro8,3",
-    "MacBookPro9,1",
-    "MacBookPro9,2",
-    "MacBookPro10,1",
-    "MacBookPro10,2",
-    "Macmini5,1",
-    "Macmini5,2",
-    "Macmini5,3",
-    "Macmini6,1",
-    "Macmini6,2",
-    "iMac12,1",
-    "iMac12,2",
-    "iMac13,1",
-    "iMac13,2",
-    "iMac13,3",
-]
-
-NoAGPMSupport = ["MacBook4,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "MacPro3,1", "Xserve2,1"]
-
-AGDPSupport = [
-    "MacBookPro9,1",
-    "MacBookPro10,1",
-    "iMac13,1",
-    "iMac13,2",
-    "iMac14,1",
-    "iMac14,2",
-    "iMac14,3",
-    "iMac14,4",
-    "iMac15,1",
-    # TODO: Uncomment when dropped from macOS
-    # "iMac17,1",
-    # "iMac18,2",
-    # "iMac18,3",
-    # "iMac19,1",
-    # "iMac19,2",
-    # "iMac20,1",
-    # "iMac20,2",
-    # "iMacPro1,1",
-    # "MacPro6,1",
-]
-
-AMCSupport = [
-    "MacBookPro8,2",
-    "MacBookPro8,3",
-    # "MacBookPro9,1",
-    # "MacBookPro10,1"
-]
-
-NoFireWireSupport = [
-    "MacBook5,1",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir1,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-]
-
-RecoveryIgnore = ["Update", "VM", "Recovery", "Preboot"]
--- a/Resources/SysPatch.py
+++ b/Resources/SysPatch.py
@@ -1,499 +0,0 @@
-# Framework for mounting and patching macOS root volume
-# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
-# Missing Features:
-# - Full System/Library Snapshotting (need to research how Apple achieves this)
-#   - Temporary Work-around: sudo bless --mount /System/Volumes/Update/mnt1 --bootefi --last-sealed-snapshot
-# - Work-around battery throttling on laptops with no battery (IOPlatformPluginFamily.kext/Contents/PlugIns/ACPI_SMC_PlatformPlugin.kext/Contents/Resources/)
-
-import hashlib
-import os
-import requests
-import shutil
-import subprocess
-import zipfile
-from pathlib import Path
-
-from Resources import Constants, device_probe, ModelArray, SysPatchArray, Utilities
-
-
-class PatchSysVolume:
-    def __init__(self, model, versions):
-        self.model = model
-        self.constants: Constants.Constants = versions
-        self.root_mount_path = None
-        self.sip_enabled = True
-        self.sbm_enabled = True
-        self.amfi_enabled = True
-        self.fv_enabled = True
-        self.nvidia_legacy = False
-        self.amd_ts1 = False
-        self.amd_ts2 = False
-        self.iron_gpu = False
-        self.sandy_gpu = False
-        self.ivy_gpu = False
-        self.nvidia_legacy = False
-        self.brightness_legacy = False
-        self.legacy_audio = False
-        self.added_kexts = False
-        self.amfi_must_disable = False
-        self.no_patch = True
-
-        if self.constants.detected_os > self.constants.catalina:
-            # Big Sur and newer use APFS snapshots
-            self.mount_location = "/System/Volumes/Update/mnt1"
-        else:
-            self.mount_location = "/"
-        self.mount_extensions = f"{self.mount_location}/System/Library/Extensions"
-        self.mount_frameworks = f"{self.mount_location}/System/Library/Frameworks"
-        self.mount_lauchd = f"{self.mount_location}/System/Library/LaunchDaemons"
-        self.mount_private_frameworks = f"{self.mount_location}/System/Library/PrivateFrameworks"
-
-    def elevated(self, *args, **kwargs) -> subprocess.CompletedProcess:
-        if os.getuid() == 0:
-            return subprocess.run(*args, **kwargs)
-        else:
-            return subprocess.run(["sudo"] + [args[0][0]] + args[0][1:], **kwargs)
-
-    def find_mount_root_vol(self, patch):
-        self.root_mount_path = Utilities.get_disk_path()
-        if self.root_mount_path.startswith("disk"):
-            print(f"- Found Root Volume at: {self.root_mount_path}")
-            if Path(self.mount_extensions).exists():
-                print("- Root Volume is already mounted")
-                if patch is True:
-                    self.patch_root_vol()
-                    return True
-                else:
-                    self.unpatch_root_vol()
-                    return True
-            else:
-                if self.constants.detected_os > self.constants.catalina:
-                    print("- Mounting APFS Snapshot as writable")
-                    self.elevated(["mount", "-o", "nobrowse", "-t", "apfs", f"/dev/{self.root_mount_path}", self.mount_location], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-                elif self.constants.detected_os == self.constants.catalina:
-                    print("- Mounting Root Volume as writable")
-                    self.elevated(["mount", "-uw", "/"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-                if Path(self.mount_extensions).exists():
-                    print("- Successfully mounted the Root Volume")
-                    if patch is True:
-                        self.patch_root_vol()
-                        return True
-                    else:
-                        self.unpatch_root_vol()
-                        return True
-                else:
-                    print("- Failed to mount the Root Volume")
-                    print("- Recommend rebooting the machine and trying to patch again")
-                    if self.constants.gui_mode is False:
-                        input("- Press [ENTER] to exit: ")
-        else:
-            print("- Could not find root volume")
-            if self.constants.gui_mode is False:
-                input("- Press [ENTER] to exit: ")
-
-    def unpatch_root_vol(self):
-        print("- Reverting to last signed APFS snapshot")
-        self.elevated(["bless", "--mount", self.mount_location, "--bootefi", "--last-sealed-snapshot"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-    def rebuild_snapshot(self):
-        if self.constants.gui_mode is False:
-            input("Press [ENTER] to continue with cache rebuild: ")
-        print("- Rebuilding Kernel Cache (This may take some time)")
-        if self.constants.detected_os > self.constants.catalina:
-            result = self.elevated(["kmutil", "install", "--volume-root", self.mount_location, "--update-all"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        else:
-            result = self.elevated(["kextcache", "-i", "/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
-        if result.returncode != 0:
-            self.success_status = False
-            print("- Unable to build new kernel cache")
-            print("\nPlease report this to Github")
-            print("Reason for Patch Failure:")
-            print(result.stdout.decode())
-            print("")
-            print("\nPlease reboot the machine to avoid potential issues rerunning the patcher")
-            if self.constants.gui_mode is False:
-                input("Press [ENTER] to continue")
-        else:
-            self.success_status = True
-            print("- Successfully built new kernel cache")
-            if self.constants.gui_mode is False and self.constants.detected_os > self.constants.catalina:
-                input("Press [ENTER] to continue with snapshotting")
-            if self.constants.detected_os > self.constants.catalina:
-                print("- Creating new APFS snapshot")
-                self.elevated(["bless", "--folder", f"{self.mount_location}/System/Library/CoreServices", "--bootefi", "--create-snapshot"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-                self.unmount_drive()
-            print("- Patching complete")
-            print("\nPlease reboot the machine for patches to take effect")
-            if self.constants.gui_mode is False:
-                input("Press [ENTER] to continue")
-
-    def unmount_drive(self):
-        print("- Unmounting Root Volume (Don't worry if this fails)")
-        self.elevated(["diskutil", "unmount", self.root_mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-    def delete_old_binaries(self, vendor_patch):
-        for delete_current_kext in vendor_patch:
-            delete_path = Path(self.mount_extensions) / Path(delete_current_kext)
-            if Path(delete_path).exists():
-                print(f"- Deleting {delete_current_kext}")
-                self.elevated(["sudo", "rm", "-R", delete_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            else:
-                print(f"- Couldn't find {delete_current_kext}, skipping")
-
-    def add_new_binaries(self, vendor_patch, vendor_location):
-        for add_current_kext in vendor_patch:
-            existing_path = Path(self.mount_extensions) / Path(add_current_kext)
-            if Path(existing_path).exists():
-                print(f"- Found conflicting kext, Deleting Root Volume's {add_current_kext}")
-                self.elevated(["rm", "-R", existing_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            print(f"- Adding {add_current_kext}")
-            self.elevated(["cp", "-R", f"{vendor_location}/{add_current_kext}", self.mount_extensions], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            self.elevated(["chmod", "-Rf", "755", f"{self.mount_extensions}/{add_current_kext}"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            self.elevated(["chown", "-Rf", "root:wheel", f"{self.mount_extensions}/{add_current_kext}"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-    def add_brightness_patch(self):
-        self.delete_old_binaries(SysPatchArray.DeleteBrightness)
-        self.add_new_binaries(SysPatchArray.AddBrightness, self.constants.legacy_brightness)
-        self.elevated(["rsync", "-r", "-i", f"{self.constants.payload_apple_private_frameworks_path_brightness}/", self.mount_private_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        self.elevated(["chmod", "-Rf", "755", f"{self.mount_private_frameworks}/DisplayServices.framework"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        self.elevated(["chown", "-Rf", "root:wheel", f"{self.mount_private_frameworks}/DisplayServices.framework"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-    def add_audio_patch(self):
-        self.delete_old_binaries(SysPatchArray.DeleteVolumeControl)
-        self.add_new_binaries(SysPatchArray.AddVolumeControl, self.constants.audio_path)
-
-    def gpu_accel_legacy_nvidia_big_sur(self):
-        self.delete_old_binaries(SysPatchArray.DeleteNvidiaAccel11)
-        self.add_new_binaries(SysPatchArray.AddGeneralAccel, self.constants.legacy_general_path)
-        self.add_new_binaries(SysPatchArray.AddNvidiaAccel11, self.constants.legacy_nvidia_path)
-
-    def gpu_framebuffer_legacy_nvidia(self):
-        self.add_new_binaries(SysPatchArray.AddNvidiaBrightness, self.constants.legacy_nvidia_path)
-
-    def gpu_accel_legacy_ts1_big_sur(self):
-        self.delete_old_binaries(SysPatchArray.DeleteAMDAccel11)
-        self.add_new_binaries(SysPatchArray.AddGeneralAccel, self.constants.legacy_general_path)
-        self.add_new_binaries(SysPatchArray.AddAMDAccel11, self.constants.legacy_amd_path)
-
-    def gpu_accel_legacy_ts2_big_sur(self):
-        self.delete_old_binaries(SysPatchArray.DeleteAMDAccel11)
-        self.delete_old_binaries(SysPatchArray.DeleteAMDAccel11TS2)
-        self.add_new_binaries(SysPatchArray.AddGeneralAccel, self.constants.legacy_general_path)
-        self.add_new_binaries(SysPatchArray.AddAMDAccel11, self.constants.legacy_amd_path)
-
-    def gpu_framebuffer_legacy_amd(self):
-        self.add_new_binaries(SysPatchArray.AddAMDBrightness, self.constants.legacy_amd_path)
-
-    def gpu_accel_legacy_ironlake_big_sur(self):
-        self.delete_old_binaries(SysPatchArray.DeleteNvidiaAccel11)
-        self.add_new_binaries(SysPatchArray.AddGeneralAccel, self.constants.legacy_general_path)
-        self.add_new_binaries(SysPatchArray.AddIntelGen1Accel, self.constants.legacy_intel_gen1_path)
-
-    def gpu_framebuffer_legacy_ironlake(self):
-        self.add_new_binaries(SysPatchArray.AddIntelGen1Accel, self.constants.legacy_intel_gen1_path)
-
-    def gpu_accel_legacy_sandybridge_big_sur(self):
-        self.delete_old_binaries(SysPatchArray.DeleteNvidiaAccel11)
-        self.add_new_binaries(SysPatchArray.AddGeneralAccel, self.constants.legacy_general_path)
-        self.add_new_binaries(SysPatchArray.AddIntelGen2Accel, self.constants.legacy_intel_gen2_path)
-
-    def gpu_framebuffer_legacy_sandybridge(self):
-        self.add_new_binaries(SysPatchArray.AddIntelGen2Accel, self.constants.legacy_intel_gen1_path)
-
-    def gpu_framebuffer_ivybridge_big_sur(self):
-        self.add_new_binaries(SysPatchArray.AddIntelGen3Accel, self.constants.legacy_intel_gen3_path)
-        print("- Fixing Acceleration in CoreMedia")
-        subprocess.run(["defaults", "write", "com.apple.coremedia", "hardwareVideoDecoder", "-string", "disable"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        print("- Merging Ivy Bridge Frameworks")
-        self.elevated(["rsync", "-r", "-i", f"{self.constants.payload_apple_frameworks_path_accel_ivy}/", self.mount_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-    def gpu_accel_legacy_extended(self):
-        print("- Merging general legacy Frameworks")
-        self.elevated(["rsync", "-r", "-i", f"{self.constants.payload_apple_frameworks_path_accel}/", self.mount_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        if Path(self.mount_lauchd / Path("HiddHack.plist")).exists():
-            print("- Removing legacy HiddHack")
-            self.elevated(["rm", f"{self.mount_lauchd}/HiddHack.plist"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        print("- Adding IOHID-Fixup.plist")
-        self.elevated(["rsync", "-r", "-i", f"{self.constants.payload_apple_lauchd_path_accel}/", self.mount_lauchd], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        self.elevated(["chmod", "755", f"{self.mount_lauchd}/IOHID-Fixup.plist"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        self.elevated(["chown", "root:wheel", f"{self.mount_lauchd}/IOHID-Fixup.plist"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        print("- Merging general legacy PrivateFrameworks")
-        self.elevated(["rsync", "-r", "-i", f"{self.constants.payload_apple_private_frameworks_path_accel}/", self.mount_private_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-    def gpu_accel_legacy_extended_ts2(self):
-        print("- Merging TeraScale 2 legacy Frameworks")
-        self.elevated(["rsync", "-r", "-i", f"{self.constants.payload_apple_frameworks_path_accel_ts2}/", self.mount_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        print("- Merging TeraScale 2 PrivateFrameworks")
-        self.elevated(["rsync", "-r", "-i", f"{self.constants.payload_apple_private_frameworks_path_accel_ts2}/", self.mount_private_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-        print("- Fixing Acceleration in CMIO")
-        subprocess.run(["defaults", "write", "com.apple.cmio", "CMIO_Unit_Input_ASC.DoNotUseOpenCL", "-bool", "true"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-    def patch_root_vol(self):
-        print(f"- Running patches for {self.model}")
-        # Graphics patches
-        if self.nvidia_legacy is True:
-            print("- Installing legacy Nvidia Patches")
-            if self.constants.detected_os == self.constants.big_sur:
-                print("- Detected Big Sur, installing Acceleration patches")
-                self.gpu_accel_legacy_nvidia_big_sur()
-                self.added_kexts = True
-            else:
-                print("- Detected unsupported OS, installing Basic Framebuffer")
-                self.gpu_framebuffer_legacy_nvidia()
-
-        if self.amd_ts1 is True:
-            print("- Installing legacy TeraScale 1 Patches")
-            if self.constants.detected_os == self.constants.big_sur:
-                print("- Detected Big Sur, installing Acceleration patches")
-                self.gpu_accel_legacy_ts1_big_sur()
-                self.added_kexts = True
-            else:
-                print("- Detected unsupported OS, installing Basic Framebuffer")
-                self.gpu_framebuffer_legacy_amd()
-
-        if self.amd_ts2 is True:
-            print("- Installing legacy TeraScale 2 Patches")
-            if self.constants.detected_os == self.constants.big_sur:
-                print("- Detected Big Sur, installing Acceleration patches")
-                self.gpu_accel_legacy_ts2_big_sur()
-                self.added_kexts = True
-            else:
-                print("- Detected unsupported OS, installing Basic Framebuffer")
-                self.gpu_framebuffer_legacy_amd()
-
-        if self.iron_gpu is True:
-            print("- Installing legacy Ironlake Patches")
-            if self.constants.detected_os == self.constants.big_sur:
-                print("- Detected Big Sur, installing Acceleration patches")
-                self.gpu_accel_legacy_ironlake_big_sur()
-                self.added_kexts = True
-            else:
-                print("- Detected unsupported OS, installing Basic Framebuffer")
-                self.gpu_framebuffer_legacy_ironlake()
-
-        if self.sandy_gpu is True:
-            print("- Installing legacy Sandy Bridge Patches")
-            if self.constants.detected_os == self.constants.big_sur:
-                print("- Detected Big Sur, installing Acceleration patches")
-                self.gpu_accel_legacy_sandybridge_big_sur()
-                self.added_kexts = True
-            else:
-                print("- Detected unsupported OS, installing Basic Framebuffer")
-                self.gpu_framebuffer_legacy_sandybridge()
-
-        if self.ivy_gpu is True:
-            print("- Installing Ivy Bridge Patches")
-            self.gpu_framebuffer_ivybridge_big_sur()
-
-        if self.amd_ts2 is True:
-            # TeraScale 2 patches must be installed after Intel HD3000
-            self.add_new_binaries(SysPatchArray.AddAMDAccel11TS2, self.constants.legacy_amd_path_ts2)
-
-        if self.added_kexts is True:
-            self.gpu_accel_legacy_extended()
-            if self.amd_ts2 is True:
-                self.gpu_accel_legacy_extended_ts2()
-
-        # Misc patches
-        if self.brightness_legacy is True:
-            print("- Installing legacy Brightness Control")
-            self.add_brightness_patch()
-
-        if self.legacy_audio is True:
-            print("- Fixing Volume Control Support")
-            self.add_audio_patch()
-
-        self.rebuild_snapshot()
-
-    def check_files(self):
-        if Path(self.constants.payload_apple_root_path).exists():
-            print("- Found Apple Binaries")
-            if self.constants.gui_mode is False:
-                patch_input = input("Would you like to redownload?(y/n): ")
-                if patch_input in {"y", "Y", "yes", "Yes"}:
-                    shutil.rmtree(Path(self.constants.payload_apple_root_path))
-                    self.download_files()
-            else:
-                self.download_files()
-        else:
-            print("- Apple binaries missing")
-            self.download_files()
-
-    def download_files(self):
-        if self.constants.detected_os == self.constants.monterey:
-            os_ver = "12-Monterey"
-        elif self.constants.detected_os == self.constants.big_sur:
-            os_ver = "11-Big-Sur"
-        elif self.constants.detected_os == self.constants.catalina:
-            os_ver = "10.15-Catalina"
-        elif self.constants.detected_os == self.constants.mojave:
-            os_ver = "10.14-Mojave"
-        link = f"{self.constants.url_patcher_support_pkg}{self.constants.patcher_support_pkg_version}/{os_ver}.zip"
-
-        if Path(self.constants.payload_apple_root_path).exists():
-            print("- Removing old Apple Binaries folder")
-            Path(self.constants.payload_apple_root_path).unlink()
-        if Path(self.constants.payload_apple_root_path_zip).exists():
-            print("- Removing old Apple Binaries zip")
-            Path(self.constants.payload_apple_root_path_zip).unlink()
-
-        Utilities.download_file(link, self.constants.payload_apple_root_path_zip)
-
-        if self.constants.payload_apple_root_path_zip.exists():
-            print("- Download completed")
-            print("- Unzipping download...")
-            try:
-                subprocess.run(["unzip", self.constants.payload_apple_root_path_zip], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=self.constants.payload_path).stdout.decode()
-                print("- Renaming folder")
-                os.rename(self.constants.payload_path / Path(os_ver), self.constants.payload_apple_root_path)
-                Path(self.constants.payload_apple_root_path_zip).unlink()
-                print("- Binaries downloaded to:")
-                print(self.constants.payload_path)
-                if self.constants.gui_mode is False:
-                    input("Press [ENTER] to continue")
-            except zipfile.BadZipFile:
-                print("- Couldn't unzip")
-                return
-        else:
-            print("- Download failed, please verify the below link works:")
-            print(link)
-            input("Press [ENTER] to continue")
-    def detect_gpus(self):
-        dgpu = self.constants.computer.dgpu
-        igpu = self.constants.computer.igpu
-        if dgpu:
-            print(f"- Found GFX0: {Utilities.friendly_hex(dgpu.vendor_id)}:{Utilities.friendly_hex(dgpu.device_id)}")
-            if dgpu.arch in [device_probe.NVIDIA.Archs.Tesla, device_probe.NVIDIA.Archs.Fermi]:
-                if self.constants.detected_os > self.constants.catalina:
-                    self.nvidia_legacy = True
-                    self.amfi_must_disable = True
-            elif dgpu.arch == device_probe.AMD.Archs.TeraScale_1:
-                if self.constants.detected_os > self.constants.catalina:
-                    self.amd_ts1 = True
-                    self.amfi_must_disable = True
-            # TODO: Enable TS2 support
-            elif dgpu.arch == device_probe.AMD.Archs.TeraScale_2:
-                # Requires manual permission from user to avoid medical issues
-                if self.constants.detected_os > self.constants.catalina and self.constants.terascale_2_patch is True:
-                    self.amd_ts2 = True
-                    self.amfi_must_disable = True
-        if igpu and igpu.class_code != 0xFFFFFF:
-            print(f"- Found IGPU: {Utilities.friendly_hex(igpu.vendor_id)}:{Utilities.friendly_hex(igpu.device_id)}")
-            if igpu.arch == device_probe.Intel.Archs.Iron_Lake:
-                if self.constants.detected_os > self.constants.catalina:
-                    self.iron_gpu = True
-                    self.amfi_must_disable = True
-            elif igpu.arch == device_probe.Intel.Archs.Sandy_Bridge:
-                if self.constants.detected_os > self.constants.catalina:
-                    self.sandy_gpu = True
-                    self.amfi_must_disable = True
-            elif igpu.arch == device_probe.Intel.Archs.Ivy_Bridge:
-                if self.constants.detected_os > self.constants.big_sur:
-                    self.ivy_gpu = True
-            elif isinstance(igpu, device_probe.NVIDIA):
-                if self.constants.detected_os > self.constants.catalina:
-                    self.nvidia_legacy = True
-                    self.amfi_must_disable = True
-
-    def detect_patch_set(self):
-        self.detect_gpus()
-        if self.model in ModelArray.LegacyBrightness:
-            if self.constants.detected_os > self.constants.catalina:
-                self.brightness_legacy = True
-
-        if self.model in ["iMac7,1", "iMac8,1"]:
-            if self.constants.detected_os > self.constants.catalina:
-                self.legacy_audio = True
-
-        Utilities.cls()
-        print("The following patches will be applied:")
-        if self.nvidia_legacy is True:
-            print("- Add Legacy Nvidia Tesla Graphics Patch")
-        elif self.amd_ts1 is True:
-            print("- Add Legacy ATI TeraScale 1 Graphics Patch")
-        elif self.amd_ts2 is True:
-            print("- Add Legacy ATI TeraScale 2 Graphics Patch")
-        if self.iron_gpu is True:
-            print("- Add Legacy Intel IronLake Graphics Patch")
-        elif self.sandy_gpu is True:
-            print("- Add Legacy Intel Sandy Bridge Graphics Patch")
-        elif self.ivy_gpu is True:
-            print("- Add Legacy Intel Ivy Bridge Graphics Patch")
-        if self.brightness_legacy is True:
-            print("- Add Legacy Brightness Control")
-        if self.legacy_audio is True:
-            print("- Add legacy Audio Control")
-
-        self.no_patch = not any(
-            [
-                self.nvidia_legacy,
-                self.amd_ts1,
-                self.amd_ts2,
-                self.iron_gpu,
-                self.sandy_gpu,
-                self.ivy_gpu,
-                self.brightness_legacy,
-                self.legacy_audio,
-            ]
-        )
-
-    def verify_patch_allowed(self):
-        self.sip_enabled, self.sbm_enabled, self.amfi_enabled, self.fv_enabled = Utilities.patching_status()
-        if self.sip_enabled is True:
-            print("\nCannot patch! Please disable System Integrity Protection (SIP).")
-            print("Disable SIP in Patcher Settings and Rebuild OpenCore\n")
-            print("Ensure the following bits are set for csr-active-config:")
-            print("\n".join(self.constants.root_patch_sip_big_sur if self.constants.detected_os > self.constants.catalina else self.constants.root_patch_sip_mojave))
-            print("For Hackintoshes, please set csr-active-config to '030A0000' (0xA03)")
-            print("For non-OpenCore Macs, please run 'csrutil disable' and \n'csrutil authenticated-root disable' in RecoveryOS")
-
-        if self.sbm_enabled is True:
-            print("\nCannot patch! Please disable Apple Secure Boot.")
-            print("Disable SecureBootModel in Patcher Settings and Rebuild OpenCore")
-            print("For Hackintoshes, set SecureBootModel to Disabled")
-
-        if self.fv_enabled is True:
-            print("\nCannot patch! Please disable FileVault.")
-            print("Go to System Preferences -> Security and disable FileVault")
-
-        if self.amfi_enabled is True and self.amfi_must_disable is True:
-            print("\nCannot patch! Please disable AMFI.")
-            print("For Hackintoshes, please add amfi_get_out_of_my_way=1 to boot-args")
-
-        if any([self.sip_enabled, self.sbm_enabled, self.fv_enabled, self.amfi_enabled if self.amfi_must_disable else False]):
-            return False
-        else:
-            return True
-
-    # Entry Function
-    def start_patch(self):
-        print("- Starting Patch Process")
-        print(f"- Determinging Required Patch set for Darwin {self.constants.detected_os}")
-        self.detect_patch_set()
-        if self.no_patch is False and self.constants.gui_mode is False:
-            change_menu = input("Would you like to continue with Root Volume Patching?(y/n): ")
-        else:
-            change_menu = None
-            print("- No Root Patches required for your machine!")
-            if self.constants.gui_mode is False:
-                input("\nPress [ENTER] to return to the main menu: ")
-        if change_menu in ["y", "Y"]:
-            print("- Continuing with Patching")
-            print("- Verifying whether Root Patching possible")
-            if self.verify_patch_allowed() is True:
-                print("- Patcher is capable of patching")
-                self.check_files()
-                self.find_mount_root_vol(True)
-            elif self.constants.gui_mode is False:
-                input("\nPress [ENTER] to return to the main menu: ")
-
-        else:
-            print("- Returning to main menu")
-
-    def start_unpatch(self):
-        print("- Starting Unpatch Process")
-        if self.verify_patch_allowed() is True:
-            self.find_mount_root_vol(False)
-            if self.constants.gui_mode is False:
-                input("\nPress [ENTER] to return to the main menu")
--- a/Resources/Utilities.py
+++ b/Resources/Utilities.py
@@ -1,260 +0,0 @@
-# Copyright (C) 2020-2021, Dhinak G
-from __future__ import print_function
-
-import os
-import math
-from pathlib import Path
-import plistlib
-import subprocess
-import requests
-import hashlib
-import requests
-
-from Resources import Constants
-
-
-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 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 csr_decode(csr_active_config):
-    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 Constants.Constants.root_patch_sip_big_sur)
-    if sip_needs_change is True:
-        return False
-    else:
-        return True
-
-
-def friendly_hex(integer: int):
-    return "{:02X}".format(integer)
-
-
-def patching_status():
-    # 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
-
-    amfi_1 = "amfi_get_out_of_my_way=0x1"
-    amfi_2 = "amfi_get_out_of_my_way=1"
-
-    if get_nvram("boot-args", decode=False) and amfi_1 in get_nvram("boot-args", decode=False) or amfi_2 in get_nvram("boot-args", decode=False):
-        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)) is False:
-        sip_enabled = False
-
-    fv_status: str = subprocess.run("fdesetup status".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-    if fv_status.startswith("FileVault is Off"):
-        fv_enabled = False
-
-    return sip_enabled, sbm_enabled, amfi_enabled, fv_enabled
-
-
-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 = ""
-    result = subprocess.run(f"nvram -x {uuid}{variable}".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.strip()
-    try:
-        value = plistlib.loads(result)[f"{uuid}{variable}"]
-    except plistlib.InvalidFileException:
-        return None
-    if decode:
-        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(f"- 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)
-    print(f"- Checksum: {checksum.hexdigest()}")
-
-
-# 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)
--- a/Resources/device_probe.py
+++ b/Resources/device_probe.py
@@ -1,383 +0,0 @@
-import binascii
-import enum
-import itertools
-import plistlib
-import subprocess
-from dataclasses import dataclass, field
-from typing import Any, ClassVar, Optional, Type
-
-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
-    pci_path: Optional[str] = None
-
-    # def __getstate__(self):
-    #     state = self.__dict__.copy()
-    #     state.pop("ioregistryentry")
-    #     return state
-
-    @classmethod
-    def from_ioregistry(cls, entry: ioreg.IORegistryEntry, anti_spoof=False):
-        if anti_spoof and "IOName" in entry.properties:
-            vendor_id, device_id = (int(i, 16) for i in entry.properties["IOName"][3:].split(","))
-        else:
-            vendor_id, device_id = [int.from_bytes(entry.properties[i][:4], byteorder="little") for i in ["vendor-id", "device-id"]]
-
-        device = cls(vendor_id, device_id, int.from_bytes(entry.properties["class-code"][:6], byteorder="little"), name=entry.name)
-        if "model" in entry.properties:
-            device.model = entry.properties["model"].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, entry: ioreg.IORegistryEntry):
-        # Based off gfxutil logic, seems to work.
-        paths = []
-        while entry:
-            if entry.entry_class == "IOPCIDevice":
-                location = [hex(int(i, 16)) for i in entry.location.split(",") + ["0"]]
-                paths.append(f"Pci({location[0]},{location[1]})")
-            elif entry.entry_class == "IOACPIPlatformDevice":
-                paths.append(f"PciRoot({hex(int(entry.properties.get('_UID', 0)))})")
-                break
-            elif entry.entry_class in ["IOPCI2PCIBridge", "IOPCIBridge", "AppleACPIPCI"]:
-                pass
-            else:
-                # There's something in between that's not PCI! Abort
-                paths = []
-                break
-            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):
-        system_profiler = plistlib.loads(subprocess.run("system_profiler -xml SPAirPortDataType".split(), stdout=subprocess.PIPE).stdout)
-        self.country_code = system_profiler[0]["_items"][0]["spairport_airport_interfaces"][0]["spairport_wireless_country_code"]
-        self.detect_chipset()
-
-    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"
-        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
-        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
-    ioregistry: Optional[ioreg.IOReg] = None
-
-    @staticmethod
-    def probe():
-        computer = Computer()
-        computer.ioregistry = ioreg.IOReg()
-        computer.gpu_probe()
-        computer.dgpu_probe()
-        computer.igpu_probe()
-        computer.wifi_probe()
-        computer.storage_probe()
-        computer.smbios_probe()
-        computer.cpu_probe()
-        return computer
-
-    def gpu_probe(self):
-        # Chain together two iterators: one for class code 00000300, the other for class code 00800300
-        devices = itertools.chain(self.ioregistry.find(property=("class-code", binascii.a2b_hex("00000300"))), self.ioregistry.find(property=("class-code", binascii.a2b_hex("00800300"))))
-
-        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
-
-    def dgpu_probe(self):
-        device = next(self.ioregistry.find(name="GFX0"), 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
-
-    def igpu_probe(self):
-        device = next(self.ioregistry.find(name="IGPU"), 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
-
-    def wifi_probe(self):
-        # result = subprocess.run("ioreg -r -c IOPCIDevice -a -d2".split(), stdout=subprocess.PIPE).stdout.strip()
-        devices = self.ioregistry.find(property=("class-code", binascii.a2b_hex(Utilities.hexswap(hex(WirelessCard.CLASS_CODE)[2:].zfill(8)))))
-        # if not result:
-        #     # No devices
-        #     print("A")
-        #     return
-
-        # devices = plistlib.loads(result)
-        # devices = [i for i in devices if i["class-code"] == binascii.a2b_hex("00800200")]
-
-        # if not devices:
-        #     # No devices
-        #     print("B")
-        #     return
-
-        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
-
-    def storage_probe(self):
-        sata_controllers = self.ioregistry.find(entry_class="IOPCIDevice", property=("class-code", binascii.a2b_hex(Utilities.hexswap(hex(SATAController.CLASS_CODE)[2:].zfill(8)))))
-        nvme_controllers = itertools.chain.from_iterable(
-            [
-                # self.ioregistry.find(entry_class="IOPCIDevice", property=("class-code", binascii.a2b_hex(Utilities.hexswap(hex(NVMeController.CLASS_CODE)[2:].zfill(8))))),
-                self.ioregistry.find(entry_class="IOPCIDevice", children={"entry_class": "IONVMeController"}),
-            ]
-        )
-        for device in sata_controllers:
-            self.storage.append(SATAController.from_ioregistry(device))
-        for device in nvme_controllers:
-            aspm = device.properties.get("pci-aspm-default", 0)
-            if isinstance(aspm, bytes):
-                aspm = int.from_bytes(aspm, byteorder="little")
-
-            if device.parent.parent.entry_class == "IOPCIDevice":
-                parent_aspm = device.parent.parent.properties.get("pci-aspm-default", 0)
-                if isinstance(parent_aspm, bytes):
-                    parent_aspm = int.from_bytes(parent_aspm, byteorder="little")
-            else:
-                parent_aspm = None
-
-            controller = NVMeController.from_ioregistry(device)
-            controller.aspm = aspm
-            controller.parent_aspm = parent_aspm
-
-            if controller.vendor_id != 0x106B:
-                self.storage.append(controller)
-
-    def smbios_probe(self):
-        # Reported model
-        entry = next(self.ioregistry.find(name="Root")).children[0]
-        self.reported_model = entry.properties["model"].strip(b"\0").decode()
-        self.reported_board_id = entry.properties.get("board-id", entry.properties.get("target-type", b"")).strip(b"\0").decode()
-
-        # 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)
-
-    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(" "),
-        )
--- a/Resources/ioreg.py
+++ b/Resources/ioreg.py
@@ -1,83 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-import plistlib
-import subprocess
-from typing import Generator
-
-
-@dataclass
-class IORegistryEntry:
-    name: str
-    entry_class: str
-    properties: dict
-    location: str
-    children: list[IORegistryEntry]
-    parent: IORegistryEntry
-
-
-class IOReg:
-    def __init__(self):
-        self.ioreg = plistlib.loads(subprocess.run("ioreg -a -l".split(), stdout=subprocess.PIPE).stdout.strip())
-        self.tree = self.recurse(self.ioreg, None)
-
-    def recurse(self, entry, parent):
-        converted = IORegistryEntry(
-            entry["IORegistryEntryName"],
-            entry["IOObjectClass"],
-            {
-                i: v
-                for i, v in entry.items()
-                if i
-                not in [
-                    "IOServiceBusyState",
-                    "IOServiceBusyTime",
-                    "IOServiceState",
-                    "IORegistryEntryLocation",
-                    "IORegistryEntryName",
-                    "IORegistryEntryID",
-                    "IOObjectClass",
-                    "IORegistryEntryChildren",
-                    "IOObjectRetainCount",
-                ]
-            },
-            entry.get("IORegistryEntryLocation"),
-            [],
-            parent,
-        )
-
-        for i in entry.get("IORegistryEntryChildren", []):
-            converted.children.append(self.recurse(i, converted))
-
-        return converted
-
-    def parse_conditions(self, entry: IORegistryEntry, **kwargs):
-        conditions = []
-        if "parent" in kwargs:
-            conditions.append(self.parse_conditions(entry.parent, **kwargs["parent"]))
-        if "children" in kwargs:
-            conditions.append(any(self.parse_conditions(i, **kwargs["children"]) for i in entry.children))
-        if "name" in kwargs:
-            conditions.append(kwargs["name"] == entry.name)
-        if "entry_class" in kwargs:
-            conditions.append(kwargs["entry_class"] == entry.entry_class)
-        if "key" in kwargs:
-            conditions.append(kwargs["key"] in entry.properties)
-        if "property" in kwargs:
-            conditions.append(kwargs["property"][0] in entry.properties and entry.properties[kwargs["property"][0]] == kwargs["property"][1])
-
-        return all(conditions)
-
-    def find(self, root: IORegistryEntry = None, **kwargs) -> Generator[IORegistryEntry, None, None]:
-        if not root:
-            root = self.tree
-
-        if not kwargs:
-            return
-
-        if self.parse_conditions(root, **kwargs):
-            yield root
-
-        for i in root.children:
-            for j in self.find(i, **kwargs):
-                yield j
--- a/after_pyinstaller.sh
+++ b/after_pyinstaller.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-cp launcher.sh dist/OpenCore-Patcher.app/Contents/MacOS/Launcher
+cp payloads/launcher.sh dist/OpenCore-Patcher.app/Contents/MacOS/Launcher
--- a/create_offline_build.py
+++ b/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")
--- a/data/bluetooth_data.py
+++ b/data/bluetooth_data.py
@@ -0,0 +1,15 @@
+import enum
+
+
+class bluetooth_data(enum.IntEnum):
+    # Bluetooth Chipsets
+    NonApplicable = 0
+    BRCM2045 = 1  # TODO: Rename chipset, currently guessing MacPro1,1-3,1 name
+    BRCM2046 = 2  # BT 2.1
+    BRCM2070 = 3  # BT 2.1
+    BRCM20702_v1 = 4  # BT 4.0 - 2012
+    BRCM20702_v2 = 5  # BT 4.0 - 2013+
+    BRCM20703 = 6  # BT 4.2
+    BRCM20703_UART = 9  # BRCM20703 over UART, BT 4.2
+    UART = 10  # T2
+    PCIe = 20  # Apple Silicon
--- a/data/cpu_data.py
+++ b/data/cpu_data.py
@@ -0,0 +1,22 @@
+import enum
+
+
+class cpu_data(enum.IntEnum):
+    pentium_4 = 0
+    yonah = 1
+    conroe = 2
+    penryn = 3
+    nehalem = 4  # (Westmere included)
+    sandy_bridge = 5  #     2000
+    ivy_bridge = 6  #       3000
+    haswell = 7  #       4000
+    broadwell = 8  #       5000
+    skylake = 9  #       6000
+    kaby_lake = 10  #       7000
+    coffee_lake = 11  #     8000
+    comet_lake = 12  #       9000
+    ice_lake = 13  #        10000
+
+    apple_dtk = 112  # A12
+    apple_m1 = 114  # A14
+    apple_m2 = 115  # A15
--- a/data/example_data.py
+++ b/data/example_data.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"
+    )
--- a/data/model_array.py
+++ b/data/model_array.py
@@ -0,0 +1,395 @@
+# Lists all models and required patches
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
+SupportedSMBIOS = [
+    # MacBook
+    "MacBook4,1",
+    "MacBook5,1",
+    "MacBook5,2",
+    "MacBook6,1",
+    "MacBook7,1",
+    "MacBook8,1",
+    # MacBook Air
+    "MacBookAir2,1",
+    "MacBookAir3,1",
+    "MacBookAir3,2",
+    "MacBookAir4,1",
+    "MacBookAir4,2",
+    "MacBookAir5,1",
+    "MacBookAir5,2",
+    "MacBookAir6,1",
+    "MacBookAir6,2",
+    # MacBook Pro
+    "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",
+    # Mac Mini
+    "Macmini3,1",
+    "Macmini4,1",
+    "Macmini5,1",
+    "Macmini5,2",
+    "Macmini5,3",
+    "Macmini6,1",
+    "Macmini6,2",
+    # iMac
+    "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",
+    # Mac Pro
+    "MacPro3,1",
+    "MacPro4,1",
+    "MacPro5,1",
+    # Xserve
+    "Xserve2,1",
+    "Xserve3,1",
+]
+
+# Audio
+
+LegacyAudio = [
+    "MacBook4,1",
+    "MacBook5,1",
+    "MacBook5,2",
+    "MacBook6,1",
+    "MacBook7,1",
+    "MacBookAir2,1",
+    "MacBookAir3,1",
+    "MacBookAir3,2",
+    "MacBookAir4,1",
+    "MacBookAir4,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",
+    "Macmini3,1",
+    "Macmini4,1",
+    "Macmini5,1",
+    "Macmini5,2",
+    "Macmini5,3",
+    # "iMac7,1",
+    # "iMac8,1",
+    "iMac9,1",
+    "iMac10,1",
+    "iMac11,1",
+    "iMac11,2",
+    "iMac11,3",
+    "iMac12,1",
+    "iMac12,2",
+    "MacPro3,1",
+    "Dortania1,1",
+]
+
+# GPU
+
+ModernGPU = [
+    "MacBookAir5,1",  # Intel 4000
+    "MacBookAir5,2",  # Intel 4000
+    "MacBookPro9,1",  # Intel 4000 + Nvidia 650M
+    "MacBookPro9,2",  # Intel 4000
+    "MacBookPro10,1",  # Intel 4000 + Nvidia 650M
+    "MacBookPro10,2",  # Intel 4000
+    "MacBookPro11,3",  # Intel 5000 + Nvidia Kepler
+    "Macmini6,1",  # Intel 4000
+    "Macmini6,2",  # Intel 4000
+    "iMac13,1",  # Intel 4000
+    "iMac13,2",  # Intel 4000 + Nvidia Kepler
+    "iMac13,3",  # Intel 4000
+    "iMac14,1",  # Intel 5000 + Nvidia Kepler
+    "iMac14,2",  # Intel 5000 + Nvidia Kepler
+    "iMac14,3",  # Intel 5000 + Nvidia Kepler
+]
+
+LegacyGPU = [
+    "MacBook4,1",  # GMA X3100
+    "MacBook5,1",  # Nvidia 9000
+    "MacBook5,2",  # Nvidia 9000
+    "MacBook6,1",  # Nvidia 9000
+    "MacBook7,1",  # Nvidia 300
+    "MacBookAir2,1",  # Nvidia 9000
+    "MacBookAir3,1",  # Nvidia 300
+    "MacBookAir3,2",  # Nvidia 300
+    "MacBookAir4,1",  # Intel 3000
+    "MacBookAir4,2",  # Intel 3000
+    "MacBookPro4,1",  # Nvidia 8000
+    "MacBookPro5,1",  # Nvidia 9000
+    "MacBookPro5,2",  # Nvidia 9000
+    "MacBookPro5,3",  # Nvidia 9000
+    "MacBookPro5,4",  # Nvidia 9000
+    "MacBookPro5,5",  # Nvidia 9000
+    "MacBookPro6,1",  # Intel 100 + Nvidia 300
+    "MacBookPro6,2",  # Intel 100 + Nvidia 300
+    "MacBookPro7,1",  # Nvidia 300
+    "MacBookPro8,1",  # Intel 3000
+    "MacBookPro8,2",  # Intel 3000 + AMD 6000
+    "MacBookPro8,3",  # Intel 3000 + AMD 6000
+    "Macmini3,1",  # Nvidia 9000
+    "Macmini4,1",  # Nvidia 300
+    "Macmini5,1",  # Intel 3000
+    "Macmini5,2",  # AMD 6000
+    "Macmini5,3",  # Intel 3000
+    "iMac7,1",  # AMD 2000
+    "iMac8,1",  # Nvidia and AMD 2400
+    "iMac9,1",  # Nvidia 9000
+    "iMac10,1",  # Nvidia 9000 and AMD 4000
+    "iMac11,1",  # AMD 4000
+    "iMac11,2",  # AMD 4000 and 5000
+    "iMac11,3",  # AMD 5000
+    "iMac12,1",  # AMD 6000
+    "iMac12,2",  # AMD 6000
+    "Dortania1,1",  # RTX 3080
+]
+
+LegacyGPUNvidia = [
+    "MacBook5,1",  # Nvidia 9000
+    "MacBook5,2",  # Nvidia 9000
+    "MacBook6,1",  # Nvidia 9000
+    "MacBook7,1",  # Nvidia 300
+    "MacBookAir2,1",  # Nvidia 9000
+    "MacBookAir3,1",  # Nvidia 300
+    "MacBookAir3,2",  # Nvidia 300
+    "MacBookPro4,1",  # Nvidia 8000
+    "MacBookPro5,1",  # Nvidia 9000
+    "MacBookPro5,2",  # Nvidia 9000
+    "MacBookPro5,3",  # Nvidia 9000
+    "MacBookPro5,4",  # Nvidia 9000
+    "MacBookPro5,5",  # Nvidia 9000
+    "MacBookPro6,1",  # Intel 100 + Nvidia 300
+    "MacBookPro6,2",  # Intel 100 + Nvidia 300
+    "MacBookPro7,1",  # Nvidia 300
+    "Macmini3,1",  # Nvidia 9000
+    "Macmini4,1",  # Nvidia 300
+    "iMac9,1",  # Nvidia 9000
+    # "iMac10,1", # Nvidia 9000 and AMD 4000
+]
+
+LegacyGPUAMD = [
+    "MacBookPro8,2",  # Intel 3000 + AMD 6000
+    "MacBookPro8,3",  # Intel 3000 + AMD 6000
+    "Macmini5,2",  # AMD 6000
+    "iMac7,1",  # AMD 2000
+    # "iMac8,1", # Nvidia and AMD 2000
+    # "iMac10,1", # Nvidia 9000 and AMD 4000
+    "iMac11,1",  # AMD 4000
+    "iMac11,2",  # AMD 4000 and 5000
+    "iMac11,3",  # AMD 5000
+    "iMac12,1",  # AMD 6000
+    "iMac12,2",  # AMD 6000
+]
+
+LegacyGPUAMDIntelGen2 = [
+    "MacBookPro8,2",  # Intel 3000 + AMD 6000
+    "MacBookPro8,3",  # Intel 3000 + AMD 6000
+    "Macmini5,2",  # AMD 6000
+    "iMac12,1",  # AMD 6000
+    "iMac12,2",  # AMD 6000
+]
+
+LegacyGPUIntelGen1 = [
+    "MacBookPro6,1",  # Intel 100 + Nvidia 300
+    "MacBookPro6,2",  # Intel 100 + Nvidia 300
+]
+
+LegacyGPUIntelGen2 = [
+    "MacBookAir4,1",  # Intel 3000
+    "MacBookAir4,2",  # Intel 3000
+    "MacBookPro8,1",  # Intel 3000
+    "MacBookPro8,2",  # Intel 3000 + AMD 6000
+    "MacBookPro8,3",  # Intel 3000 + AMD 6000
+    "Macmini5,1",  # Intel 3000
+    "Macmini5,3",  # Intel 3000
+]
+
+LegacyBrightness = [
+    "MacBook5,2",
+    "iMac7,1",
+    "iMac8,1",
+    "iMac9,1",
+]
+
+NVMePatch = ["MacPro3,1", "MacPro4,1", "Xserve3,1", "Dortania1,1"]
+
+DualGPUPatch = [
+    "MacBookPro5,1",
+    "MacBookPro5,2",
+    "MacBookPro5,3",
+    "MacBookPro6,1",
+    "MacBookPro6,2",
+    "MacBookPro8,2",
+    "MacBookPro8,3",
+    "Macmini5,2",
+    "iMac12,1",
+    "iMac12,2",
+    "iMac13,1",
+    "iMac13,2",
+    "iMac14,2",
+    "iMac14,3",
+    "Dortania1,1",
+]
+
+DualGPUPatchRetina = [
+    "MacBookPro10,1",
+    "MacBookPro11,3",
+]
+
+IntelNvidiaDRM = [
+    "iMac13,1",
+    "iMac13,2",
+    "iMac14,2",
+    "iMac14,3",
+]
+
+IDEPatch = ["MacBook4,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "MacPro3,1", "Xserve2,1", "Dortania1,1"]
+
+# Mac Pro and Xserve
+MacPro = ["MacPro3,1", "MacPro4,1", "MacPro5,1", "Xserve2,1", "Xserve3,1", "Dortania1,1"]
+
+SATAPatch = [
+    "MacBook4,1",
+    "MacBook5,1",
+    "MacBook5,2",
+    "MacBook6,1",
+    "MacBook7,1",
+    "MacBookAir2,1",
+    "MacBookAir3,1",
+    "MacBookAir3,2",
+    "MacBookAir4,1",
+    "MacBookAir4,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",
+    "Macmini3,1",
+    "Macmini4,1",
+    "Macmini5,1",
+    "Macmini5,2",
+    "Macmini5,3",
+    "iMac7,1",
+    "iMac8,1",
+    "iMac9,1",
+    "iMac10,1",
+    "iMac11,1",
+    "iMac11,2",
+    "iMac11,3",
+    "iMac12,1",
+    "iMac12,2",
+    "MacPro3,1",
+    "MacPro4,1",
+    "MacPro5,1",
+    "Xserve2,1",
+    "Xserve3,1",
+    "Dortania1,1",
+]
+
+NoAGPMSupport = ["MacBook4,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "MacPro3,1", "Xserve2,1", "Dortania1,1"]
+
+AGDPSupport = [
+    "MacBookPro9,1",
+    "MacBookPro10,1",
+    "iMac13,1",
+    "iMac13,2",
+    "iMac14,1",
+    "iMac14,2",
+    "iMac14,3",
+    "iMac14,4",
+    "iMac15,1",
+    # TODO: Uncomment when dropped from macOS
+    # "iMac17,1",
+    # "iMac18,2",
+    # "iMac18,3",
+    # "iMac19,1",
+    # "iMac19,2",
+    # "iMac20,1",
+    # "iMac20,2",
+    # "iMacPro1,1",
+    # "MacPro6,1",
+]
+
+Missing_USB_Map = [
+    "MacBook4,1",
+    "MacBook5,1",
+    "MacBook5,2",
+    "MacBook6,1",
+    "MacBook7,1",
+    "MacBookAir2,1",
+    "MacBookAir3,1",
+    "MacBookAir3,2",
+    "MacBookAir4,1",
+    "MacBookAir4,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",
+    "Macmini3,1",
+    "Macmini4,1",
+    "Macmini5,1",
+    "Macmini5,2",
+    "Macmini5,3",
+    "iMac7,1",
+    "iMac8,1",
+    "iMac9,1",
+    "iMac10,1",
+    "iMac11,1",
+    "iMac11,2",
+    "iMac11,3",
+    "iMac12,1",
+    "iMac12,2",
+    "MacPro3,1",
+    "MacPro4,1",
+    "Xserve2,1",
+    "Xserve3,1",
+]
--- a/data/os_data.py
+++ b/data/os_data.py
@@ -0,0 +1,20 @@
+import enum
+
+
+class os_data(enum.IntEnum):
+    # OS Versions, Based off Major Kernel Version
+    tiger = 8
+    leopard = 9
+    snow_leopard = 10
+    lion = 11
+    mountain_lion = 12
+    mavericks = 13
+    yosemite = 14
+    el_capitan = 15
+    sierra = 16
+    high_sierra = 17
+    mojave = 18
+    catalina = 19
+    big_sur = 20
+    monterey = 21
+    max_os = 99
--- a/Resources/PCIIDArray.py
+++ b/Resources/PCIIDArray.py
@@ -1,10 +1,20 @@
 # 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/
+    curie_ids = [
+        0x0040,
+        0x00f0,
+        0x0220,
+        0x0140,
+        0x0160,
+        0x0090,
+        0x01d0,
+        0x0390,
+        0x0290,
+    ]
+
    tesla_ids = [
        # G80
        0x0190,  # G80 [GeForce 8800 GTS / 8800 GTX]
@@ -515,61 +525,79 @@ class nvidia_ids:


 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,
+
+    gcn_7000_ids = [
+        # GCN v1
+        # AMDPitcairnGraphicsAccelerator - AMD7000Controller
+        0x6800,  # HD 7970M
+        0x6801,  # HD 8970M
+        0x6806,  # Unknown
+        0x6808,  # W7000
+        0x6810,  # R7 370 / R9 270X/370X
+        0x6818,  # HD 7870
+        0x6819,  # HD 7850 / R7 265 / R9 270 1024SP
+        # AMDPitcairnGraphicsAccelerator - AMD7000Controller
+        0x6800,  # HD 7970M
+        0x6801,  # HD 8970M
+        0x6806,  # Unknown
+        0x6808,  # W7000
+        0x6810,  # R7 370 / R9 270X/370X
+        0x6818,  # HD 7870
+        0x6819,  # HD 7850 / R7 265 / R9 270 1024SP
+        # AMDTahitiGraphicsAccelerator - AMD7000Controller
+        0x6790,  # Unknown
+        0x6798,  # HD 7970/8970 OEM / R9 280X / D700
+        0x679A,  # HD 7950/8950 OEM / R9 280
+        0x679E,  # HD 7870 XT
+        0x6780,  # W9000
+        # AMDVerdeGraphicsAccelerator - AMD7000Controller
+        0x6820,  # HD 8890M / R9 M275X/M375X / M5100
+        0x6821,  # HD 8870M / R9 M270X/M370X
+        0x6823,  # HD 8850M / R9 M265X
+        0x6825,  # HD 7870M
+        0x6827,  # HD 7850M/8850M
+        0x682B,  # HD 8830M / R7 250 / R7 M465X
+        0x682D,  # M4000
+        0x682F,  # HD 7730M
+        0x6835,  # R9 255
+        0x6839,  # Unknown
+        0x683B,  # Unknown
+        0x683D,  # HD 7770/8760 / R7 250X
+        0x683F,  # HD 7750/8740 / R7 250E
+    ]
+
+    gcn_8000_ids = [
+        # GCN v2
+        # AMDBonaireGraphicsAccelerator - AMD8000Controller
+        0x6640,  # M6100
+        0x6641,  # HD 8930M
+        0x6646,  # R9 M280X / W6170M
+        0x6647,  # R9 M270X/M280X
+        0x6650,  # Unknown
+        0x6651,  # Unknown
+        0x665C,  # HD 7790/8770 / R7 360 / R9 260/360
+        0x665D,  # R7 200
+        # AMDHawaiiGraphicsAccelerator - AMD8000Controller
+        0x67B0,  # R9 290X/390X
+    ]
+
+    gcn_9000_ids = [
+        # GCN v3
+        # AMDFijiGraphicsAccelerator - AMD9000Controller
+        0x7300,  # R9 FURY / NANO
+        0x730F,  # Unknown
+        # AMDTongaGraphicsAccelerator - AMD9000Controller
+        0x6920,  # R9 M395/ M395X
+        0x6921,  # R9 M295X / M390X
+        0x6930,  # Unknown
+        0x6938,  # R9 380X / R9 M295X
+        0x6939,  # R9 285/380
    ]

    polaris_ids = [
+        # GCN v4
        # AMDRadeonX4000
-        # AMDBaffinGraphicsAccelerator
+        # AMDBaffinGraphicsAccelerator - AMD9500Controller
        0x67E0,
        0x67E3,
        0x67E8,
@@ -579,7 +607,7 @@ class amd_ids:
        0x67E1,
        0x67E7,
        0x67E9,
-        # AMDEllesmereGraphicsAccelerator
+        # AMDEllesmereGraphicsAccelerator - AMD9500Controller
        0x67C0,
        0x67C1,
        0x67C2,
@@ -595,8 +623,9 @@ class amd_ids:
    ]

    vega_ids = [
+        # GCN v5
        # AMDRadeonX5000
-        # AMDVega10GraphicsAccelerator
+        # AMDVega10GraphicsAccelerator - AMD10000Controller
        0x6860,
        0x6861,
        0x6862,
@@ -612,13 +641,13 @@ class amd_ids:
        0x686E,
        0x686F,
        0x687F,
-        # AMDVega12GraphicsAccelerator
+        # AMDVega12GraphicsAccelerator - AMD10000Controller
        0x69A0,
        0x69A1,
        0x69A2,
        0x69A3,
        0x69AF,
-        # AMDVega20GraphicsAccelerator
+        # AMDVega20GraphicsAccelerator - AMD10000Controller
        0x66A0,
        0x66A1,
        0x66A2,
@@ -638,7 +667,7 @@ class amd_ids:
        0x731B,
        0x731F,
        # AMDNavi12GraphicsAccelerator
-        0x7360,
+        0x7360,  # 5600M
        # AMDNavi14GraphicsAccelerator
        0x7340,
        0x7341,
@@ -650,6 +679,14 @@ class amd_ids:
        0x73AB,
        0x73BF,
    ]
+
+    r500_ids = [
+        0x7187,  # X1300/X1550
+        0x7146,  # X1300/X1550
+        0x71c5,  # Mobile X1600
+        0x7249,  # X1900 XT
+    ]
+
    terascale_1_ids = [
        0x9400,
        0x9401,
@@ -688,39 +725,50 @@ class amd_ids:
    ]

    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,
+        0x6738,  # HD 6870
+        0x6739,  # HD 6850
+        0x6720,  # HD 6970M/6990M
+        0x6722,  # Unknown
+        0x6768,  # Unknown
+        0x6770,  # HD 6450A/7450A
+        0x6779,  # HD 6450/7450/8450 / R5 230 OEM
+        0x6760,  # HD 6400M/7400M
+        0x6761,  # HD 6430M
+        0x68E0,  # HD 5430/5450/547
+        0x6898,  # HD 5870
+        0x6899,  # HD 5850
+        0x68B8,  # HD 5770
+        0x68B0,  # Unknown
+        0x68B1,  # Unknown
+        0x68A0,  # HD 5870 (mobile)
+        0x68A1,  # HD 5850 (mobile)
+        0x6840,  # HD 7500M/7600M
+        0x6841,  # HD 7550M/7570M/7650M
+        0x68D8,  # HD 5670/5690/5730
+        0x68C0,  # HD 5730 / 6570M
+        0x68C1,  # HD 5650/5750 / 6530M/6550M
+        0x68D9,  # HD 5550/5570/5630/6510/6610/7570
+        0x6750,  # HD 6650A/7650A
+        0x6758,  # HD 6670/7670
+        0x6759,  # HD 6570/7570/8550
+        0x6740,  # HD 6730M/6770M/7690M XT
+        0x6741,  # HD 6630M/6650M/6750M/7670M/7690M
+        0x6745,  # Unknown
    ]


 class intel_ids:
+    gma_950_ids = [
+        0x2582,
+        0x2592,
+        0x2772,
+        0x27A2,
+    ]
+
+    gma_x3100_ids = [
+        0x2a02,
+    ]
+
    iron_ids = [
        # AppleIntelHDGraphics IDs
        0x0044,
@@ -746,8 +794,123 @@ class intel_ids:
        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,
+    ]
+
+    comet_lake_ids = [
+        0x9BC8,
+        0x9BC5,
+        0x9BC4,
+    ]
+
+    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:
+    AppleBCMWLANBusInterfacePCIe = [
+        0x43DC,  # BCM4355
+        0x4464,  # BCM4364
+        0x4488,  # BCM4377b
+        0x4425,  # Unknown
+    ]
+
    AirPortBrcmNIC = [
        # AirPortBrcmNIC IDs
        0x43BA,  # BCM43602
@@ -782,6 +945,82 @@ class broadcom_ids:
        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 = [
--- a/data/sip_data.py
+++ b/data/sip_data.py
@@ -0,0 +1,35 @@
+class system_integrity_protection:
+    csr_values = {
+        # 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",  #            0x1
+        "CSR_ALLOW_UNRESTRICTED_FS",  #            0x2
+        "CSR_ALLOW_UNAPPROVED_KEXTS",  #           0x200
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE",  # 0x400
+    ]
+
+    root_patch_sip_big_sur = [
+        # Variables required to root patch in Big Sur and Monterey
+        "CSR_ALLOW_UNTRUSTED_KEXTS",  #            0x1
+        "CSR_ALLOW_UNRESTRICTED_FS",  #            0x2
+        "CSR_ALLOW_UNAPPROVED_KEXTS",  #           0x200
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE",  # 0x400
+        "CSR_ALLOW_UNAUTHENTICATED_ROOT",  #       0x800
+    ]
--- a/data/smbios_data.py
+++ b/data/smbios_data.py
--- a/Resources/SysPatchArray.py
+++ b/Resources/SysPatchArray.py
@@ -1,4 +1,4 @@
-# Lists Root patches used by SysPatch.py
+# Lists Root patches used by sys_patch.py
 # Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
 DeleteNvidiaAccel11 = [
    "AMDRadeonX4000.kext",
@@ -91,7 +91,10 @@ AddNvidiaKeplerAccel11 = [
    "NVDAGK100Hal.kext",
    "NVDAResman.kext",
    "NVDAStartup.kext",
-    "NVSMU.kext",
+]
+
+AddNvidiaTeslaAccel12 = [
+    "NVDAStartup.kext",
 ]

 AddAMDAccel11 = [
@@ -140,6 +143,7 @@ AddAMDBrightness = [

 AddAMDAccel11TS2 = [
    "IOSurface.kext",
+    "IOAcceleratorFamily2.kext",
 ]

 AddIntelGen1Accel = [
@@ -155,10 +159,18 @@ AddIntelGen2Accel = [
    "AppleIntelHD3000GraphicsGA.plugin",
    "AppleIntelHD3000GraphicsGLDriver.bundle",
    "AppleIntelHD3000GraphicsVADriver.bundle",
-    "AppleIntelSNBGraphicsFB.kext",
+    # "AppleIntelSNBGraphicsFB.kext",
    "AppleIntelSNBVA.bundle",
 ]

+AddIntelGen2AccelStock = [
+    "AppleIntelSNBGraphicsFB-Clean.kext",
+]
+
+AddIntelGen2AccelPatched = [
+    "AppleIntelSNBGraphicsFB.kext",
+]
+
 AddIntelGen3Accel = [
    "AppleIntelFramebufferCapri.kext",
    "AppleIntelHD4000Graphics.kext",
@@ -173,6 +185,16 @@ AddGeneralAccel = ["IOAcceleratorFamily2.kext", "IOSurface.kext"]

 DeleteBrightness = ["AppleGraphicsControl.kext/Contents/PlugIns/AGDCBacklightControl.kext"]

+DeleteDemux = [
+    "AppleGraphicsControl.kext/Contents/PlugIns/AGDCBacklightControl.kext",
+    "AppleGraphicsControl.kext/Contents/PlugIns/AppleMuxControl.kext",
+    "AppleBacklight.kext",
+]
+
+AddDemux = [
+    "AppleMuxControl.kext",
+]
+
 AddBrightness = [
    "AppleBacklight.kext",
    "AppleBacklightExpert.kext",
@@ -183,6 +205,10 @@ AddVolumeControl = [
    "IOAudioFamily.kext",
 ]

+AddVolumeControlv2 = [
+    "AppleHDA.kext",
+]
+
 DeleteVolumeControl = [
    "AppleVirtIO.kext",
    "AppleVirtualGraphics.kext",
@@ -190,3 +216,72 @@ DeleteVolumeControl = [
    "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",
+]
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -134,7 +134,6 @@ module.exports = {
 				'TERMS',
 				'HOW',
 				'PATCHEXPLAIN',
-				'CLI',
            ]

        },
--- a/docs/ACCEL.md
+++ b/docs/ACCEL.md
@@ -7,13 +7,48 @@
 * [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 achieve GPU Acceleration on 2011 15" and 17" MacBook Pros](#unable-to-achieve-gpu-acceleration-on-2011-15-and-17-macbook-pros)
+* [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:

-* AMD/ATI TeraScale 2 - HD5/6000 series
 * 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.
@@ -30,6 +65,10 @@ Currently Zoom relies partially on Metal and so needs a small binary patch. Dosd

 ## 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:
@@ -41,6 +80,20 @@ 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.
@@ -55,15 +108,17 @@ To work around this, simply press Tab to hover over and press spacebar to simula

 ## 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.
+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 achieve GPU Acceleration on 2011 15" and 17" MacBook Pros
+## Unable to switch GPUs on 2011 15" and 17" MacBook Pros

-Currently OpenCore Legacy Patcher doesn't have support for the TeraScale 2 series dGPUs found in the 15" and 17" models. Currently the best way to achieve graphics acceleration is to simply disable the dGPU and force the iGPU always.
+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:

@@ -71,4 +126,13 @@ The best way to achieve this is to boot Recovery (or Single User Mode if the dGP
 nvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs=%01%00%00%00
 ```

-This will disable the dGPU and allow graphics acceleration 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.
+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/)
--- a/docs/BENIFITS.md
+++ b/docs/BENIFITS.md
@@ -7,14 +7,14 @@ With OpenCore Legacy Patcher we recommend users go through the below table to un
 | 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> 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">Supported on Metal GPUs</span> | <span style="color:red">Not supported</span> |
+| 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> |
 | 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> |
-| Legacy 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> |
+| 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> |
--- a/docs/CLI.md
+++ b/docs/CLI.md
@@ -1,41 +0,0 @@
-# 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
--- a/docs/INSTALLER.md
+++ b/docs/INSTALLER.md
@@ -12,7 +12,7 @@ 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
-[ ! -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
+[ ! -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:
--- a/docs/LICENSE.md
+++ b/docs/LICENSE.md
@@ -9,14 +9,15 @@ 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
-  * [SidecarFixup](https://github.com/khronokernel/SidecarFixup) - Khronokernel
+  * [SurPlus](https://github.com/reenigneorcim/SurPlus) - Syncretic
+  * [VMM Patch Set](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/4a8f61a01da72b38a4b2250386cc4b497a31a839/payloads/Config/config.plist#L1222-L1281) - parrotgeek1
  * Apple Binaries - Apple Inc.

 Remaining files within OpenCore Legacy Patcher are copyrighted 2020-2021 Mykola Grymalyuk & Dhinak G. For integration into other projects, please request written permission.
--- a/docs/MODELS.md
+++ b/docs/MODELS.md
@@ -23,6 +23,9 @@ Regarding OS support, see below:
 | 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

 | SMBIOS | Year | Supported | Comment |
@@ -35,6 +38,7 @@ Regarding OS support, see below:
 | 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

@@ -48,6 +52,8 @@ Regarding OS support, see below:
 | 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

@@ -74,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

@@ -113,6 +122,8 @@ Regarding OS support, see below:
 | 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-2011 Graphics Card Upgrade Guide](https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/?post=17425857#post-17425857)

--- a/docs/MONTEREY-DROP.md
+++ b/docs/MONTEREY-DROP.md
@@ -1,72 +1,57 @@
 # 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

-Current models with full, unhindered support in OpenCore Legacy Patcher are the following:
+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:

-* iMac13,x and newer
-  * iMac10,1-12,x included if Wireless Card and Bluetooth upgraded as well as Metal GPU
-* Macmini7,1 and newer
-* MacBook8,1 and newer
-* MacBookAir6,x and newer
-* MacBookPro11,x and newer
-* MacPro3,1 and newer
-  * Requires Wireless Card and Bluetooth upgrade for 3,1-5,1 as well as Metal GPU
+* iMac14,4
+* iMac15,1
+* MacBook8,1
+* MacBookAir6,1
+* MacBookAir6,2
+* MacBookPro11,1
+* MacBookPro11,2
+* MacBookPro11,3

-## Current Hardware Drawbacks:
+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

-Below is a list of hardware that currently has issues with Monterey:
+## Previously Broken Hardware

-* [Acceleration Support Dropped](#acceleration-support-dropped)
-  * [Metal GPUs](#metal-gpus)
-  * [Non-Metal GPUs](#non-metal-gpus)
-* [Bluetooth Support Dropped](#bluetooth-support-dropped)
-* [Wireless Support Dropped](#wireless-support-dropped)
+::: details macOS 12.0 Beta 4 issue on 2012 to early 2013 machines (Resolved in 0.2.5 and newer)

-## Acceleration Support Dropped
+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:

-### Metal GPUs
+* [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)

-* Intel HD4000 iGPUs lost support
+A temporary fix is to restart the BlueTool and bluetoothd process with each boot, note it may not work for all users:

-By default these machines require root volume patches to gain graphics acceleration in Monterey. OpenCore Legacy Patcher supports readding support however SIP and FileVault can no longer be enabled due to root patching:
-
-* Macmini6,x
-* MacBookAir5,x
-* MacBookPro9,x
-* MacBookPro10,x
-
-Note: Currently HD 4000 support in Monterey is not perfect, following are broken:
-
-::: details HD 4000 Issues
-
-* Photo Booth app crashing
-* Safari sites crash if request camera access
-* Full Screen recoding crashing with Screenshot app
-* AirPlay to Mac crashes
-* Full Screen apps crashes
-  * Disable "Hide menubar in Full Screen" to avoid crash
+```sh
+sudo killall -9 BlueTool bluetoothd
+```

 :::

-### Non-Metal GPUs
+::: details Wireless Support Dropped (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
+* Broadcom BCM94328, BCM94322 and Atheros Wireless Chipsets lost support

-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):
+The following models lost Bluetooth support in macOS Monterey due to their legacy Wireless chipset:

 * iMac12,x and older
-* Macmini5,x and older
-* MacBook7,1 and older
-* MacBookAir4,x and older
-* MacBookPro8,x and older
+* Macmini3,1 and older
+* MacBook5,x and older
+* MacBookAir2,1 and older
+* MacBookPro7,1 and older
+* MacPro5,1 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/)
+Note: BCM943224, BCM94331, BCM94360 and BCM943602 are still fully support by OpenCore Legacy Patcher

-## Bluetooth Support Dropped 
+:::
+
+::: details Bluetooth Support Dropped (Resolved in 0.2.5 and newer)

 * BRCM2046 and BRCM2070 Bluetooth Chipsets lost support

@@ -79,7 +64,9 @@ The following models lost Bluetooth support in macOS Monterey due to their legac
 * MacBookPro8,1 and older
 * MacPro5,1 and older

-::: details Dropped Firmwares 
+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):

@@ -102,19 +89,34 @@ Here are the firmwares macOS Monterey Dropped (previously located within IOBluet

 :::

-Note: Native BRCM20702 and BRCM20703 are still fully support by OpenCore Legacy Patcher
+::: details Ivy Bridge iGPU Acceleration (Resolved in 0.1.7 and newer)

-## Wireless Support Dropped
+* Intel HD4000 iGPUs lost support

-* Broadcom BCM94328, BCM94322 and Atheros Wireless Chipsets 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:

-The following models lost Bluetooth support in macOS Monterey due to their legacy Wireless chipset:
+* 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
-* Macmini3,1 and older
-* MacBook5,x and older
-* MacBookAir2,1 and older
-* MacBookPro7,1 and older
-* MacPro5,1 and older
+* Macmini5,x and older
+* MacBook7,1 and older
+* MacBookAir4,x and older
+* MacBookPro8,x and older

-Note: BCM943224, BCM94331, BCM94360 and BCM943602 are still fully support by OpenCore Legacy Patcher
+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/)
+
+:::
--- a/docs/PATCHEXPLAIN.md
+++ b/docs/PATCHEXPLAIN.md
@@ -19,7 +19,7 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
 * EHCx and XHC1 Patches
  * Reason: Required for proper USB operation
  * Logic: Avoids USB maps of newer models attaching and breaking USB port functionality
-  * Models: All models require
+  * Models: All models require when spoofing with Moderate or Advanced SMBIOS

 ### Booter -> Quirks

@@ -53,11 +53,11 @@ Below is a run down of the main logic OpenCore Legacy Patcher uses to gain nativ
 * SMC Patch
  * Reason: Required to avoid SMC Firmware updates
  * Logic: Patches out `smc-version` in AppleSMC.kext, requires SMC-Spoof.kext for full functionality
-  * Models: All models require
+  * Models: All models require when spoofing SMBIOS
 * IOHIDFamily Patch
  * Reason: Required for HID peripheral support in macOS on older hardware
  * Logic: Tricks IOHIDFamily into thinking it's always booting recovery
-  * Models: [2010 and older](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/79ab028b0a039e97a528e0b99c876d95d9c2d41d/Resources/ModelArray.py#L310-L332)
+  * Models: Penryn CPUs (Core2 series)

 ### Kernel -> Quirks

@@ -196,15 +196,13 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m

 Unfortunately certain on-disk patches are required to achieve full functionality. Below is a breakdown of patches supported

-Note, GPU Acceleration Patches are not public yet, the below section is simply documentation for easier research with new aids.
-
 ::: details Audio Patches

 ### Extensions

 * AppleHDA
-  * Reason: Re-add High Sierra's AppleHDA to achieve audio support
-  * Models: 2011 and older Macs (excluding MacPro4,1+)
+  * Reason: Re-add El Capitan's AppleHDA to achieve audio support
+  * Models: iMac7,1 and iMac8,1

 :::

--- a/docs/POST-INSTALL.md
+++ b/docs/POST-INSTALL.md
@@ -34,6 +34,8 @@ For many users, SIP will be enabled by default on build. For Intel HD 4000 users

 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:
--- a/docs/ResXtreme.zip
+++ b/docs/ResXtreme.zip
--- a/docs/TERMS.md
+++ b/docs/TERMS.md
@@ -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
 --- | ---
--- a/merge_gui.py
+++ b/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)
--- a/payloads/ACPI/SSDT-DGPU.aml
+++ b/payloads/ACPI/SSDT-DGPU.aml
--- a/payloads/ACPI/Source/SSDT-DGPU.dsl
+++ b/payloads/ACPI/Source/SSDT-DGPU.dsl
@@ -0,0 +1,103 @@
+/* Requests power off of dGPU in MacBookPro8,2/3 (TS2 hardware failure)
+ * Main goal is to ensure power draw from the dGPU is reduced as
+ * much as possible to simulate a hardware demux without actual
+ * hardware modifications.
+ *
+ * Notes:
+ *       - SSDT must be used in conjuction with '_INI' to 'XINI' patch
+ *         to reroute PCI0 initialization.
+ * 
+ *       - AMD drivers in macOS may still attempt to attach and kernel
+ *         panic. Disable the dGPU with class-code/device-id spoof or
+ *         with '-wegnoegpu'.
+ *
+ *       - dGPU will reactivate with sleep-wake, additional process
+ *         is needed to disable the dGPU. 
+ *         - ie. AMDGPUWakeHandler.kext for macOS
+ *
+ * Ref:
+ *       - https://www.tonymacx86.com/threads/help-macbook-pro-disable-radeon-gpu-via-dsdt.164458/
+ *       - https://github.com/blackgate/AMDGPUWakeHandler
+ *       - https://help.ubuntu.com/community/MacBookPro8-2/Raring
+ */
+DefinitionBlock ("", "SSDT", 2, "DRTNIA", "dGPU_OFF", 0x00001000)
+{
+    External (_SB_.PCI0, DeviceObj)
+    External (OSYS)
+
+    Scope (_SB.PCI0)
+    {
+        OperationRegion (IOGP, SystemIO, 0x0700, 0x51)
+        Field (IOGP, ByteAcc, NoLock, Preserve)
+        {
+            Offset (0x10), 
+            P710,   8, 
+            Offset (0x28), 
+            P728,   8, 
+            Offset (0x40), 
+            P740,   8, 
+            Offset (0x50), 
+            P750,   8
+        }
+
+        Method (_INI, 0, NotSerialized)  // _INI: Initialize
+        {
+            Store (0x07D0, OSYS)
+            If (CondRefOf (\_OSI, Local0))
+            {
+                If (_OSI ("Darwin"))
+                {
+                    Store (0x2710, OSYS)
+                }
+
+                If (\_OSI ("Linux"))
+                {
+                    Store (0x03E8, OSYS)
+                }
+
+                If (\_OSI ("Windows 2001"))
+                {
+                    Store (0x07D1, OSYS)
+                }
+
+                If (\_OSI ("Windows 2001 SP1"))
+                {
+                    Store (0x07D1, OSYS)
+                }
+
+                If (\_OSI ("Windows 2001 SP2"))
+                {
+                    Store (0x07D2, OSYS)
+                }
+
+                If (\_OSI ("Windows 2006"))
+                {
+                    Store (0x07D6, OSYS)
+                }
+
+                If (\_OSI ("Windows 2007"))
+                {
+                    Store (0x07D7, OSYS)
+                }
+
+                If (\_OSI ("Windows 2008"))
+                {
+                    Store (0x07D8, OSYS)
+                }
+
+                If (\_OSI ("Windows 2009"))
+                {
+                    Store (0x07D9, OSYS)
+                }
+            }
+            
+            // Disables dGPU
+            Store ("Requesting dGPU power off", Debug)
+            P728 = One  // Switch select
+            P710 = 0x02 // Switch display
+            P740 = 0x02 // Switch DDC
+            P750 = Zero // Power down discrete graphics
+        }
+    }
+}
+
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -31,6 +31,14 @@
 				<key>Path</key>
 				<string>SSDT-PCI.aml</string>
 			</dict>
+			<dict>
+				<key>Enabled</key>
+				<false/>
+				<key>Comment</key>
+				<string>Requests power off of dGPU for Sandy Bridge MacBook Pros</string>
+				<key>Path</key>
+				<string>SSDT-DGPU.aml</string>
+			</dict>
 		</array>
 		<key>Delete</key>
 		<array/>
@@ -156,6 +164,36 @@
 				<key>TableSignature</key>
 				<data>RFNEVA==</data>
 			</dict>
+			<dict>
+				<key>Base</key>
+				<string>\_SB.PCI0</string>
+				<key>BaseSkip</key>
+				<integer>0</integer>
+				<key>Comment</key>
+				<string>_INI to XINI</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>X0lOSQ==</data>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>OemTableId</key>
+				<data></data>
+				<key>Replace</key>
+				<data>WElOSQ==</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+				<key>TableLength</key>
+				<integer>0</integer>
+				<key>TableSignature</key>
+				<data>RFNEVA==</data>
+			</dict>
 		</array>
 		<key>Quirks</key>
 		<dict>
@@ -169,6 +207,8 @@
 			<false/>
 			<key>ResetLogoStatus</key>
 			<false/>
+			<key>SyncTableIds</key>
+			<false/>
 		</dict>
 	</dict>
 	<key>Booter</key>
@@ -232,7 +272,7 @@
 		<array>
 			<dict>
 				<key>Arch</key>
-				<string>x86_64</string>
+				<string>Any</string>
 				<key>Comment</key>
 				<string>Patching Engine</string>
 				<key>Enabled</key>
@@ -240,7 +280,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>8.0.0</string>
 				<key>BundlePath</key>
 				<string>Lilu.kext</string>
 				<key>ExecutablePath</key>
@@ -276,7 +316,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>10.0.0</string>
 				<key>BundlePath</key>
 				<string>WhateverGreen.kext</string>
 				<key>ExecutablePath</key>
@@ -294,7 +334,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>12.0.0</string>
 				<key>BundlePath</key>
 				<string>RestrictEvents.kext</string>
 				<key>ExecutablePath</key>
@@ -312,7 +352,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>16.0.0</string>
 				<key>BundlePath</key>
 				<string>AAAMouSSE.kext</string>
 				<key>ExecutablePath</key>
@@ -348,7 +388,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string>20.0.0</string>
+				<string>12.0.0</string>
 				<key>BundlePath</key>
 				<string>AirportBrcmFixup.kext</string>
 				<key>ExecutablePath</key>
@@ -418,7 +458,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string>20.99.99</string>
+				<string></string>
 				<key>MinKernel</key>
 				<string>16.0.0</string>
 				<key>BundlePath</key>
@@ -436,7 +476,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string>20.99.99</string>
+				<string></string>
 				<key>MinKernel</key>
 				<string>16.0.0</string>
 				<key>BundlePath</key>
@@ -454,7 +494,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string>20.99.99</string>
+				<string></string>
 				<key>MinKernel</key>
 				<string>16.0.0</string>
 				<key>BundlePath</key>
@@ -468,33 +508,15 @@
 				<key>Arch</key>
 				<string>x86_64</string>
 				<key>Comment</key>
-				<string>Atheros Wifi Patch</string>
+				<string>Monterey Atheros Wifi Patch</string>
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string>20.99.99</string>
+				<string></string>
 				<key>MinKernel</key>
 				<string>18.0.0</string>
 				<key>BundlePath</key>
-				<string>IO80211HighSierra.kext</string>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/IO80211HighSierra</string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>Comment</key>
-				<string>Atheros Wifi Patch</string>
-				<key>Enabled</key>
-				<false/>
-				<key>MaxKernel</key>
-				<string>20.99.99</string>
-				<key>MinKernel</key>
-				<string>18.0.0</string>
-				<key>BundlePath</key>
-				<string>IO80211HighSierra.kext/Contents/PlugIns/AirPortAtheros40.kext</string>
+				<string>IO80211ElCap.kext/Contents/PlugIns/AirPortAtheros40.kext</string>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/AirPortAtheros40</string>
 				<key>PlistPath</key>
@@ -504,33 +526,15 @@
 				<key>Arch</key>
 				<string>x86_64</string>
 				<key>Comment</key>
-				<string>Broadcom Wifi Patch</string>
+				<string>Monterey BCM94322 Wifi Patch</string>
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string>20.99.99</string>
+				<string></string>
 				<key>MinKernel</key>
 				<string>19.0.0</string>
 				<key>BundlePath</key>
-				<string>IO80211Mojave.kext</string>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/IO80211Mojave</string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>Comment</key>
-				<string>Broadcom Wifi Patch</string>
-				<key>Enabled</key>
-				<false/>
-				<key>MaxKernel</key>
-				<string>20.99.99</string>
-				<key>MinKernel</key>
-				<string>19.0.0</string>
-				<key>BundlePath</key>
-				<string>IO80211Mojave.kext/Contents/PlugIns/AirPortBrcm4331.kext</string>
+				<string>IO80211ElCap.kext/Contents/PlugIns/AirPortBrcm4331.kext</string>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/AirPortBrcm4331</string>
 				<key>PlistPath</key>
@@ -590,42 +594,6 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>Comment</key>
-				<string>AppleBacklightFixup - Modded Nvidia GPUs</string>
-				<key>Enabled</key>
-				<false/>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string></string>
-				<key>BundlePath</key>
-				<string>AppleBacklightFixup.kext</string>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/AppleBacklightFixup</string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>Comment</key>
-				<string>NightShiftEnabler</string>
-				<key>Enabled</key>
-				<false/>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string></string>
-				<key>BundlePath</key>
-				<string>NightShiftEnabler.kext</string>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/NightShiftEnabler</string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -636,7 +604,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>15.0.0</string>
 				<key>BundlePath</key>
 				<string>CPUFriend.kext</string>
 				<key>ExecutablePath</key>
@@ -654,7 +622,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>15.0.0</string>
 				<key>BundlePath</key>
 				<string>CPUFriendDataProvider.kext</string>
 				<key>ExecutablePath</key>
@@ -680,6 +648,42 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>Disable EFI Checks</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string></string>
+				<key>BundlePath</key>
+				<string>EFICheckDisabler.kext</string>
+				<key>ExecutablePath</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>Bluetooth Patch for BRCM2046 and BRCM2070</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>21.0.0</string>
+				<key>BundlePath</key>
+				<string>Bluetooth-Spoof.kext</string>
+				<key>ExecutablePath</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
@@ -762,7 +766,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>12.0.0</string>
 				<key>BundlePath</key>
 				<string>CpuTscSync.kext</string>
 				<key>ExecutablePath</key>
@@ -780,7 +784,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>14.0.0</string>
 				<key>BundlePath</key>
 				<string>HibernationFixup.kext</string>
 				<key>ExecutablePath</key>
@@ -798,7 +802,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string></string>
+				<string>18.0.0</string>
 				<key>BundlePath</key>
 				<string>NVMeFix.kext</string>
 				<key>ExecutablePath</key>
@@ -810,17 +814,17 @@
 				<key>Arch</key>
 				<string>x86_64</string>
 				<key>Comment</key>
-				<string>SidecarFixup</string>
+				<string>FeatureUnlock</string>
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string>19.0.0</string>
+				<string>16.0.0</string>
 				<key>BundlePath</key>
-				<string>SidecarFixup.kext</string>
+				<string>FeatureUnlock.kext</string>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/SidecarFixup</string>
+				<string>Contents/MacOS/FeatureUnlock</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
@@ -938,7 +942,7 @@
 				<key>BundlePath</key>
 				<string>DebugEnhancer.kext</string>
 				<key>Comment</key>
-				<string></string>
+				<string>Enhance DEBUG output in system logs</string>
 				<key>Enabled</key>
 				<false/>
 				<key>ExecutablePath</key>
@@ -946,6 +950,114 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
+				<string>12.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>latebloom.kext</string>
+				<key>Comment</key>
+				<string>Work-around PCI race condition</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/latebloom</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>20.4.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleUSBTrackpad.kext</string>
+				<key>Comment</key>
+				<string>Fix legacy MacBook Trackpad</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBTrackpad</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>16.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>BlueToolFixup.kext</string>
+				<key>Comment</key>
+				<string>Fix Monterey Bluetooth</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/BlueToolFixup</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>21.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>CSLVFixup.kext</string>
+				<key>Comment</key>
+				<string>Fix Music</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/CSLVFixup</string>
+				<key>MaxKernel</key>
+				<string>20.99.99</string>
+				<key>MinKernel</key>
+				<string>20.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>SimpleMSR.kext</string>
+				<key>Comment</key>
+				<string>Disable firmware based battery throttling</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/SimpleMSR</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AMDGPUWakeHandler.kext</string>
+				<key>Comment</key>
+				<string>Force disable dGPU on wake</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AMDGPUWakeHandler</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
 				<string></string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
@@ -1030,6 +1142,126 @@
 				<key>Skip</key>
 				<integer>0</integer>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>_apfs_filevault_allowed</string>
+				<key>Comment</key>
+				<string>Force FileVault on Broken Seal</string>
+				<key>Count</key>
+				<integer>0</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data></data>
+				<key>Identifier</key>
+				<string>com.apple.filesystems.apfs</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>20.4.0</string>
+				<key>Replace</key>
+				<data>uAEAAADD</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>_cs_require_lv</string>
+				<key>Comment</key>
+				<string>Disable Library Validation Enforcement</string>
+				<key>Count</key>
+				<integer>0</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data></data>
+				<key>Identifier</key>
+				<string>kernel</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>20.0.0</string>
+				<key>Replace</key>
+				<data>uAAAAADD</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>_early_random</string>
+				<key>Comment</key>
+				<string>SurPlus v1 - PART 1 of 2 - Patch read_erandom (inlined in _early_random)</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>AHQjSIs=</data>
+				<key>Identifier</key>
+				<string>kernel</string>
+				<key>Limit</key>
+				<integer>800</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string>21.1.0</string>
+				<key>MinKernel</key>
+				<string>20.4.0</string>
+				<key>Replace</key>
+				<data>AOsjSIs=</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>_register_and_init_prng</string>
+				<key>Comment</key>
+				<string>SurPlus v1 - PART 2 of 2 - Patch register_and_init_prng</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>ukgBAAAx9g==</data>
+				<key>Identifier</key>
+				<string>kernel</string>
+				<key>Limit</key>
+				<integer>256</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string>21.1.0</string>
+				<key>MinKernel</key>
+				<string>20.4.0</string>
+				<key>Replace</key>
+				<data>ukgBAADrBQ==</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
 		</array>
 		<key>Quirks</key>
 		<dict>
@@ -1076,10 +1308,12 @@
 		</dict>
 		<key>Scheme</key>
 		<dict>
+			<key>CustomKernel</key>
+			<false/>
 			<key>FuzzyMatch</key>
 			<true/>
 			<key>KernelArch</key>
-			<string>x86_64</string>
+			<string>Auto</string>
 			<key>KernelCache</key>
 			<string>Auto</string>
 		</dict>
@@ -1228,11 +1462,13 @@
 			<dict>
 				<key>OCLP-Version</key>
 				<string></string>
+				<key>OCLP-Settings</key>
+				<string></string>
 			</dict>
 			<key>7C436110-AB2A-4BBB-A880-FE41995C9F82</key>
 			<dict>
 				<key>boot-args</key>
-				<string>keepsyms=1 debug=0x100 -lilubetaall</string>
+				<string>keepsyms=1 debug=0x100</string>
 				<key>csr-active-config</key>
 				<data>AAAAAA==</data>
 			</dict>
@@ -1248,12 +1484,14 @@
 			<key>4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102</key>
 			<array>
 				<string>OCLP-Version</string>
+				<string>OCLP-Settings</string>
 				<string>revcpu</string>
 				<string>revcpuname</string>
 			</array>
 			<key>7C436110-AB2A-4BBB-A880-FE41995C9F82</key>
 			<array>
 				<string>boot-args</string>
+				<string>csr-active-config</string>
 			</array>
 			<key>FA4CE28D-B62F-4C99-9CC3-6815686E30F9</key>
 			<array/>
@@ -1307,7 +1545,7 @@
 		<key>Generic</key>
 		<dict>
 			<key>AdviseFeatures</key>
-			<false/>
+			<true/>
 			<key>SystemMemoryStatus</key>
 			<string>Auto</string>
 			<key>MaxBIOSVersion</key>
@@ -1327,242 +1565,6 @@
 			<key>SystemUUID</key>
 			<string></string>
 		</dict>
-		<key>Memory</key>
-		<dict>
-			<key>DataWidth</key>
-			<integer>64</integer>
-			<key>ErrorCorrection</key>
-			<integer>3</integer>
-			<key>FormFactor</key>
-			<integer>9</integer>
-			<key>MaxCapacity</key>
-			<integer>137438953472</integer>
-			<key>TotalWidth</key>
-			<integer>64</integer>
-			<key>Type</key>
-			<integer>26</integer>
-			<key>TypeDetail</key>
-			<integer>128</integer>
-			<key>Devices</key>
-			<array>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 1</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera\GoldenGate</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA000000001</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 2</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA00000000X</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 3</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA000000002</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 4</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA00000000X</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 5</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA000000002</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 6</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA00000000X</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 7</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA000000001</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 8</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA00000000X</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 9</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA00000000X</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 10</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA00000000X</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 11</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA00000000X</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-				<dict>
-					<key>AssetTag</key>
-					<string></string>
-					<key>BankLocator</key>
-					<string></string>
-					<key>DeviceLocator</key>
-					<string>Slot 12</string>
-					<key>Manufacturer</key>
-					<string>Acidanthera</string>
-					<key>PartNumber</key>
-					<string>M00001-4GB</string>
-					<key>SerialNumber</key>
-					<string>AAA00000000X</string>
-					<key>Size</key>
-					<integer>131072</integer>
-					<key>Speed</key>
-					<integer>5733</integer>
-				</dict>
-			</array>
-		</dict>
 		<key>PlatformNVRAM</key>
 		<dict>
 			<key>BID</key>
@@ -1661,9 +1663,9 @@
 			<key>JumpstartHotPlug</key>
 			<false/>
 			<key>MinDate</key>
-			<integer>0</integer>
+			<integer>20180621</integer>
 			<key>MinVersion</key>
-			<integer>0</integer>
+			<integer>748077008000000</integer>
 		</dict>
 		<key>AppleInput</key>
 		<dict>
@@ -1675,6 +1677,8 @@
 			<integer>0</integer>
 			<key>KeySubsequentDelay</key>
 			<integer>5</integer>
+			<key>GraphicsInputMirroring</key>
+			<false/>
 			<key>PointerSpeedDiv</key>
 			<integer>1</integer>
 			<key>PointerSpeedMul</key>
@@ -1704,7 +1708,56 @@
 		<key>ConnectDrivers</key>
 		<true/>
 		<key>Drivers</key>
-		<array/>
+		<array>
+			<dict>
+				<key>Path</key>
+				<string>OpenRuntime.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+			</dict>
+			<dict>
+				<key>Path</key>
+				<string>OpenCanopy.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+			</dict>
+			<dict>
+				<key>Path</key>
+				<string>NvmExpressDxe.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+			</dict>
+			<dict>
+				<key>Path</key>
+				<string>ExFatDxeLegacy.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+			</dict>
+			<dict>
+				<key>Path</key>
+				<string>XhciDxe.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+			</dict>
+			<dict>
+				<key>Path</key>
+				<string>OpenLinuxBoot.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+			</dict>
+		</array>
 		<key>Input</key>
 		<dict>
 			<key>KeyFiltering</key>
@@ -1802,6 +1855,8 @@
 			<false/>
 			<key>ExitBootServicesDelay</key>
 			<integer>0</integer>
+			<key>ForceOcWriteFlash</key>
+			<false/>
 			<key>ForgeUefiSupport</key>
 			<false/>
 			<key>IgnoreInvalidFlexRatio</key>
--- a/payloads/Kexts/Acidanthera/AppleALC-v1.6.2.zip
+++ b/payloads/Kexts/Acidanthera/AppleALC-v1.6.2.zip
--- a/payloads/Kexts/Acidanthera/AppleALC-v1.6.3.zip
+++ b/payloads/Kexts/Acidanthera/AppleALC-v1.6.3.zip
--- a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.0.zip
+++ b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.0.zip
--- a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip
+++ b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip
--- a/payloads/Kexts/Acidanthera/BlueToolFixup.patch
+++ b/payloads/Kexts/Acidanthera/BlueToolFixup.patch
@@ -0,0 +1,56 @@
+diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp
+index 0fa891a..18e4b74 100644
+--- a/BrcmPatchRAM/BlueToolFixup.cpp
+++ b/BrcmPatchRAM/BlueToolFixup.cpp
+@@ -37,8 +37,10 @@ bool BlueToolFixup::start(IOService *provider) {
+     }
+     setProperty("VersionInfo", kextVersion);
+     setName("bluetooth");
+    /*
+     uint8_t bytes[] {0x00, 0x00, 0x00, 0x00};
+     setProperty("transport-encoding", bytes, sizeof(bytes));
+     */
+     registerService();
+     
+     return true;
+@@ -50,7 +52,22 @@ bool BlueToolFixup::start(IOService *provider) {
+ static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate";
+ static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi";
+ 
+static const uint8_t kVendorCheckOriginal[] =
+ {
+     0x74, 0x08,     // jz short 08
+     0x81, 0xFA,     // cmp edx
+     0x12, 0x0A, 0x00, 0x00  // Vendor CSR
+ };
+
+ static const uint8_t kVendorCheckPatched[] =
+ {
+     0xEB, 0x08,     // jmp short 08
+     0x81, 0xFA,     // cmp edx
+     0x12, 0x0A, 0x00, 0x00  // Vendor CSR
+ };
+
+ static const char *blueToolPath = "/usr/sbin/BlueTool";
+static const char *bluetoothdPath = "/usr/sbin/bluetoothd";
+ 
+ static mach_vm_address_t orig_cs_validate {};
+ 
+@@ -71,9 +88,14 @@ static void patched_cs_validate_page(vnode_t vp, memory_object_t pager, memory_o
+     char path[PATH_MAX];
+     int pathlen = PATH_MAX;
+     FunctionCast(patched_cs_validate_page, orig_cs_validate)(vp, pager, page_offset, data, validated_p, tainted_p, nx_p);
+-    if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, blueToolPath) == 0)) {
+-        searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched);
+-    }
+    if (vn_getpath(vp, path, &pathlen) == 0) {
+         if (UNLIKELY(strcmp(path, blueToolPath) == 0)) {
+             searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched);
+         }
+         if (UNLIKELY(strcmp(path, bluetoothdPath) == 0)) {
+             searchAndPatch(data, PAGE_SIZE, path, kVendorCheckOriginal, kVendorCheckPatched);
+         }
+     }
+ }
+ 
+ 
--- a/payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1.zip
+++ b/payloads/Kexts/Acidanthera/CSLVFixup-v2.6.1.zip
--- a/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.3.zip
+++ b/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.3.zip
--- a/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4.zip
+++ b/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.4.zip
--- a/payloads/Kexts/Acidanthera/EFICheckDisabler-v1.0.5.zip
+++ b/payloads/Kexts/Acidanthera/EFICheckDisabler-v1.0.5.zip
--- a/payloads/Kexts/Acidanthera/EFICheckDisabler.md
+++ b/payloads/Kexts/Acidanthera/EFICheckDisabler.md
@@ -0,0 +1 @@
+Based off RestrictEvents.kext, stripped binary to block Apple's EFICheck driver
--- a/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3.zip
+++ b/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3.zip
--- a/payloads/Kexts/Acidanthera/Lilu-v1.5.4.zip
+++ b/payloads/Kexts/Acidanthera/Lilu-v1.5.4.zip
--- a/payloads/Kexts/Acidanthera/Lilu-v1.5.6.zip
+++ b/payloads/Kexts/Acidanthera/Lilu-v1.5.6.zip
--- a/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.3.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.3.zip
--- a/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.5.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.5.zip
--- a/payloads/Kexts/Acidanthera/RestrictEvents-MBP91.patch
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-MBP91.patch
@@ -1,21 +1,12 @@
-From 772e02b375b5b2186342965f3089d9d1bca053bf Mon Sep 17 00:00:00 2001
-From: Dhinak G <17605561+dhinakg@users.noreply.github.com>
-Date: Tue, 23 Mar 2021 17:21:48 -0400
-Subject: [PATCH] Disable displaypolicyd
-
---
- RestrictEvents/RestrictEvents.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/RestrictEvents/RestrictEvents.cpp b/RestrictEvents/RestrictEvents.cpp
-index 69b6af8..029417c 100644
+index 27562f0..66365a3 100644
 --- a/RestrictEvents/RestrictEvents.cpp
 +++ b/RestrictEvents/RestrictEvents.cpp
-@@ -35,6 +35,7 @@ struct RestrictEventsPolicy {
+@@ -61,6 +61,7 @@ struct RestrictEventsPolicy {
+ 		static const char *procBlacklist[] {
 			"/System/Library/CoreServices/ExpansionSlotNotification",
 			"/System/Library/CoreServices/MemorySlotNotification",
- 			"/usr/libexec/firmwarecheckers/eficheck/eficheck",
-+			"/usr/libexec/displaypolicyd"
+			"/usr/libexec/displaypolicyd",
 		};
 
- 		char pathbuf[MAXPATHLEN];
+ 		char pathbuf[MAXPATHLEN];
--- a/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.3.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.3.zip
--- a/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.5.zip
--- a/payloads/Kexts/Acidanthera/SidecarFixup-v1.0.2.zip
+++ b/payloads/Kexts/Acidanthera/SidecarFixup-v1.0.2.zip
--- a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.1.zip
+++ b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.1.zip
--- a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.3.zip
+++ b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.3.zip
--- a/payloads/Kexts/Ethernet/CatalinaBCM5701Ethernet-v1.0.2.zip
+++ b/payloads/Kexts/Ethernet/CatalinaBCM5701Ethernet-v1.0.2.zip
--- a/payloads/Kexts/Ethernet/MarvelYukonEthernet-v1.0.1.zip
+++ b/payloads/Kexts/Ethernet/MarvelYukonEthernet-v1.0.1.zip
--- a/payloads/Kexts/Ethernet/nForceEthernet-v1.0.1.zip
+++ b/payloads/Kexts/Ethernet/nForceEthernet-v1.0.1.zip
--- a/payloads/Kexts/FireWire/IOFireWireFamily-v1.0.1.zip
+++ b/payloads/Kexts/FireWire/IOFireWireFamily-v1.0.1.zip
--- a/payloads/Kexts/FireWire/IOFireWireSBP2-v1.0.1.zip
+++ b/payloads/Kexts/FireWire/IOFireWireSBP2-v1.0.1.zip
--- a/payloads/Kexts/FireWire/IOFireWireSerialBusProtocolTransport-v1.0.1.zip
+++ b/payloads/Kexts/FireWire/IOFireWireSerialBusProtocolTransport-v1.0.1.zip
--- a/payloads/Kexts/Misc/AMDGPUWakeHandler-v1.0.0.zip
+++ b/payloads/Kexts/Misc/AMDGPUWakeHandler-v1.0.0.zip
--- a/payloads/Kexts/Misc/AppleIntelPIIXATA-v1.0.1.zip
+++ b/payloads/Kexts/Misc/AppleIntelPIIXATA-v1.0.1.zip
--- a/payloads/Kexts/Misc/AppleUSBTrackpad-v1.0.1.zip
+++ b/payloads/Kexts/Misc/AppleUSBTrackpad-v1.0.1.zip
--- a/payloads/Kexts/Misc/BacklightInjector-v1.0.0.zip
+++ b/payloads/Kexts/Misc/BacklightInjector-v1.0.0.zip
--- a/payloads/Kexts/Misc/BacklightInjector-v1.1.0.zip
+++ b/payloads/Kexts/Misc/BacklightInjector-v1.1.0.zip
--- a/payloads/Kexts/Misc/Bluetooth-Spoof-v1.0.0.zip
+++ b/payloads/Kexts/Misc/Bluetooth-Spoof-v1.0.0.zip
--- a/payloads/Kexts/Misc/NightShiftEnabler-v1.1.0.zip
+++ b/payloads/Kexts/Misc/NightShiftEnabler-v1.1.0.zip
--- a/payloads/Kexts/Misc/SimpleMSR-v1.0.0.zip
+++ b/payloads/Kexts/Misc/SimpleMSR-v1.0.0.zip
--- a/payloads/Kexts/Misc/latebloom-v0.22.zip
+++ b/payloads/Kexts/Misc/latebloom-v0.22.zip
--- a/payloads/Kexts/Plists/AppleUSBMaps/Info.plist
+++ b/payloads/Kexts/Plists/AppleUSBMaps/Info.plist
@@ -764,7 +764,7 @@
 			<key>model</key>
 			<string>XXerve3,1</string>
 		</dict>
-		<key>#iMac7,1</key>
+		<key>iMac7,1</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
@@ -3527,14 +3527,14 @@
 			<key>Tunnel Endpoint Device Vendor ID</key>
 			<data>AQAAAA==</data>
 		</dict>
-		<key>#iMac7,1-EHC1</key>
+		<key>iMac7,1-EHC1</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
 			<key>IOClass</key>
 			<string>AppleUSBHostMergeProperties</string>
 			<key>IONameMatch</key>
-			<string>EH01</string>
+			<string>EHC1</string>
 			<key>IOProviderClass</key>
 			<string>AppleUSBEHCIPCI</string>
 			<key>IOProviderMergeProperties</key>
@@ -3590,14 +3590,14 @@
 			<key>model</key>
 			<string>iXac7,1</string>
 		</dict>
-		<key>#iMac7,1-EHC2</key>
+		<key>iMac7,1-EHC2</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
 			<key>IOClass</key>
 			<string>AppleUSBHostMergeProperties</string>
 			<key>IONameMatch</key>
-			<string>EH02</string>
+			<string>EHC2</string>
 			<key>IOProviderClass</key>
 			<string>AppleUSBEHCIPCI</string>
 			<key>IOProviderMergeProperties</key>
@@ -5461,7 +5461,7 @@
 			<key>model</key>
 			<string>Xacmini4,1</string>
 		</dict>
-		<key>#iMac7,1-OHC1</key>
+		<key>iMac7,1-OHC1</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
@@ -5501,9 +5501,9 @@
 				</dict>
 			</dict>
 			<key>model</key>
-			<string>iXac9,1</string>
+			<string>iXac7,1</string>
 		</dict>
-		<key>#iMac7,1-OHC2</key>
+		<key>iMac7,1-OHC2</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
@@ -5543,7 +5543,7 @@
 				</dict>
 			</dict>
 			<key>model</key>
-			<string>iXac9,1</string>
+			<string>iXac7,1</string>
 		</dict>
 		<key>iMac8,1-OHC1</key>
 		<dict>
--- a/payloads/Kexts/Wifi/IO80211ElCap-v1.0.0.zip
+++ b/payloads/Kexts/Wifi/IO80211ElCap-v1.0.0.zip
--- a/payloads/Kexts/Wifi/IO80211ElCap-v2.0.0.zip
+++ b/payloads/Kexts/Wifi/IO80211ElCap-v2.0.0.zip
--- a/payloads/Kexts/Wifi/IO80211HighSierra-v1.0.1.zip
+++ b/payloads/Kexts/Wifi/IO80211HighSierra-v1.0.1.zip
--- a/payloads/Kexts/Wifi/IO80211Mojave-v1.0.1.zip
+++ b/payloads/Kexts/Wifi/IO80211Mojave-v1.0.1.zip
--- a/payloads/Kexts/Wifi/corecaptureElCap-v1.0.1.zip
+++ b/payloads/Kexts/Wifi/corecaptureElCap-v1.0.1.zip
--- a/payloads/OC-Patcher.icns
+++ b/payloads/OC-Patcher.icns
--- a/payloads/OpenCore/OpenCore-DEBUG.zip
+++ b/payloads/OpenCore/OpenCore-DEBUG.zip
--- a/payloads/OpenCore/OpenCore-RELEASE.zip
+++ b/payloads/OpenCore/OpenCore-RELEASE.zip
--- a/payloads/OpenCore/clean.py
+++ b/payloads/OpenCore/clean.py
@@ -5,12 +5,10 @@
 # - Place the X64 folder in the /payloads/OpenCore folder
 # - Rename to OpenCore-VERSION (ie. DEBUG or RELEASE)
 # - Run script
-# - Rename folders to appropriate versions (ie. OpenCore-v0.6.8)
+# - Rename folders to appropriate versions (ie. OpenCore-Build)
 # - Zip folders
 # TODO:
-# - Import OC version from Constants.py
 # - Download latest builds from dortania.github.io
-# - Automatically rename and zip folders
 from __future__ import print_function

 import subprocess
@@ -46,6 +44,7 @@ bad_tools = [
    "ResetSystem.efi",
    "RtcRw.efi",
    "CsrUtil.efi",
+    "TpmInfo.efi",
 ]

 for version in build_types:
@@ -67,9 +66,8 @@ for version in build_types:
            subprocess.run(f"rm ./OpenCore-{version}/EFI/OC/Tools/{delete_tools}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
        else:
            print(f"- Unable to find {delete_tools}, skipping")
-    
-    
-
-
-    

+    print("- Renaming folder to OpenCore-Build and zipping")
+    subprocess.run(f"mv ./OpenCore-{version} ./OpenCore-Build".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+    subprocess.run(f"zip -r ./OpenCore-{version}.zip ./OpenCore-Build".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+    subprocess.run(f"rm -rf ./OpenCore-Build".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
--- a/payloads/Tools/ocvalidate
+++ b/payloads/Tools/ocvalidate
--- a/payloads/entitlements.plist
+++ b/payloads/entitlements.plist
--- a/payloads/launcher.sh
+++ b/payloads/launcher.sh
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 requests
+pyobjc
--- a/resources/init.py
+++ b/resources/init.py
--- a/resources/arguments.py
+++ b/resources/arguments.py
@@ -0,0 +1,107 @@
+import sys
+from resources import defaults, build, utilities, validation, sys_patch
+from data import model_array
+
+# Generic building args
+class arguments:
+    def __init__(self):
+        self.args = utilities.check_cli_args()
+
+    def parse_arguments(self, settings):
+        if self.args.model:
+            if self.args.model:
+                print(f"- Using custom model: {self.args.model}")
+                settings.custom_model = self.args.model
+                defaults.generate_defaults.probe(settings.custom_model, False, settings)
+            elif settings.computer.real_model not in model_array.SupportedSMBIOS and settings.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: {settings.computer.real_model}")
+                defaults.generate_defaults.probe(settings.custom_model, True, settings)
+
+        if self.args.disk:
+            print(f"- Install Disk set: {self.args.disk}")
+            settings.disk = self.args.disk
+        if self.args.validate:
+            validation.validate(settings)
+        if self.args.verbose:
+            print("- Set verbose configuration")
+            settings.verbose_debug = True
+        else:
+            settings.verbose_debug = False  # Override Defaults detected
+        if self.args.debug_oc:
+            print("- Set OpenCore DEBUG configuration")
+            settings.opencore_debug = True
+            settings.opencore_build = "DEBUG"
+        if self.args.debug_kext:
+            print("- Set kext DEBUG configuration")
+            settings.kext_debug = True
+        if self.args.hide_picker:
+            print("- Set HidePicker configuration")
+            settings.showpicker = False
+        if self.args.disable_sip:
+            print("- Set Disable SIP configuration")
+            settings.sip_status = False
+        else:
+            settings.sip_status = True  # Override Defaults detected
+        if self.args.disable_smb:
+            print("- Set Disable SecureBootModel configuration")
+            settings.secure_status = False
+        else:
+            settings.secure_status = True  # Override Defaults detected
+        if self.args.vault:
+            print("- Set Vault configuration")
+            settings.vault = True
+        if self.args.firewire:
+            print("- Set FireWire Boot configuration")
+            settings.firewire_boot = True
+        if self.args.nvme:
+            print("- Set NVMe Boot configuration")
+            settings.nvme_boot = True
+        # if self.args.disable_amfi:
+        #     print("- Set Disable AMFI configuration")
+        #     settings.amfi_status = False
+        if self.args.wlan:
+            print("- Set Wake on WLAN configuration")
+            settings.enable_wake_on_wlan = True
+        if self.args.disable_tb:
+            print("- Set Disable Thunderbolt configuration")
+            settings.disable_tb = True
+        if self.args.force_surplus:
+            print("- Forcing SurPlus override configuration")
+            settings.force_surplus = True
+        if self.args.moderate_smbios:
+            print("- Set Moderate SMBIOS Patching configuration")
+            settings.serial_settings = "Moderate"
+        if self.args.smbios_spoof:
+            if self.args.smbios_spoof == "Minimal":
+                settings.serial_settings = "Minimal"
+            elif self.args.smbios_spoof == "Moderate":
+                settings.serial_settings = "Moderate"
+            elif self.args.smbios_spoof == "Advanced":
+                settings.serial_settings = "Advanced"
+            else:
+                print(f"- Unknown SMBIOS arg passed: {self.args.smbios_spoof}")
+
+        if self.args.support_all:
+            print("- Building for natively supported model")
+            settings.allow_oc_everywhere = True
+            settings.serial_settings = "None"
+
+        # Avoid running the root patcher if we're just building
+        if self.args.build:
+            build.BuildOpenCore(settings.custom_model or settings.computer.real_model, settings).build_opencore()
+        elif self.args.patch_sys_vol:
+            if self.args.moj_cat_accel:
+                print("- Set Mojave/Catalina root patch configuration")
+                settings.moj_cat_accel = True
+            print("- Set System Volume patching")
+            sys_patch.PatchSysVolume(settings.custom_model or settings.computer.real_model, settings).start_patch()
+        elif self.args.unpatch_sys_vol:
+            print("- Set System Volume unpatching")
+            sys_patch.PatchSysVolume(settings.custom_model or settings.computer.real_model, settings).start_unpatch()
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Based off RestrictEvents.kext, stripped binary to block Apple's EFICheck driver`