Fix formatting

Fix Windows scanning in OpenCore menu
Merge branch 'main' of https://github.com/dortania/Opencore-Legacy-Patcher
2026-04-15 21:28:55 +10:00 · 2021-07-11 12:28:52 -06:00 · 2021-07-11 12:25:02 -06:00 · 2021-07-11 10:27:38 -06:00 · 2021-07-10 01:38:41 -04:00 · 2021-07-09 13:29:52 -06:00
84 changed files with 8106 additions and 2346 deletions
--- a/.flake8
+++ b/.flake8
@@ -1,4 +1,4 @@
 [flake8]
-ignore = E501
+extend-ignore = E501, E203
 per-file-ignores =
    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:
+        - 0.2.3 (Latest Build)
+        - 0.2.2 (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.yml
+++ b/.github/workflows/build-app.yml
@@ -1,4 +1,4 @@
-name: CI - Build App
+name: CI - Build TUI

 on:
  push:
@@ -8,33 +8,30 @@ on:

 jobs:
  build:
-    name: Build App
+    name: Build TUI
    runs-on: self-hosted
    steps:
      - uses: actions/checkout@v2

-      # - name: Install Python Dependencies
-      #   run: |
-      #     python3 -m pip install -U pip
-      #     pip3 install pyinstaller
+      - name: Install Python Dependencies
+        run: pip3 install --upgrade pyinstaller requests pyobjc

      - run: pyinstaller OpenCore-Patcher.spec
      - run: ./after_pyinstaller.sh
      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --deep --timestamp --entitlements entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
-
-      - run: cd dist; zip ../OpenCore-Patcher.zip OpenCore-Patcher; zip -r ../OpenCore-Patcher.app.zip OpenCore-Patcher.app
-      - run: ./../sign-app.sh
+      - 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,29 +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
-      - 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,50 @@
+name: CI - Build GUI
+
+on:
+  push:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Build GUI
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Python Dependencies
+        run: pip3 install --upgrade pyinstaller requests pyobjc
+
+      - run: pyinstaller OCLP-CLI.spec
+      - run: cd dist; cp OCLP-CLI ../; cd ..
+      - run: zip OCLP-CLI.zip OCLP-CLI
+      - name: Download latest nightly OCLP-GUI
+        run: curl -S -L https://nightly.link/dortania/OCLP-GUI/workflows/build-app/master/OpenCore-Patcher-GUI.app.zip --output ./OpenCore-Patcher-GUI.app.zip
+      - run: unzip -o OpenCore-Patcher-GUI.app.zip
+      - run: unzip OpenCore-Patcher-GUI.app.zip; rm OpenCore-Patcher-GUI.app.zip
+      - name: Merge new GUI
+        run: cp OCLP-CLI OpenCore\ Patcher.app/Contents/Resources/
+      - run: python3 merge_gui.py
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements entitlements.plist -o runtime "OpenCore Patcher.app/Contents/Resources/OCLP-CLI"'
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements entitlements.plist -o runtime "OpenCore Patcher.app/Contents/Resources/oclpd"'
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --force --deep --timestamp --entitlements entitlements.plist -o runtime "OpenCore Patcher.app"'
+      - run: ditto -c -k --sequesterRsrc --keepParent OpenCore\ Patcher.app OpenCore-Patcher-GUI.app.zip
+      - run: ./../sign-gui.sh
+      - name: Upload GUI to Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: OpenCore-Patcher-GUI.app
+          path: OpenCore-Patcher-GUI.app.zip
+      - name: Upload CLI to Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: OCLP-CLI
+          path: OCLP-CLI.zip
+      - name: Upload to Release
+        if: github.event_name == 'release'
+        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: OpenCore-Patcher-GUI.app.zip
+          tag: ${{ github.ref }}
+          file_glob: true
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 OCLP-GUI.command
 /payloads/Apple
+/payloads/Apple.zip
 /payloads/__MACOSX
 /App
 /Build-Folder
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,107 @@
 # OpenCore Legacy Patcher changelog

+## 0.2.3
+
+- Fix more IORegistry issues
+- Implement OpenCore GUI
+- Ensure symlinks are preserved
+- Enable TeraScale 2 patches by default on all models
+- Fix NightShift support for macOS Monterey
+- Add UniversalControl support
+  - Currently not enabled by Apple in macOS Monterey Beta 2/iOS 15 Beta 2
+- Add optional Wake in WLAN setting
+  - Note: enabling may create network instability
+- Increment Binaries
+  - OpenCore 0.7.1 release (07-05-2021)
+  - FeatureUnlock 1.0.3 rolling (07-07-2021)
+    - Previously known as SidecarFixup
+  - Lilu 1.5.4 release (07-05-2021)
+  - AppleALC 1.6.2 release
+  - WhateverGreen 1.6.2 release
+  - PatcherSupportPkg 0.0.13 release
+- Fix Intel HD4000 DRM Support in macOS Monterey (thanks EduCovas!)
+- Support optionally re-enabling iGPU in iMac14,x with dGPUs
+- Fix Windows scanning in OpenCore menu when Windows and macOS are stored on the same ESP
+
+## 0.2.2
+
+- Fix IORegistry issue
+- Fix Root Patch Failure on Nvidia Tesla GPUs
+
+## 0.2.1
+
+- Fix NVMe Crash on build
+
+## 0.2.0
+
+- Refactor device probe logic
+- Implement PatcherSupportPkg v0.0.10
+  - Reduces binary sizes depending on OS
+  - Deprecates Apple-Binaries-OCLP
+- Fix full screen and Airplay to Mac support for Intel HD4000 iGPUs in Monterey
+- Automatically set `CMIO_Unit_Input_ASC.DoNotUseOpenCL` on TeraScale 2 GPUs
+- Fix Country Code detection on Wireless Cards
+- Add Windows detection and prompt during installation
+- Fix Google Fonts rendering for Intel HD4000 iGPUs in Monterey
+- Increment Binaries
+  - Lilu 1.5.4 rolling (f69a972 - 06-20-2021)
+  - RestrictEvents 1.0.3 rolling (3773ce2 - 06-20-2021)
+  - SidecarFixup 1.0.2 rolling (2c29166 - 06-21-2021)
+- Allow AirPlay to Mac support on Skylake - Coffeelake Macs
+
+## 0.1.9
+
+- Fix incorrect AMFI and SIP detection
+
+## 0.1.8
+
+- Fix Kernel Panic in Big Sur and Monterey
+- Increment binaries:
+  - Lilu (1.5.4 rolling - 06-15-2021)
+
+## 0.1.7
+
+- Add FireWire Boot Support for Catalina and newer
+- Add NVMe firmware support for older models (ie. MacPro3,1)
+  - OpenCore must be stored on a bootable volume (ie. USB or SATA)
+- Fix Thunderbolt Ethernet support on MacBookAir4,x
+- Fix XHCI hangs on pre-2012 Machines
+  - XHCI boot support dropped due to instability
+- Add beta macOS Monterey Support
+  - Fix iMac13,x sleep support
+  - Add support for following models:
+    - iMac14,4
+    - iMac15,1
+    - MacBook8,1
+    - MacBookAir6,1
+    - MacBookAir6,2
+    - MacBookPro11,1
+    - MacBookPro11,2
+    - MacBookPro11,3
+- Increment binaries:
+  - OpenCore (0.7.0 release - 06-07-2021)
+  - AirportBrcmFixup (2.1.3 rolling - 06-08-2021)
+  - AppleALC (1.6.2 rolling - 06-08-2021)
+  - CPUFriend (1.2.4 rolling - 06-08-2021)
+  - Lilu (1.5.4 rolling - 06-11-2021)
+  - NVMeFix (1.0.9 rolling - 06-12-2021)
+  - WhateverGreen (1.5.1 rolling - 06-08-2021)
+  - RestrictEvents (1.0.3 rolling - 06-11-2021)
+  - Apple Binaries (0.0.18 release - 06-12-2021)
+  - MouSSE (0.95 release - 06-08-2021)
+  - SidecarFixup (1.0.2 rolling - 06-11-2021)
+- Fix SSE4,2 Emulation
+- Fix Sidecar and CPU renaming support in macOS Monterey
+- Add AirPlay support to older Models
+- Add Intel HD4000 Acceleration
+  - Big thanks to Jackluke, EduCovas, DhinakG, MykolaG!
+- Add DebugEnhancer for better macOS Monterey logs
+  - DebugEnhancer (1.0.3 rolling - 06-08-2021)
+- Add TeraScale 2 Graphics Acceleration to Big Sur
+  - User configurable, those prone to seizures are recommended to avoid or have another setup the machine due to initial colour strobing before forcing Million Colours on the display with SwitchResX or ResXtreme
+
 ## 0.1.6
+
 - Add XHCI UEFI Driver for 3rd Party USB 3.0 Controllers
  - Allows for Boot Support from OpenCore' Picker
 - Fix UEFI output on MacPro3,1 with PC GPUs
@@ -17,6 +118,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
@@ -32,9 +134,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)
@@ -53,6 +157,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
@@ -78,6 +183,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
@@ -97,9 +203,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
@@ -120,6 +228,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
@@ -128,11 +237,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)
@@ -148,6 +259,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+)
@@ -166,6 +278,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
@@ -176,12 +289,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
@@ -197,12 +312,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
@@ -211,70 +328,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
@@ -9,79 +9,58 @@ import platform
 import argparse
 from pathlib import Path

-from Resources import Build, ModelArray, PCIIDArray, Constants, SysPatch, DeviceProbe
+from Resources import Build, ModelArray, Constants, SysPatch, device_probe, Utilities


-class OpenCoreLegacyPatcher():
+class OpenCoreLegacyPatcher:
    def __init__(self):
+        print("Loading...")
+        Utilities.disable_cls()
        self.constants = Constants.Constants()
-        self.current_model: str = None
-        opencore_model: str = subprocess.run("nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:oem-product".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-        if not opencore_model.startswith("nvram: Error getting variable"):
-            opencore_model = [line.strip().split(":oem-product	", 1)[1] for line in opencore_model.split("\n") if line.strip().startswith("4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:")][0]
-            self.current_model = opencore_model
-        else:
-            self.current_model = subprocess.run("system_profiler SPHardwareDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            self.current_model = [line.strip().split(": ", 1)[1] for line in self.current_model.stdout.decode().split("\n") if line.strip().startswith("Model Identifier")][0]
+        self.constants.computer = device_probe.Computer.probe()
+        self.computer = self.constants.computer
        self.constants.detected_os = int(platform.uname().release.partition(".")[0])
-        if self.current_model in ModelArray.NoAPFSsupport:
-            self.constants.serial_settings = "Moderate"
-        if self.current_model in ModelArray.LegacyGPU:
-            dgpu_vendor,dgpu_device,dgpu_acpi = DeviceProbe.pci_probe().gpu_probe("GFX0")
-            if dgpu_vendor:
-                if (dgpu_vendor == self.constants.pci_amd_ati and (dgpu_device in PCIIDArray.amd_ids().polaris_ids or dgpu_device in PCIIDArray.amd_ids().vega_ids or dgpu_device in PCIIDArray.amd_ids().navi_ids or dgpu_device in PCIIDArray.amd_ids().legacy_gcn_ids)) or (dgpu_vendor == self.constants.pci_nvidia and dgpu_device in PCIIDArray.nvidia_ids().kepler_ids):
-                    self.constants.sip_status = True
-                    self.constants.secure_status = True
-                else:
-                    self.constants.sip_status = False
-                    self.constants.secure_status = False

-        # Logic for when user runs custom OpenCore build and do not expose it
-        # Note: This logic currently only applies for iMacPro1,1 users, see below threads on the culprits:
-        # - https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/post-17425857
-        # - https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/
-        # PLEASE FOR THE LOVE OF GOD JUST SET ExposeSensitiveData CORRECTLY!!!
-        if self.current_model == "iMacPro1,1":
-            serial: str = subprocess.run("system_profiler SPHardwareDataType | grep Serial".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-            serial = [line.strip().split("Number (system): ", 1)[1] for line in serial.split("\n") if line.strip().startswith("Serial")][0]
-            true_model = subprocess.run([str(self.constants.macserial_path), "--info", str(serial)], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            true_model = [i.partition(" - ")[2] for i in true_model.stdout.decode().split("\n") if "Model: " in i][0]
-            print(f"True Model: {true_model}")
-            if not true_model.startswith("Unknown"):
-                self.current_model = true_model
+        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]

-        custom_cpu_model_value: str = subprocess.run("nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:revcpuname".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-
-        if not custom_cpu_model_value.startswith("nvram: Error getting variable"):
-            custom_cpu_model_value = [line.strip().split(":revcpuname	", 1)[1] for line in custom_cpu_model_value.split("\n") if line.strip().startswith("4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:")][0]
-            if custom_cpu_model_value.split("%00")[0] != "":
-                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('--force_legacy', help='Allow acceleration on Mac Pros and Xserves', action='store_true', required=False)
+        parser.add_argument("--build", help="Build OpenCore", action="store_true", required=False)
+        parser.add_argument("--verbose", help="Enable verbose boot", action="store_true", required=False)
+        parser.add_argument("--debug_oc", help="Enable OpenCore DEBUG", action="store_true", required=False)
+        parser.add_argument("--debug_kext", help="Enable kext DEBUG", action="store_true", required=False)
+        parser.add_argument("--hide_picker", help="Hide OpenCore picker", action="store_true", required=False)
+        parser.add_argument("--disable_sip", help="Disable SIP", action="store_true", required=False)
+        parser.add_argument("--disable_smb", help="Disable SecureBootModel", action="store_true", required=False)
+        parser.add_argument("--vault", help="Enable OpenCore Vaulting", action="store_true", required=False)
+        parser.add_argument("--support_all", help="Allow OpenCore on natively supported Models", action="store_true", required=False)
+        parser.add_argument("--firewire", help="Enable FireWire Booting", action="store_true", required=False)
+        parser.add_argument("--nvme", help="Enable NVMe Booting", action="store_true", required=False)
+        parser.add_argument("--wlan", help="Enable Wake on WLAN support", action="store_true", required=False)
+        parser.add_argument("--disable_amfi", help="Disable AMFI", action="store_true", required=False)
+        parser.add_argument("--moderate_smbios", help="Moderate SMBIOS Patching", action="store_true", required=False)

        # 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)
+        parser.add_argument("--model", action="store", help="Set custom model", required=False)
+        parser.add_argument("--disk", action="store", help="Specifies disk to install to", required=False)
+        parser.add_argument("--smbios_spoof", action="store", help="Set SMBIOS patching mode", required=False)

        # SysPatch args
-        parser.add_argument('--patch_sys_vol', help='Patches root volume', action='store_true', required=False)
-        parser.add_argument('--unpatch_sys_vol', help='Unpatches root volume, EXPERIMENTAL', action='store_true', required=False)
+        parser.add_argument("--patch_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)
+        #parser.add_argument("--patch_disk", action="store", help="Specifies disk to root patch", required=False)

        args = parser.parse_args()

@@ -94,6 +73,12 @@ class OpenCoreLegacyPatcher():
        else:
            print("- Using default payloads location")

+        if args.disk:
+            print(f"- Install Disk set: {args.disk}")
+            self.constants.disk = args.disk
+        #if args.patch_disk:
+        #    print(f"- Patch Disk set: {args.patch_disk}")
+        #    self.constants.patch_disk = args.patch_disk
        if args.verbose:
            print("- Set verbose configuration")
            self.constants.verbose_debug = True
@@ -104,9 +89,6 @@ class OpenCoreLegacyPatcher():
        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
@@ -119,19 +101,21 @@ class OpenCoreLegacyPatcher():
        if args.vault:
            print("- Set Vault configuration")
            self.constants.vault = 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.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.wlan:
+            print("- Set Wake on WLAN configuration")
+            self.constants.enable_wake_on_wlan = True
+        if args.moderate_smbios:
+            print("- Set Moderate SMBIOS Patching configuration")
+            self.constants.serial_settings = "Moderate"
        if args.smbios_spoof:
            if args.smbios_spoof == "Minimal":
                self.constants.serial_settings = "Minimal"
@@ -147,38 +131,83 @@ class OpenCoreLegacyPatcher():
            self.constants.allow_oc_everywhere = True
            self.constants.serial_settings = "None"

-        if args.force_legacy:
-            print("- Allowing legacy acceleration patches on newer models")
-            self.constants.assume_legacy = True
-
        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.current_model}")
+                print(f"- Using detected model: {self.constants.computer.real_model}")
+                self.set_defaults(self.constants.custom_model, True)
                self.build_opencore()
        if args.patch_sys_vol:
+            if args.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):
+        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,
+                ]
+            ):
+                print("- Detected Metal GPU, overriding default configuration")
+                # 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
+            elif host_is_target:
+                 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
+                print("- Detected Metal dGPU, overriding default configuration")
+                self.constants.sip_status = True
+            elif host_is_target:
+                 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" and host_is_target:
+             # 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.current_model, self.constants).start_patch()
+        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.current_model, self.constants).start_unpatch()
+        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.current_model, self.constants).build_opencore()
+        Build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).build_opencore()

    def install_opencore(self):
-        Build.BuildOpenCore(self.constants.custom_model or self.current_model, self.constants).copy_efi()
+        Build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).copy_efi()
+

 OpenCoreLegacyPatcher()

 # Example arg for OCLP command line
-# ./OCLP-CLI --build --verbose --debug_oc --debug_kext --model iMac11,2
+# ./OCLP-CLI --build --verbose --debug_oc --debug_kext --model iMac11,2
--- a/OCLP-CLI.spec
+++ b/OCLP-CLI.spec
@@ -6,8 +6,9 @@ block_cipher = None


 a = Analysis(['OCLP-CLI.command'],
+             pathex=['Resources'],
             binaries=[],
-             datas=[('payloads', 'payloads'), ('Resources', 'Resources')],
+             datas=[('payloads', 'payloads')],
             hiddenimports=[],
             hookspath=[],
             runtime_hooks=[],
@@ -23,7 +24,7 @@ exe = EXE(pyz,
          a.binaries,
          a.zipfiles,
          a.datas,
-          [],
+          [('u', None, 'OPTION')],
          name='OCLP-CLI',
          debug=False,
          bootloader_ignore_signals=False,
--- a/OpenCore-Patcher.command
+++ b/OpenCore-Patcher.command
@@ -3,106 +3,130 @@

 from __future__ import print_function

-import plistlib
+import platform
 import subprocess
 import sys
-import platform

-from Resources import Build, ModelArray, PCIIDArray, Constants, SysPatch, Utilities, CliMenu, DeviceProbe
+from Resources import Build, CliMenu, Constants, ModelArray, SysPatch, Utilities, device_probe


-class OpenCoreLegacyPatcher():
+class OpenCoreLegacyPatcher:
    def __init__(self):
+        print("Loading...")
        self.constants = Constants.Constants()
-        self.current_model: str = None
-        self.current_model = DeviceProbe.smbios_probe().model_detect(False)
+        self.constants.computer = device_probe.Computer.probe()
+        self.computer = self.constants.computer
        self.constants.detected_os = int(platform.uname().release.partition(".")[0])
-        if self.current_model in ModelArray.LegacyGPU:
-            dgpu_vendor,dgpu_device,dgpu_acpi = DeviceProbe.pci_probe().gpu_probe("GFX0")
+        self.set_defaults(self.computer.real_model, True)

-            if (dgpu_vendor == self.constants.pci_amd_ati and (dgpu_device in PCIIDArray.amd_ids().polaris_ids or dgpu_device in PCIIDArray.amd_ids().vega_ids or dgpu_device in PCIIDArray.amd_ids().navi_ids or dgpu_device in PCIIDArray.amd_ids().legacy_gcn_ids)) or (dgpu_vendor == self.constants.pci_nvidia and dgpu_device in PCIIDArray.nvidia_ids().kepler_ids):
-                self.constants.sip_status = True
-                self.constants.secure_status = True
-            else:
-                self.constants.sip_status = False
-                self.constants.secure_status = False
+        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]

-        # Logic for when user runs custom OpenCore build and do not expose it
-        # Note: This logic currently only applies for iMacPro1,1 users, see below threads on the culprits:
-        # - https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/post-17425857
-        # - https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/
-        # PLEASE FOR THE LOVE OF GOD JUST SET ExposeSensitiveData CORRECTLY!!!
-        if self.current_model == "iMacPro1,1":
-            serial: str = subprocess.run("system_profiler SPHardwareDataType | grep Serial".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-            serial = [line.strip().split("Number (system): ", 1)[1] for line in serial.split("\n") if line.strip().startswith("Serial")][0]
-            true_model = subprocess.run([str(self.constants.macserial_path), "--info", str(serial)], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-            true_model = [i.partition(" - ")[2] for i in true_model.stdout.decode().split("\n") if "Model: " in i][0]
-            print(f"True Model: {true_model}")
-            if not true_model.startswith("Unknown"):
-                self.current_model = true_model
-
-        custom_cpu_model_value: str = subprocess.run("nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:revcpuname".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-
-        if not custom_cpu_model_value.startswith("nvram: Error getting variable"):
-            custom_cpu_model_value = [line.strip().split(":revcpuname	", 1)[1] for line in custom_cpu_model_value.split("\n") if line.strip().startswith("4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:")][0]
-            if custom_cpu_model_value.split("%00")[0] != "":
-                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.check_recovery()
+        self.constants.recovery_status = Utilities.check_recovery()

-    def check_recovery(self):
-        root_partition_info = plistlib.loads(subprocess.run("diskutil info -plist /".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        if root_partition_info["VolumeName"] == "macOS Base System" and \
-            root_partition_info["FilesystemType"] == "apfs" and \
-            root_partition_info["BusProtocol"] == "Disk Image":
-            self.constants.recovery_status = True
-        else:
-            self.constants.recovery_status = False
+    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.current_model, self.constants).build_opencore()
+        Build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).build_opencore()

    def install_opencore(self):
-        Build.BuildOpenCore(self.constants.custom_model or self.current_model, self.constants).copy_efi()
+        Build.BuildOpenCore(self.constants.custom_model or self.constants.computer.real_model, self.constants).copy_efi()

    def change_model(self):
        Utilities.cls()
        Utilities.header(["Select Different Model"])
-        print("""
+        print(
+            """
 Tip: Run the following command on the target machine to find the model identifier:

 system_profiler SPHardwareDataType | grep 'Model Identifier'
-    """)
+    """
+        )
        self.constants.custom_model = input("Please enter the model identifier of the target machine: ").strip()
        if self.constants.custom_model not in ModelArray.SupportedSMBIOS:
-            print(f"""
-        {self.constants.custom_model} is not a valid SMBIOS Identifier for macOS {self.constants.os_support}!
-            """)
+            print(
+                f"""
+{self.constants.custom_model} is not a valid SMBIOS Identifier for macOS {self.constants.os_support}!
+"""
+            )
            print_models = input(f"Print list of valid options for macOS {self.constants.os_support}? (y/n)")
-            if print_models in {"y", "Y", "yes", "Yes"}:
+            if print_models.lower() in {"y", "yes"}:
                print("\n".join(ModelArray.SupportedSMBIOS))
-                input("Press any key to continue...")
+                input("\nPress [ENTER] to continue")
+        else:
+            self.set_defaults(self.constants.custom_model, False)

    def patcher_settings(self):
        response = None
        while not (response and response == -1):
-            title = [
-                "Adjust Patcher Settings"
-            ]
+            title = ["Adjust Patcher Settings"]
            menu = Utilities.TUIMenu(title, "Please select an option: ", auto_number=True, top_level=True)
            options = [
-                # TODO: Enable setting OS target when more OSes become supported by the patcher
-                #[f"Change OS version:\t\t\tCurrently macOS {self.constants.os_support}", self.change_os],
-                [f"Enable Verbose Mode:\t\tCurrently {self.constants.verbose_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_verbose],
-                [f"Enable OpenCore DEBUG:\t\tCurrently {self.constants.opencore_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_oc],
-                [f"Enable Kext DEBUG:\t\t\tCurrently {self.constants.kext_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_kext],
-                [f"Set ShowPicker Mode:\t\tCurrently {self.constants.showpicker}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_showpicker],
-                [f"Set Vault Mode:\t\t\tCurrently {self.constants.vault}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_vault],
-                [f"Set SIP and SecureBootModel:\tSIP: {self.constants.sip_status} SBM: {self.constants.secure_status}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_sip],
-                [f"Allow OpenCore on native Models:\tCurrently {self.constants.allow_oc_everywhere}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).allow_native_models],
-                [f"Advanced Patch Settings, for developers only", self.advanced_patcher_settings],
+                [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"Allow Wake on WLAN:\t\t\tCurrently {self.constants.enable_wake_on_wlan}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_wowl],
+                [f"Allow Ivy iMac iGPU:\t\tCurrently {self.constants.allow_ivy_igpu}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).allow_ivy],
+                [f"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:
@@ -113,22 +137,20 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
    def advanced_patcher_settings(self):
        response = None
        while not (response and response == -1):
-            title = [
-                "Adjust Advanced Patcher Settings, for developers ONLY"
-            ]
+            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.current_model, self.constants).change_metal],
-                [f"Assume Upgraded Wifi Always:\tCurrently {self.constants.wifi_build}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_wifi],
-                [f"Set SMBIOS Mode:\t\t\tCurrently {self.constants.serial_settings}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_serial],
-                [f"DRM Preferences:\t\t\tCurrently {self.constants.drm_support}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).drm_setting],
-                [f"Set Generic Bootstrap:\t\tCurrently {self.constants.boot_efi}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).bootstrap_setting],
-                [f"Assume Legacy GPU:\t\t\tCurrently {self.constants.assume_legacy}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).force_accel_setting],
-                #[f"Download more RAM:\t\t\tCurrently {self.constants.download_ram}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).download_more_ram_dot_com],
-                [f"Disable CPU Friend:\t\t\tCurrently {self.constants.disallow_cpufriend}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).disable_cpufriend],
-                [f"Override SMBIOS Spoof:\t\tCurrently {self.constants.override_smbios}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).set_smbios],
-                [f"Set Custom name {self.constants.custom_cpu_model_value}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).custom_cpu],
-                [f"Set SeedUtil Status", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).set_seedutil],
+                [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:
@@ -137,8 +159,11 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
            response = menu.start()

    def credits(self):
-        Utilities.TUIOnlyPrint(["Credits"], "Press [Enter] to go back.\n",
-                               ["""Many thanks to the following:
+        Utilities.TUIOnlyPrint(
+            ["Credits"],
+            "Press [Enter] to go back.\n",
+            [
+                """Many thanks to the following:

  - Acidanthera:\tOpenCore, kexts and other tools
  - Khronokernel:\tWriting and maintaining this patcher
@@ -146,17 +171,19 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
  - ASentientBot:\tLegacy Acceleration Patches
  - Ausdauersportler:\tLinking fixes for SNBGraphicsFB and AMDX3000
  - Syncretic:\t\tAAAMouSSE and telemetrap
-  - cdf:\t\tNightShiftEnabler and Innie"""]).start()
+  - cdf:\t\tNightShiftEnabler and Innie"""
+            ],
+        ).start()

    def PatchVolume(self):
        Utilities.cls()
        Utilities.header(["Patching System Volume"])
-        print("""Patches Root volume to fix misc issues such as:
+        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 (2000-4000 series)
+  - AMD: TeraScale 1 and 2 (2000-6000 series)
 - Audio support for iMac7,1 and iMac8,1

 WARNING: Root Volume Patching is still in active development, please
@@ -169,54 +196,90 @@ 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 change_menu == "1":
-            SysPatch.PatchSysVolume(self.constants.custom_model or self.current_model, self.constants).start_patch()
-        elif change_menu == "2":
-            SysPatch.PatchSysVolume(self.constants.custom_model or self.current_model, self.constants).start_unpatch()
+        if no_patch is not True and change_menu == "1":
+            SysPatch.PatchSysVolume(self.constants.custom_model or self.computer.real_model, self.constants).start_patch()
+        elif no_patch is not True and change_menu == "2":
+            SysPatch.PatchSysVolume(self.constants.custom_model or self.computer.real_model, self.constants).start_unpatch()
        else:
            print("Returning to main menu")

    def main_menu(self):
        response = None
-        ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS11
        while not (response and response == -1):
            title = [
                f"OpenCore Legacy Patcher v{self.constants.patcher_version}",
-                f"Selected Model: {self.constants.custom_model or self.current_model}",
-                f"Target OS: macOS {self.constants.os_support}",
+                f"Selected Model: {self.constants.custom_model or self.computer.real_model}",
            ]

-            if (self.constants.custom_model or self.current_model) not in ModelArray.SupportedSMBIOS and self.constants.allow_oc_everywhere is False:
+            if (self.constants.custom_model or self.computer.real_model) not in ModelArray.SupportedSMBIOS and self.constants.allow_oc_everywhere is False:
                in_between = [
-                    'Your model is not supported by this patcher for running unsupported OSes!',
-                    '',
-                    'If you plan to create the USB for another machine, please select the "Change Model" option in the menu.'
+                    "Your model is not supported by this patcher for running unsupported OSes!",
+                    "",
+                    'If you plan to create the USB for another machine, please select the "Change Model" option in the menu.',
                ]
-            elif not self.constants.custom_model and self.current_model == "iMac7,1" and \
-                    "SSE4.1" not in subprocess.run("sysctl machdep.cpu.features".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode():
+            elif not self.constants.custom_model and self.computer.real_model == "iMac7,1" and "SSE4.1" not in self.computer.cpu.flags:
                in_between = [
-                    'Your model requires a CPU upgrade to a CPU supporting SSE4.1+ to be supported by this patcher!',
-                    '',
-                    f'If you plan to create the USB for another {self.current_model} with SSE4.1+, please select the "Change Model" option in the menu.'
+                    "Your model requires a CPU upgrade to a CPU supporting SSE4.1+ to be supported by this patcher!",
+                    "",
+                    f'If you plan to create the USB for another {self.computer.real_model} with SSE4.1+, please select the "Change Model" option in the menu.',
                ]
            elif self.constants.custom_model == "iMac7,1":
-                in_between = ["This model is supported",
-                              "However please ensure the CPU has been upgraded to support SSE4.1+"
-                              ]
+                in_between = ["This model is supported", "However please ensure the CPU has been upgraded to support SSE4.1+"]
            else:
                in_between = ["This model is supported"]

            menu = Utilities.TUIMenu(title, "Please select an option: ", in_between=in_between, auto_number=True, top_level=True)

            options = (
-                [["Build OpenCore", self.build_opencore]] if ((self.constants.custom_model or self.current_model) in ModelArray.SupportedSMBIOS) or self.constants.allow_oc_everywhere is True else []) + [
+                [["Build OpenCore", self.build_opencore]]
+                if ((self.constants.custom_model or self.computer.real_model) in ModelArray.SupportedSMBIOS) or self.constants.allow_oc_everywhere is True
+                else []
+            ) + [
                ["Install OpenCore to USB/internal drive", self.install_opencore],
                ["Post-Install Volume Patch", self.PatchVolume],
                ["Change Model", self.change_model],
                ["Patcher Settings", self.patcher_settings],
-                ["Credits", self.credits]
+                ["Credits", self.credits],
            ]

            for option in options:
--- a/OpenCore-Patcher.spec
+++ b/OpenCore-Patcher.spec
@@ -6,8 +6,9 @@ block_cipher = None


 a = Analysis(['OpenCore-Patcher.command'],
+             pathex=['Resources'],
             binaries=[],
-             datas=[('payloads', 'payloads'), ('Resources', 'Resources')],
+             datas=[('payloads', 'payloads')],
             hiddenimports=[],
             hookspath=[],
             runtime_hooks=[],
--- 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,11 @@ 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)
+* [Nightly OpenCore Patcher (CLI)](https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-gui/main/OCLP-CLI.zip)

 ## Credits

@@ -50,7 +55,10 @@ Nightly builds can be found here courteous of nightly.link: [Nightly OpenCore-Pa
  * [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)
+* [dosdude1](https://github.com/dosdude1)
+  * Main author of GUI
+  * Development of previous patchers, laying out much of what needs to be patched
+* [BarryKN](https://github.com/BarryKN)
  * Development of previous patchers, laying out much of what needs to be patched
 * [mario_bros_tech](https://github.com/mariobrostech) and the rest of the Unsupported Mac Discord
  * Catalyst that started OpenCore Legacy Patcher
--- a/Resources/Build.py
+++ b/Resources/Build.py
@@ -3,6 +3,8 @@
 from __future__ import print_function

 import binascii
+import copy
+import pickle
 import plistlib
 import shutil
 import subprocess
@@ -12,7 +14,7 @@ import ast
 from pathlib import Path
 from datetime import date

-from Resources import Constants, ModelArray, PCIIDArray, Utilities, DeviceProbe
+from Resources import Constants, ModelArray, Utilities, device_probe


 def human_fmt(num):
@@ -34,20 +36,30 @@ class BuildOpenCore:
        self.model = model
        self.config = None
        self.constants: Constants.Constants = versions
+        self.computer = self.constants.computer
+
+        self.gfx0_path = None

    def smbios_set(self):
+        print("- Setting macOS Monterey Supported SMBIOS")
        if self.model in ModelArray.MacBookAir61:
-            print("- Spoofing to MacBookAir6,1")
-            return "MacBookAir6,1"
+            print("- Spoofing to MacBookAir7,1")
+            return "MacBookAir7,1"
        elif self.model in ModelArray.MacBookAir62:
-            print("- Spoofing to MacBookAir6,2")
-            return "MacBookAir6,2"
+            print("- Spoofing to MacBookAir7,2")
+            return "MacBookAir7,2"
+        elif self.model in ModelArray.MacBook81:
+            print("- Spoofing to MacBook9,1")
+            return "MacBook9,1"
        elif self.model in ModelArray.MacBookPro111:
-            print("- Spoofing to MacBookPro11,1")
-            return "MacBookPro11,1"
+            print("- Spoofing to MacBookPro12,1")
+            return "MacBookPro12,1"
+        elif self.model in ModelArray.MacBookPro112:
+            print("- Spoofing to MacBookPro11,4")
+            return "MacBookPro11,4"
        elif self.model in ModelArray.MacBookPro113:
-            print("- Spoofing to MacBookPro11,3")
-            return "MacBookPro11,3"
+            print("- Spoofing to MacBookPro11,5")
+            return "MacBookPro11,5"
        elif self.model in ModelArray.Macmini71:
            print("- Spoofing to Macmini7,1")
            return "Macmini7,1"
@@ -60,11 +72,11 @@ class BuildOpenCore:
                print("- Spoofing to iMacPro1,1")
                return "iMacPro1,1"
            else:
-                print("- Spoofing to iMac15,1")
-                return "iMac15,1"
+                print("- Spoofing to iMac17,1")
+                return "iMac17,1"
        elif self.model in ModelArray.iMac144:
-            print("- Spoofing to iMac14,4")
-            return "iMac14,4"
+            print("- Spoofing to iMac16,1")
+            return "iMac16,1"
        elif self.model in ModelArray.MacPro71:
            print("- Spoofing to MacPro7,1")
            return "MacPro7,1"
@@ -76,16 +88,38 @@ class BuildOpenCore:
        # Additionally, APFS bit(19) flipped
        # https://github.com/acidanthera/OpenCorePkg/blob/0.6.9/Include/Apple/IndustryStandard/AppleFeatures.h#L136
        if model == "iMac7,1":
-            fw_feature = b'\x07\x14\x08\xc0\x00\x00\x00\x00'
-            fw_mask = b'\xff\x1f\x08\xc0\x00\x00\x00\x00'
+            fw_feature = b"\x07\x14\x08\xc0\x00\x00\x00\x00"
+            fw_mask = b"\xff\x1f\x08\xc0\x00\x00\x00\x00"
        elif model in ["MacPro4,1", "Xserve3,1"]:
-            fw_feature = b'7\xf5\t\xe0\x00\x00\x00\x00'
-            fw_mask = b'7\xff\x0b\xc0\x00\x00\x00\x00'
+            fw_feature = b"7\xf5\t\xe0\x00\x00\x00\x00"
+            fw_mask = b"7\xff\x0b\xc0\x00\x00\x00\x00"
        else:
-            fw_feature = b'\x03\x14\x08\xc0\x00\x00\x00\x00'
-            fw_mask = b'\xff\x3f\x08\xc0\x00\x00\x00\x00'
+            fw_feature = b"\x03\x14\x08\xc0\x00\x00\x00\x00"
+            fw_mask = b"\xff\x3f\x08\xc0\x00\x00\x00\x00"
        return fw_feature, fw_mask

+    def disk_type(self):
+        drive_host_info = plistlib.loads(subprocess.run(f"diskutil info -plist {self.constants.disk}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+        sd_type = drive_host_info["MediaName"]
+        try:
+            ssd_type = drive_host_info["SolidState"]
+        except KeyError:
+            ssd_type = False
+        # Array filled with common SD Card names
+        # Note most USB-based SD Card readers generally report as "Storage Device", and no reliable way to detect further
+        if sd_type in ["SD Card Reader", "SD/MMC"]:
+            print("- Adding SD Card icon")
+            shutil.copy(self.constants.icon_path_sd, self.constants.opencore_release_folder)
+        elif ssd_type is True:
+            print("- Adding SSD icon")
+            shutil.copy(self.constants.icon_path_ssd, self.constants.opencore_release_folder)
+        elif drive_host_info["BusProtocol"] == "USB":
+            print("- Adding External USB Drive icon")
+            shutil.copy(self.constants.icon_path_external, self.constants.opencore_release_folder)
+        else:
+            print("- Adding Internal Drive icon")
+            shutil.copy(self.constants.icon_path_internal, self.constants.opencore_release_folder)
+
    def build_efi(self):
        Utilities.cls()
        if not self.constants.custom_model:
@@ -105,8 +139,7 @@ class BuildOpenCore:
            print("Deleting old copy of OpenCore folder")
            shutil.rmtree(self.constants.opencore_release_folder, onerror=rmtree_handler, ignore_errors=True)

-        print()
-        print(f"- Adding OpenCore v{self.constants.opencore_version} {self.constants.opencore_build}")
+        print(f"\n- Adding OpenCore v{self.constants.opencore_version} {self.constants.opencore_build}")
        shutil.copy(self.constants.opencore_zip_source, self.constants.build_path)
        zipfile.ZipFile(self.constants.opencore_zip_copied).extractall(self.constants.build_path)

@@ -119,6 +152,9 @@ class BuildOpenCore:
        self.config["#Revision"]["Build-Version"] = f"{self.constants.patcher_version} - {date.today()}"
        if not self.constants.custom_model:
            self.config["#Revision"]["Build-Type"] = "OpenCore Built on Target Machine"
+            computer_copy = copy.copy(self.computer)
+            computer_copy.ioregistry = None
+            self.config["#Revision"]["Hardware-Probe"] = pickle.dumps(computer_copy)
        else:
            self.config["#Revision"]["Build-Type"] = "OpenCore Built for External Machine"
        self.config["#Revision"]["OpenCore-Version"] = f"{self.constants.opencore_version} - {self.constants.opencore_build} - {self.constants.opencore_commit}"
@@ -131,13 +167,17 @@ class BuildOpenCore:
            ("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path, lambda: self.constants.allow_oc_everywhere is False),
            ("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path, lambda: self.model in ModelArray.MacPro71),
            ("RestrictEvents.kext", self.constants.restrictevents_mbp_version, self.constants.restrictevents_mbp_path, lambda: self.model in ["MacBookPro6,1", "MacBookPro6,2", "MacBookPro9,1"]),
-            ("NightShiftEnabler.kext", self.constants.nightshift_version, self.constants.nightshift_path, lambda: self.model not in ModelArray.NightShiftExclude and self.constants.allow_oc_everywhere is False and self.constants.serial_settings == "Minimal"),
            ("SMC-Spoof.kext", self.constants.smcspoof_version, self.constants.smcspoof_path, lambda: self.constants.allow_oc_everywhere is False),
            # CPU patches
            ("AppleMCEReporterDisabler.kext", self.constants.mce_version, self.constants.mce_path, lambda: self.model in ModelArray.DualSocket),
            ("AAAMouSSE.kext", self.constants.mousse_version, self.constants.mousse_path, lambda: self.model in ModelArray.SSEEmulator),
            ("telemetrap.kext", self.constants.telemetrap_version, self.constants.telemetrap_path, lambda: self.model in ModelArray.MissingSSE42),
-            ("CPUFriend.kext", self.constants.cpufriend_version, self.constants.cpufriend_path, lambda: self.model != "iMac7,1" and self.constants.allow_oc_everywhere is False and self.constants.disallow_cpufriend is False),
+            (
+                "CPUFriend.kext",
+                self.constants.cpufriend_version,
+                self.constants.cpufriend_path,
+                lambda: self.model not in ["iMac7,1", "Xserve2,1"] and self.constants.allow_oc_everywhere is False and self.constants.disallow_cpufriend is False,
+            ),
            # Ethernet patches
            ("nForceEthernet.kext", self.constants.nforce_version, self.constants.nforce_path, lambda: self.model in ModelArray.EthernetNvidia),
            ("MarvelYukonEthernet.kext", self.constants.marvel_version, self.constants.marvel_path, lambda: self.model in ModelArray.EthernetMarvell),
@@ -147,94 +187,59 @@ class BuildOpenCore:
            # IDE patch
            ("AppleIntelPIIXATA.kext", self.constants.piixata_version, self.constants.piixata_path, lambda: self.model in ModelArray.IDEPatch),
            # Misc
-            ("SidecarFixup.kext", self.constants.sidecarfixup_version, self.constants.sidecarfixup_path, lambda: self.model in ModelArray.SidecarPatch),
+            ("FeatureUnlock.kext", self.constants.featureunlock_version, self.constants.featureunlock_path, lambda: self.model in ModelArray.SidecarPatch),
+            ("DebugEnhancer.kext", self.constants.debugenhancer_version, self.constants.debugenhancer_path, lambda: self.constants.kext_debug is True),
        ]:
            self.enable_kext(name, version, path, check)

        if self.constants.allow_oc_everywhere is False:
            self.get_item_by_kv(self.config["Kernel"]["Patch"], "Identifier", "com.apple.driver.AppleSMC")["Enabled"] = True

-
        if not self.constants.custom_model and (self.constants.allow_oc_everywhere is True or self.model in ModelArray.MacPro71):
            # Use Innie's same logic:
            # https://github.com/cdf/Innie/blob/v1.3.0/Innie/Innie.cpp#L90-L97
-            storage_devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            storage_devices = [i for i in storage_devices if i["class-code"] == binascii.unhexlify(self.constants.classcode_sata) or i["class-code"] == binascii.unhexlify(self.constants.classcode_nvme)]
-            storage_path_gfx: str = subprocess.run([self.constants.gfxutil_path] + f"-v".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-            try:
-                x = 1
-                for i in storage_devices:
-                    storage_vendor = Utilities.hexswap(binascii.hexlify(i["vendor-id"]).decode()[:4])
-                    storage_device = Utilities.hexswap(binascii.hexlify(i["device-id"]).decode()[:4])
-                    print(f'- Fixing PCIe Storage Controller ({x}) reporting')
-                    try:
-                        storage_path = [line.strip().split("= ", 1)[1] for line in storage_path_gfx.split("\n") if f'{storage_vendor}:{storage_device}'.lower() in line.strip()][0]
-                        self.config["DeviceProperties"]["Add"][storage_path] = { "built-in": 1}
-                    except IndexError:
-                        print(f"- Failed to find Device path for PCIe Storage Controller {x}, falling back to Innie")
-                        if self.get_kext_by_bundle_path("Innie.kext")["Enabled"] is False:
-                            self.enable_kext("Innie.kext", self.constants.innie_version, self.constants.innie_path)
-                    x = x + 1
-            except ValueError:
-                print("- No PCIe Storage Controllers found to fix(V)")
-            except IndexError:
-                print("- No PCIe Storage Controllers found to fix(I)")
+            for i, controller in enumerate(self.computer.storage):
+                print(f"- Fixing PCIe Storage Controller ({i + 1}) reporting")
+                if controller.pci_path:
+                    self.config["DeviceProperties"]["Add"][controller.pci_path] = {"built-in": 1}
+                else:
+                    print(f"- Failed to find Device path for PCIe Storage Controller {i}, falling back to Innie")
+                    if self.get_kext_by_bundle_path("Innie.kext")["Enabled"] is False:
+                        self.enable_kext("Innie.kext", self.constants.innie_version, self.constants.innie_path)
+            if not self.computer.storage:
+                print("- No PCIe Storage Controllers found to fix")

        if not self.constants.custom_model:
-            nvme_devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            nvme_devices = [i for i in nvme_devices if i.get("IORegistryEntryChildren", None) and i["vendor-id"] != binascii.unhexlify("6B100000") and i["IORegistryEntryChildren"][0]["IORegistryEntryName"] == "IONVMeController"]
-            try:
-                x = 1
-                for i in nvme_devices:
-                    nvme_vendor = Utilities.hexswap(binascii.hexlify(i["vendor-id"]).decode()[:4])
-                    nvme_device = Utilities.hexswap(binascii.hexlify(i["device-id"]).decode()[:4])
-                    print(f'- Found 3rd Party NVMe SSD ({x}): {nvme_vendor}:{nvme_device}')
-                    nvme_aspm = i["pci-aspm-default"]
-                    try:
-                        nvme_acpi = i["acpi-path"]
-                        nvme_acpi = DeviceProbe.pci_probe().acpi_strip(nvme_acpi)
-                    except KeyError:
-                        print(f"- No ACPI entry found for NVMe SSD ({x})")
-                        nvme_acpi = ""
-                    # Disable Bit 0 (L0s), enable Bit 1 (L1)
-                    if not isinstance(nvme_aspm, int):
-                        nvme_aspm = int.from_bytes(nvme_aspm, byteorder='little')
-                    nvme_aspm = (nvme_aspm & (~3)) | 2
-                    #nvme_aspm &= ~1  # Turn off bit 1
-                    #nvme_aspm |= 2  # Turn on bit 2
-                    self.config["#Revision"][f"Hardware-NVMe-{x}"] = f'{nvme_vendor}:{nvme_device}'
-                    try:
-                        nvme_path = DeviceProbe.pci_probe().deviceproperty_probe(nvme_vendor, nvme_device, nvme_acpi)
-                        if nvme_path == "":
-                            raise IndexError
-                        nvme_path_parent = DeviceProbe.pci_probe().device_property_parent(nvme_path)
-                        print(f"- Found NVMe ({x}) at {nvme_path}")
-                        self.config["DeviceProperties"]["Add"][nvme_path] = {"pci-aspm-default": nvme_aspm, "built-in": 1}
-                        self.config["DeviceProperties"]["Add"][nvme_path_parent] = {"pci-aspm-default": nvme_aspm}
-                    except IndexError:
-                        if "-nvmefaspm" not in self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"]:
-                            print("- Falling back to -nvmefaspm")
-                            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -nvmefaspm"
-                    if self.get_kext_by_bundle_path("NVMeFix.kext")["Enabled"] is False:
-                        self.enable_kext("NVMeFix.kext", self.constants.nvmefix_version, self.constants.nvmefix_path)
-                    x = x + 1
-            except ValueError:
-                print("- No 3rd Party NVMe drive found(V)")
-            except IndexError:
-                print("- No 3rd Party NVMe drive found(I)")
+            nvme_devices = [i for i in self.computer.storage if isinstance(i, device_probe.NVMeController)]
+            for i, controller in enumerate(nvme_devices):
+                print(f"- Found 3rd Party NVMe SSD ({i + 1}): {Utilities.friendly_hex(controller.vendor_id)}:{Utilities.friendly_hex(controller.device_id)}")
+                self.config["#Revision"][f"Hardware-NVMe-{i}"] = f"{Utilities.friendly_hex(controller.vendor_id)}:{Utilities.friendly_hex(controller.device_id)}"
+
+                # Disable Bit 0 (L0s), enable Bit 1 (L1)
+                nvme_aspm = (controller.aspm & (~0b11)) | 0b10
+
+                if controller.pci_path:
+                    print(f"- Found NVMe ({i}) at {controller.pci_path}")
+                    self.config["DeviceProperties"]["Add"].setdefault(controller.pci_path, {})["pci-aspm-default"] = nvme_aspm
+                    self.config["DeviceProperties"]["Add"][controller.pci_path.rpartition("/")[0]] = {"pci-aspm-default": nvme_aspm}
+                else:
+                    if "-nvmefaspm" not in self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"]:
+                        print("- Falling back to -nvmefaspm")
+                        self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -nvmefaspm"
+
+                if self.get_kext_by_bundle_path("NVMeFix.kext")["Enabled"] is False:
+                    self.enable_kext("NVMeFix.kext", self.constants.nvmefix_version, self.constants.nvmefix_path)
+
+            if not nvme_devices:
+                print("- No 3rd Party NVMe drives found")

        def wifi_fake_id(self):
-            default_path = True
            self.enable_kext("AirportBrcmFixup.kext", self.constants.airportbcrmfixup_version, self.constants.airportbcrmfixup_path)
-            self.get_kext_by_bundle_path("AirportBrcmFixup.kext/Contents/PlugIns/AirPortBrcmNIC_Injector.kext")["Enabled"] = True
-            if not self.constants.custom_model:
-                arpt_path = DeviceProbe.pci_probe().deviceproperty_probe(wifi_vendor, wifi_device, wifi_acpi)
-                if arpt_path:
-                    print(f"- Found ARPT device at {arpt_path}")
-                    default_path = False
-                else:
-                    default_path = True
-            if default_path is True:
+            # self.get_kext_by_bundle_path("AirportBrcmFixup.kext/Contents/PlugIns/AirPortBrcmNIC_Injector.kext")["Enabled"] = True
+            if not self.constants.custom_model and self.computer.wifi and self.computer.wifi.pci_path:
+                arpt_path = self.computer.wifi.pci_path
+                print(f"- Found ARPT device at {arpt_path}")
+            else:
                if self.model in ModelArray.nvidiaHDEF:
                    # Nvidia chipsets all have the same path to ARPT
                    arpt_path = "PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)"
@@ -249,42 +254,57 @@ class BuildOpenCore:
                    # iMac11,x-12,x also apply
                    arpt_path = "PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)"
                print(f"- Using known DevicePath {arpt_path}")
-            print("- Applying fake ID for WiFi")
            self.config["DeviceProperties"]["Add"][arpt_path] = {"device-id": binascii.unhexlify("ba430000"), "compatible": "pci14e4,43ba"}
+            if not self.constants.custom_model and self.computer.wifi and self.computer.wifi.country_code:
+                print(f"- Applying fake ID for WiFi, setting Country Code: {self.computer.wifi.country_code}")
+                self.config["DeviceProperties"]["Add"][arpt_path].update({"brcmfx-country": self.computer.wifi.country_code})
+            if self.constants.enable_wake_on_wlan is True:
+                print("- Enabling Wake on WLAN support")
+                self.config["DeviceProperties"]["Add"][arpt_path].update({"brcmfxwowl": binascii.unhexlify("01000000")})

        # WiFi patches
        # TODO: -a is not supported in Lion and older, need to add proper fix
        if self.constants.detected_os > self.constants.lion and not self.constants.custom_model:
-            wifi_vendor,wifi_device,wifi_ioname,wifi_acpi = DeviceProbe.pci_probe().wifi_probe()
-            if wifi_vendor:
-                print(f"- Found Wireless Device {wifi_vendor}:{wifi_device} ({wifi_ioname})")
-                self.config["#Revision"]["Hardware-Wifi"] = f"{wifi_vendor}:{wifi_device} ({wifi_ioname})"
+            if self.computer.wifi:
+                print(f"- Found Wireless Device {Utilities.friendly_hex(self.computer.wifi.vendor_id)}:{Utilities.friendly_hex(self.computer.wifi.device_id)}")
+                self.config["#Revision"]["Hardware-Wifi"] = f"{Utilities.friendly_hex(self.computer.wifi.vendor_id)}:{Utilities.friendly_hex(self.computer.wifi.device_id)}"
        else:
-            wifi_vendor = ""
            print("- Unable to run Wireless hardware detection")
+
        if self.constants.wifi_build is True:
            print("- Skipping Wifi patches on request")
-        elif not self.constants.custom_model and wifi_vendor:
-            if wifi_vendor == self.constants.pci_broadcom:
+        elif not self.constants.custom_model and self.computer.wifi:
+            if isinstance(self.computer.wifi, device_probe.Broadcom):
                # This works around OCLP spoofing the Wifi card and therefore unable to actually detect the correct device
-                if wifi_device in PCIIDArray.broadcom_ids().BCM4360Wifi and wifi_ioname not in ["pci14e4,4353", "pci14e4,4331"]:
+                if self.computer.wifi.chipset == device_probe.Broadcom.Chipsets.AirportBrcmNIC and self.computer.wifi.country_code:
                    self.enable_kext("AirportBrcmFixup.kext", self.constants.airportbcrmfixup_version, self.constants.airportbcrmfixup_path)
-                elif wifi_ioname in ["pci14e4,4353", "pci14e4,4331"] or wifi_device in PCIIDArray.broadcom_ids().BCM94331Wifi:
+                    print(f"- Setting Wireless Card's Country Code: {self.computer.wifi.country_code}")
+                    if self.computer.wifi.pci_path:
+                        arpt_path = self.computer.wifi.pci_path
+                        print(f"- Found ARPT device at {arpt_path}")
+                        self.config["DeviceProperties"]["Add"][arpt_path] = {"brcmfx-country": self.computer.wifi.country_code}
+                        if self.constants.enable_wake_on_wlan is True:
+                            print("- Enabling Wake on WLAN support")
+                            self.config["DeviceProperties"]["Add"][arpt_path].update({"brcmfxwowl": binascii.unhexlify("01000000")})
+                    else:
+                        self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += f" brcmfx-country={self.computer.wifi.country_code}"
+                        if self.constants.enable_wake_on_wlan is True:
+                            print("- Enabling Wake on WLAN support")
+                            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += f" -brcmfxwowl"
+                elif self.computer.wifi.chipset == device_probe.Broadcom.Chipsets.AirPortBrcm4360:
                    wifi_fake_id(self)
-                elif wifi_device in PCIIDArray.broadcom_ids().BCM94322Wifi:
+                elif self.computer.wifi.chipset == device_probe.Broadcom.Chipsets.AirPortBrcm4331:
                    self.enable_kext("IO80211Mojave.kext", self.constants.io80211mojave_version, self.constants.io80211mojave_path)
                    self.get_kext_by_bundle_path("IO80211Mojave.kext/Contents/PlugIns/AirPortBrcm4331.kext")["Enabled"] = True
-                elif wifi_device in PCIIDArray.broadcom_ids().BCM94328Wifi:
+                elif self.computer.wifi.chipset == device_probe.Broadcom.Chipsets.AirPortBrcm43224:
                    self.enable_kext("corecaptureElCap.kext", self.constants.corecaptureelcap_version, self.constants.corecaptureelcap_path)
                    self.enable_kext("IO80211ElCap.kext", self.constants.io80211elcap_version, self.constants.io80211elcap_path)
                    self.get_kext_by_bundle_path("IO80211ElCap.kext/Contents/PlugIns/AppleAirPortBrcm43224.kext")["Enabled"] = True
-            elif wifi_vendor == self.constants.pci_atheros and wifi_device in PCIIDArray.atheros_ids().AtherosWifi:
+            elif isinstance(self.computer.wifi, device_probe.Atheros) and self.computer.wifi.chipset == device_probe.Atheros.Chipsets.AirPortAtheros40:
                self.enable_kext("IO80211HighSierra.kext", self.constants.io80211high_sierra_version, self.constants.io80211high_sierra_path)
                self.get_kext_by_bundle_path("IO80211HighSierra.kext/Contents/PlugIns/AirPortAtheros40.kext")["Enabled"] = True
        else:
-            if self.model in ["iMac14,1", "iMac14,2", "iMac14,3"]:
-                self.enable_kext("AirportBrcmFixup.kext", self.constants.airportbcrmfixup_version, self.constants.airportbcrmfixup_path)
-            elif self.model in ModelArray.WifiBCM94331:
+            if self.model in ModelArray.WifiBCM94331:
                wifi_fake_id(self)
            elif self.model in ModelArray.WifiBCM94322:
                self.enable_kext("IO80211Mojave.kext", self.constants.io80211mojave_version, self.constants.io80211mojave_path)
@@ -296,10 +316,17 @@ class BuildOpenCore:
            elif self.model in ModelArray.WifiAtheros:
                self.enable_kext("IO80211HighSierra.kext", self.constants.io80211high_sierra_version, self.constants.io80211high_sierra_path)
                self.get_kext_by_bundle_path("IO80211HighSierra.kext/Contents/PlugIns/AirPortAtheros40.kext")["Enabled"] = True
+            else:
+                self.enable_kext("AirportBrcmFixup.kext", self.constants.airportbcrmfixup_version, self.constants.airportbcrmfixup_path)
+                # print(f"- Setting Wireless Card's Country Code: {self.computer.wifi.country_code}")
+                # self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += f" brcmfx-country={self.computer.wifi.country_code}"
+                if self.constants.enable_wake_on_wlan is True:
+                    print("- Enabling Wake on WLAN support")
+                    self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += f" -brcmfxwowl"

        # CPUFriend
        pp_map_path = Path(self.constants.platform_plugin_plist_path) / Path(f"{self.model}/Info.plist")
-        if self.model != "iMac7,1" and self.constants.allow_oc_everywhere is False:
+        if self.model not in ["iMac7,1", "Xserve2,1"] and self.constants.allow_oc_everywhere is False:
            Path(self.constants.pp_kext_folder).mkdir()
            Path(self.constants.pp_contents_folder).mkdir()
            shutil.copy(pp_map_path, self.constants.pp_contents_folder)
@@ -326,14 +353,13 @@ class BuildOpenCore:
        # USB Map
        usb_map_path = Path(self.constants.plist_folder_path) / Path("AppleUSBMaps/Info.plist")
        # iMac7,1 kernel panics with USB map installed, remove for time being until properly debugged
-        if usb_map_path.exists() and self.constants.allow_oc_everywhere is False and self.model != "iMac7,1":
-            print(f"- Adding USB-Map.kext")
+        if usb_map_path.exists() and self.constants.allow_oc_everywhere is False and self.model not in ["iMac7,1", "Xserve2,1"]:
+            print("- Adding USB-Map.kext")
            Path(self.constants.map_kext_folder).mkdir()
            Path(self.constants.map_contents_folder).mkdir()
            shutil.copy(usb_map_path, self.constants.map_contents_folder)
            self.get_kext_by_bundle_path("USB-Map.kext")["Enabled"] = True

-
        if self.constants.allow_oc_everywhere is False:
            if self.model == "MacBookPro9,1":
                print("- Adding AppleMuxControl Override")
@@ -363,27 +389,37 @@ class BuildOpenCore:
        # AGPM Patch
        if self.model in ModelArray.DualGPUPatch:
            print("- Adding dual GPU patch")
-            if not self.constants.custom_model:
-                dgpu_vendor,dgpu_device,dgpu_acpi = DeviceProbe.pci_probe().gpu_probe("GFX0")
-                self.gfx0_path = DeviceProbe.pci_probe().deviceproperty_probe(dgpu_vendor,dgpu_device,dgpu_acpi)
-                if self.gfx0_path == "":
-                    print("- Failed to find GFX0 Device path, falling back on known logic")
-                    self.gfx0_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
-                else:
-                    print(f"- Found GFX0 Device Path: {self.gfx0_path}")
+            if not self.constants.custom_model and self.computer.dgpu and self.computer.dgpu.pci_path:
+                self.gfx0_path = self.computer.dgpu.pci_path
+                print(f"- Found GFX0 Device Path: {self.gfx0_path}")
            else:
+                if not self.constants.custom_model:
+                    print("- Failed to find GFX0 Device path, falling back on known logic")
                self.gfx0_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
+
            if self.model in ModelArray.IntelNvidiaDRM and self.constants.drm_support is True:
                print("- Prioritizing DRM support over Intel QuickSync")
                self.config["DeviceProperties"]["Add"][self.gfx0_path] = {"agdpmod": "vit9696", "shikigva": 256}
-                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"disable-gpu-min": "20.0.0"}
+                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {
+                    "name": binascii.unhexlify("23646973706C6179"),
+                    "IOName": "#display",
+                    "class-code": binascii.unhexlify("FFFFFFFF"),
+                }
            else:
                self.config["DeviceProperties"]["Add"][self.gfx0_path] = {"agdpmod": "vit9696"}

-        # HiDPI OpenCanopy and FileVault
-        if self.model in ModelArray.HiDPIpicker:
-            print("- Setting HiDPI picker")
-            self.config["NVRAM"]["Add"]["4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"]["UIScale"] = binascii.unhexlify("02")
+        if self.model in ["iMac13,1", "iMac13,2", "iMac13,3"]:
+            if self.computer.dgpu:
+                if self.constants.allow_ivy_igpu is False:
+                    print("- Disabling iGPU to fix sleep support in macOS 12")
+                    self.config["DeviceProperties"]["Add"][self.gfx0_path] = {"agdpmod": "vit9696", "shikigva": 256}
+                    self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {
+                        "name": binascii.unhexlify("23646973706C6179"),
+                        "IOName": "#display",
+                        "class-code": binascii.unhexlify("FFFFFFFF"),
+                    }
+                else:
+                    print("- Enabling iGPU upon request")

        # Audio Patch
        if self.model in ModelArray.LegacyAudio:
@@ -391,49 +427,76 @@ class BuildOpenCore:
            hdef_path = "PciRoot(0x0)/Pci(0x8,0x0)" if self.model in ModelArray.nvidiaHDEF else "PciRoot(0x0)/Pci(0x1b,0x0)"
            # In AppleALC, MacPro3,1's original layout is already in use, forcing layout 13 instead
            if self.model == "MacPro3,1":
-                self.config["DeviceProperties"]["Add"][hdef_path] = {"apple-layout-id": 90, "use-apple-layout-id": 1, "alc-layout-id": 13, }
+                self.config["DeviceProperties"]["Add"][hdef_path] = {
+                    "apple-layout-id": 90,
+                    "use-apple-layout-id": 1,
+                    "alc-layout-id": 13,
+                }
            else:
-                self.config["DeviceProperties"]["Add"][hdef_path] = {"apple-layout-id": 90, "use-apple-layout-id": 1, "use-layout-id": 1, }
+                self.config["DeviceProperties"]["Add"][hdef_path] = {
+                    "apple-layout-id": 90,
+                    "use-apple-layout-id": 1,
+                    "use-layout-id": 1,
+                }
+
+        # Enable FireWire Boot Support
+        if self.constants.firewire_boot is True and self.model not in ModelArray.NoFireWireSupport:
+            print("- Enabling FireWire Boot Support")
+            self.enable_kext("IOFireWireFamily.kext", self.constants.fw_kext, self.constants.fw_family_path)
+            self.enable_kext("IOFireWireSBP2.kext", self.constants.fw_kext, self.constants.fw_sbp2_path)
+            self.enable_kext("IOFireWireSerialBusProtocolTransport.kext", self.constants.fw_kext, self.constants.fw_bus_path)
+            self.get_kext_by_bundle_path("IOFireWireFamily.kext/Contents/PlugIns/AppleFWOHCI.kext")["Enabled"] = True

        def backlight_path_detection(self):
-            if not self.constants.custom_model:
-                dgpu_vendor,dgpu_device,dgpu_acpi = DeviceProbe.pci_probe().gpu_probe("GFX0")
-                self.gfx0_path = DeviceProbe.pci_probe().deviceproperty_probe(dgpu_vendor,dgpu_device,dgpu_acpi)
-                if self.gfx0_path == "":
-                    print("- Failed to find GFX0 Device path, falling back on known logic")
-                    if self.model in ["iMac11,1", "iMac11,3"]:
-                        self.gfx0_path = "PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"
-                    elif self.model == "iMac10,1":
-                        self.gfx0_path = "PciRoot(0x0)/Pci(0xc,0x0)/Pci(0x0,0x0)"
-                    else:
-                        self.gfx0_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
-                else:
-                    print(f"- Found GFX0 Device Path: {self.gfx0_path}")
-
+            if not self.constants.custom_model and self.computer.dgpu and self.computer.dgpu.pci_path:
+                self.gfx0_path = self.computer.dgpu.pci_path
+                print(f"- Found GFX0 Device Path: {self.gfx0_path}")
            else:
+                if not self.constants.custom_model:
+                    print("- Failed to find GFX0 Device path, falling back on known logic")
                if self.model in ["iMac11,1", "iMac11,3"]:
                    self.gfx0_path = "PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"
                elif self.model == "iMac10,1":
                    self.gfx0_path = "PciRoot(0x0)/Pci(0xc,0x0)/Pci(0x0,0x0)"
                else:
                    self.gfx0_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
-                print(f"- Using known GFX0 path: {self.gfx0_path}")
-

        def nvidia_patch(self, backlight_path):
            self.constants.custom_mxm_gpu = True
            if self.model in ["iMac11,1", "iMac11,2", "iMac11,3", "iMac10,1"]:
                print("- Adding Nvidia Brightness Control and DRM patches")
-                self.config["DeviceProperties"]["Add"][backlight_path] = {"applbkl": binascii.unhexlify("01000000"), "@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000"), "shikigva": 256, "agdpmod": "vit9696"}
+                self.config["DeviceProperties"]["Add"][backlight_path] = {
+                    "applbkl": binascii.unhexlify("01000000"),
+                    "@0,backlight-control": binascii.unhexlify("01000000"),
+                    "@0,built-in": binascii.unhexlify("01000000"),
+                    "shikigva": 256,
+                    "agdpmod": "vit9696",
+                }
                if self.constants.custom_model and self.model == "iMac11,2":
                    # iMac11,2 can have either PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0) or PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)
                    # Set both properties when we cannot run hardware detection
-                    self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"] = {"applbkl": binascii.unhexlify("01000000"), "@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000"), "shikigva": 256, "agdpmod": "vit9696"}
+                    self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"] = {
+                        "applbkl": binascii.unhexlify("01000000"),
+                        "@0,backlight-control": binascii.unhexlify("01000000"),
+                        "@0,built-in": binascii.unhexlify("01000000"),
+                        "shikigva": 256,
+                        "agdpmod": "vit9696",
+                    }
            elif self.model in ["iMac12,1", "iMac12,2"]:
                print("- Adding Nvidia Brightness Control and DRM patches")
-                self.config["DeviceProperties"]["Add"][backlight_path] = {"applbkl": binascii.unhexlify("01000000"), "@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000"), "shikigva": 256, "agdpmod": "vit9696"}
+                self.config["DeviceProperties"]["Add"][backlight_path] = {
+                    "applbkl": binascii.unhexlify("01000000"),
+                    "@0,backlight-control": binascii.unhexlify("01000000"),
+                    "@0,built-in": binascii.unhexlify("01000000"),
+                    "shikigva": 256,
+                    "agdpmod": "vit9696",
+                }
                print("- Disabling unsupported iGPU")
-                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {
+                    "name": binascii.unhexlify("23646973706C6179"),
+                    "IOName": "#display",
+                    "class-code": binascii.unhexlify("FFFFFFFF"),
+                }
            shutil.copy(self.constants.backlight_injector_path, self.constants.kexts_path)
            self.get_kext_by_bundle_path("BacklightInjector.kext")["Enabled"] = True
            self.config["UEFI"]["Quirks"]["ForgeUefiSupport"] = True
@@ -444,12 +507,16 @@ class BuildOpenCore:
            print("- Adding AMD DRM patches")
            self.config["DeviceProperties"]["Add"][backlight_path] = {"shikigva": 80, "unfairgva": 1}
            if self.constants.custom_model and self.model == "iMac11,2":
-                    # iMac11,2 can have either PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0) or PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)
-                    # Set both properties when we cannot run hardware detection
-                    self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"] = {"shikigva": 80, "unfairgva": 1}
+                # iMac11,2 can have either PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0) or PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)
+                # Set both properties when we cannot run hardware detection
+                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"] = {"shikigva": 80, "unfairgva": 1}
            if self.model in ["iMac12,1", "iMac12,2"]:
                print("- Disabling unsupported iGPU")
-                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {
+                    "name": binascii.unhexlify("23646973706C6179"),
+                    "IOName": "#display",
+                    "class-code": binascii.unhexlify("FFFFFFFF"),
+                }
            elif self.model == "iMac10,1":
                self.enable_kext("AAAMouSSE.kext", self.constants.mousse_version, self.constants.mousse_path)

@@ -463,79 +530,79 @@ class BuildOpenCore:
                nvidia_patch(self, self.gfx0_path)
            else:
                print("- Failed to find vendor")
-        elif not self.constants.custom_model and self.model in ModelArray.LegacyGPU:
-            dgpu_vendor,dgpu_device,dgpu_acpi = DeviceProbe.pci_probe().gpu_probe("GFX0")
-            if dgpu_vendor:
-                print(f"- Detected dGPU: {dgpu_vendor}:{dgpu_device}")
-                if dgpu_vendor == self.constants.pci_amd_ati and (dgpu_device in PCIIDArray.amd_ids().polaris_ids or dgpu_device in PCIIDArray.amd_ids().vega_ids or dgpu_device in PCIIDArray.amd_ids().navi_ids or dgpu_device in PCIIDArray.amd_ids().legacy_gcn_ids):
-                    backlight_path_detection(self)
-                    amd_patch(self, self.gfx0_path)
-                elif dgpu_vendor == self.constants.pci_nvidia and dgpu_device in PCIIDArray.nvidia_ids().kepler_ids:
-                    backlight_path_detection(self)
-                    nvidia_patch(self, self.gfx0_path)
+        elif not self.constants.custom_model and self.model in ModelArray.LegacyGPU and self.computer.dgpu:
+            print(f"- Detected dGPU: {Utilities.friendly_hex(self.computer.dgpu.vendor_id)}:{Utilities.friendly_hex(self.computer.dgpu.device_id)}")
+            if 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,
+            ]:
+                backlight_path_detection(self)
+                amd_patch(self, self.gfx0_path)
+            elif self.computer.dgpu.arch == device_probe.NVIDIA.Archs.Kepler:
+                backlight_path_detection(self)
+                nvidia_patch(self, self.gfx0_path)
        if self.model in ModelArray.MacPro71:
            if not self.constants.custom_model:
-                mp_dgpu_devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-                mp_dgpu_devices = [i for i in mp_dgpu_devices if i["class-code"] == binascii.unhexlify("00000300") or i["class-code"] == binascii.unhexlify("00800300")]
-                mp_dgpu_devices_gfx: str = subprocess.run([self.constants.gfxutil_path] + f"-v".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-                try:
-                    x = 1
-                    for i in mp_dgpu_devices:
-                        mp_dgpu_vendor = Utilities.hexswap(binascii.hexlify(i["vendor-id"]).decode()[:4])
-                        mp_dgpu_device = Utilities.hexswap(binascii.hexlify(i["device-id"]).decode()[:4])
+                for i, device in enumerate(self.computer.gpus):
+                    print(f"- Found dGPU ({i + 1}): {Utilities.friendly_hex(device.vendor_id)}:{Utilities.friendly_hex(device.device_id)}")
+                    self.config["#Revision"][f"Hardware-MacPro-dGPU-{i + 1}"] = f"{Utilities.friendly_hex(device.vendor_id)}:{Utilities.friendly_hex(device.device_id)}"

-                        print(f'- Found dGPU ({x}): {mp_dgpu_vendor}:{mp_dgpu_device}')
-                        self.config["#Revision"][f"Hardware-MacPro-dGPU-{x}"] = f'{mp_dgpu_vendor}:{mp_dgpu_device}'
+                    if device.pci_path:
+                        print(f"- Found dGPU ({i + 1}) at {device.pci_path}")
+                        if isinstance(device, device_probe.AMD):
+                            print("- Adding Mac Pro, Xserve DRM patches")
+                            self.config["DeviceProperties"]["Add"][device.pci_path] = {"shikigva": 128, "unfairgva": 1, "rebuild-device-tree": 1}
+                        elif isinstance(device, device_probe.NVIDIA):
+                            print("- Enabling Nvidia Output Patch")
+                            self.config["DeviceProperties"]["Add"][device.pci_path] = {"rebuild-device-tree": 1}
+                            self.config["UEFI"]["Quirks"]["ForgeUefiSupport"] = True
+                            self.config["UEFI"]["Quirks"]["ReloadOptionRoms"] = True

-                        try:
-                            mp_dgpu_path = [line.strip().split("= ", 1)[1] for line in mp_dgpu_devices_gfx.split("\n") if f'{mp_dgpu_vendor}:{mp_dgpu_device}'.lower() in line.strip()][0]
-                            print(f"- Found dGPU ({x}) at {mp_dgpu_path}")
-                            if mp_dgpu_vendor == self.constants.pci_amd_ati:
-                                print("- Adding Mac Pro, Xserve DRM patches")
-                                self.config["DeviceProperties"]["Add"][mp_dgpu_path] = {"shikigva": 128, "unfairgva": 1, "rebuild-device-tree": 1}
-                            elif mp_dgpu_vendor == self.constants.pci_nvidia:
-                                print("- Enabling Nvidia Output Patch")
-                                self.config["DeviceProperties"]["Add"][mp_dgpu_path] = {"rebuild-device-tree": 1}
-                                self.config["UEFI"]["Quirks"]["ForgeUefiSupport"] = True
-                                self.config["UEFI"]["Quirks"]["ReloadOptionRoms"] = True
+                    else:
+                        print(f"- Failed to find Device path for dGPU {i + 1}")
+                        if isinstance(device, device_probe.AMD):
+                            print("- Adding Mac Pro, Xserve DRM patches")
+                            if "shikigva=128 unfairgva=1" not in self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"]:
+                                print("- Falling back to boot-args")
+                                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=128 unfairgva=1" + (
+                                    " -wegtree" if "-wegtree" not in self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] else ""
+                                )
+                        elif isinstance(device, device_probe.NVIDIA):
+                            print("- Enabling Nvidia Output Patch")
+                            if "-wegtree" not in self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"]:
+                                print("- Falling back to boot-args")
+                                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -wegtree"
+                            self.config["UEFI"]["Quirks"]["ForgeUefiSupport"] = True
+                            self.config["UEFI"]["Quirks"]["ReloadOptionRoms"] = True

-                        except IndexError:
-                            print(f"- Failed to find Device path for NVMe {x}")
-                            if mp_dgpu_vendor == self.constants.pci_amd_ati:
-                                print("- Adding Mac Pro, Xserve DRM patches")
-                                if "shikigva=128 unfairgva=1 -wegtree" not in self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"]:
-                                    print("- Falling back to boot-args")
-                                    self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=128 unfairgva=1 -wegtree"
-                            elif mp_dgpu_vendor == self.constants.pci_nvidia:
-                                print("- Enabling Nvidia Output Patch")
-                                if "-wegtree" not in self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"]:
-                                    print("- Falling back to boot-args")
-                                    self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -wegtree"
-                                self.config["UEFI"]["Quirks"]["ForgeUefiSupport"] = True
-                                self.config["UEFI"]["Quirks"]["ReloadOptionRoms"] = True
-                        x = x + 1
-                except ValueError:
-                    print("- No socketed dGPU found")
-                except IndexError:
+                if not self.computer.gpus:
                    print("- No socketed dGPU found")
+
            else:
                print("- Adding Mac Pro, Xserve DRM patches")
                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=128 unfairgva=1 -wegtree"

        # Add XhciDxe if firmware doesn't have XHCI controller support and XCHI controller detected
-        if self.model not in ModelArray.XhciSupport and not self.constants.custom_model:
-            devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            try:
-                devices = [i for i in devices if i["class-code"] == binascii.unhexlify(self.constants.classcode_xhci)]
-                vendor_id = Utilities.hexswap(binascii.hexlify(devices[0]["vendor-id"]).decode()[:4])
-                device_id = Utilities.hexswap(binascii.hexlify(devices[0]["device-id"]).decode()[:4])
-                print("- Found XHCI Controller, adding Boot Support")
-                shutil.copy(self.constants.xhci_driver_path, self.constants.drivers_path)
-                self.config["UEFI"]["Drivers"] += ["XhciDxe.efi"]
-            except ValueError:
-                print("- No XHCI Controller Found (V)")
-            except IndexError:
-                print("- No XHCI Controller Found (I)")
+        # if self.model not in ModelArray.XhciSupport and not self.constants.custom_model:
+        #    devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+        #    try:
+        #        devices = [i for i in devices if i["class-code"] == binascii.unhexlify(self.constants.classcode_xhci)]
+        #        vendor_id = Utilities.hexswap(binascii.hexlify(devices[0]["vendor-id"]).decode()[:4])
+        #        device_id = Utilities.hexswap(binascii.hexlify(devices[0]["device-id"]).decode()[:4])
+        #        print("- Found XHCI Controller, adding Boot Support")
+        #        shutil.copy(self.constants.xhci_driver_path, self.constants.drivers_path)
+        #        self.config["UEFI"]["Drivers"] += ["XhciDxe.efi"]
+        #    except ValueError:
+        #        print("- No XHCI Controller Found (V)")
+        #    except IndexError:
+        #        print("- No XHCI Controller Found (I)")
+
+        if self.constants.nvme_boot is True:
+            print("- Enabling NVMe boot support")
+            shutil.copy(self.constants.nvme_driver_path, self.constants.drivers_path)
+            self.config["UEFI"]["Drivers"] += ["NvmExpressDxe.efi"]

        # Add OpenCanopy
        print("- Adding OpenCanopy GUI")
@@ -554,22 +621,22 @@ class BuildOpenCore:
            self.config["UEFI"]["Output"]["GopPassThrough"] = "Apple"

        # ThirdPartDrives Check
-        if self.model not in ModelArray.NoSATAPatch and self.constants.allow_oc_everywhere is False:
+        if self.model in ModelArray.SATAPatch and self.constants.allow_oc_everywhere is False:
            print("- Adding SATA Hibernation Patch")
            self.config["Kernel"]["Quirks"]["ThirdPartyDrives"] = True

        # DEBUG Settings
        if self.constants.verbose_debug is True:
            print("- Enabling Verbose boot")
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -v debug=0x100"
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -v"
        if self.constants.kext_debug is True:
            print("- Enabling DEBUG Kexts")
            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -liludbgall"
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " msgbuf=1048576"
+            # self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " msgbuf=1048576"
        if self.constants.opencore_debug is True:
            print("- Enabling DEBUG OpenCore")
-            self.config["Misc"]["Debug"]["Target"] = 67
-            self.config["Misc"]["Debug"]["DisplayLevel"] = 672151678018
+            self.config["Misc"]["Debug"]["Target"] = 0x43
+            self.config["Misc"]["Debug"]["DisplayLevel"] = 0x80000042
        if self.constants.showpicker is True:
            print("- Enabling ShowPicker")
            self.config["Misc"]["Boot"]["ShowPicker"] = True
@@ -584,6 +651,8 @@ class BuildOpenCore:
            print("- Disabling SIP")
            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["csr-active-config"] = binascii.unhexlify("EF0F0000")
            self.config["NVRAM"]["Delete"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"] += ["csr-active-config"]
+        if self.constants.disable_amfi is True:
+            print("- Disabling AMFI")
            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " amfi_get_out_of_my_way=1"
        if self.constants.secure_status is False:
            print("- Disabling SecureBootModel")
@@ -602,6 +671,11 @@ class BuildOpenCore:
                print("- Adding CPU Name Patch")
            if self.get_kext_by_bundle_path("RestrictEvents.kext")["Enabled"] is False:
                self.enable_kext("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path)
+        if self.model == self.constants.override_smbios:
+            print("- Adding -no_compat_check")
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -no_compat_check"
+        if self.constants.disk != "":
+            self.disk_type()

    def set_smbios(self):
        spoofed_model = self.model
@@ -624,7 +698,7 @@ class BuildOpenCore:
            if self.constants.custom_cpu_model == 0 or self.constants.custom_cpu_model == 1:
                self.config["PlatformInfo"]["SMBIOS"]["ProcessorType"] = 1537
            if self.model in ModelArray.NoAPFSsupport:
-                fw_feature,fw_mask = self.fw_feature_detect(self.model)
+                fw_feature, fw_mask = self.fw_feature_detect(self.model)
                self.config["PlatformInfo"]["PlatformNVRAM"]["FirmwareFeatures"] = fw_feature
                self.config["PlatformInfo"]["SMBIOS"]["FirmwareFeatures"] = fw_feature
                self.config["PlatformInfo"]["PlatformNVRAM"]["FirmwareFeaturesMask"] = fw_mask
@@ -682,7 +756,7 @@ class BuildOpenCore:
            self.config["PlatformInfo"]["CustomMemory"] = True

        # USB Map and CPUFriend Patching
-        if self.constants.allow_oc_everywhere is False and self.model != "iMac7,1":
+        if self.constants.allow_oc_everywhere is False and self.model not in ["iMac7,1", "Xserve2,1"]:
            new_map_ls = Path(self.constants.map_contents_folder) / Path("Info.plist")
            map_config = plistlib.load(Path(new_map_ls).open("rb"))
            # Strip unused USB maps
@@ -702,7 +776,7 @@ class BuildOpenCore:
                    except KeyError:
                        continue
            plistlib.dump(map_config, Path(new_map_ls).open("wb"), sort_keys=True)
-        if self.constants.allow_oc_everywhere is False and self.model != "iMac7,1" and self.constants.disallow_cpufriend is False:
+        if self.constants.allow_oc_everywhere is False and self.model not in ["iMac7,1", "Xserve2,1"] and self.constants.disallow_cpufriend is False:
            # Adjust CPU Friend Data to correct SMBIOS
            new_cpu_ls = Path(self.constants.pp_contents_folder) / Path("Info.plist")
            cpu_config = plistlib.load(Path(new_cpu_ls).open("rb"))
@@ -712,7 +786,6 @@ class BuildOpenCore:
            cpu_config["IOKitPersonalities"]["CPUFriendDataProvider"]["cf-frequency-data"] = string_stuff
            plistlib.dump(cpu_config, Path(new_cpu_ls).open("wb"), sort_keys=True)

-
        if self.constants.allow_oc_everywhere is False:
            if self.model == "MacBookPro9,1":
                new_amc_ls = Path(self.constants.amc_contents_folder) / Path("Info.plist")
@@ -727,10 +800,11 @@ class BuildOpenCore:
            if self.model in ModelArray.AGDPSupport:
                new_agdp_ls = Path(self.constants.agdp_contents_folder) / Path("Info.plist")
                agdp_config = plistlib.load(Path(new_agdp_ls).open("rb"))
-                agdp_config["IOKitPersonalities"]["AppleGraphicsDevicePolicy"]["ConfigMap"][self.spoofed_board] = agdp_config["IOKitPersonalities"]["AppleGraphicsDevicePolicy"]["ConfigMap"].pop(self.model)
+                agdp_config["IOKitPersonalities"]["AppleGraphicsDevicePolicy"]["ConfigMap"][self.spoofed_board] = agdp_config["IOKitPersonalities"]["AppleGraphicsDevicePolicy"]["ConfigMap"].pop(
+                    self.model
+                )
                plistlib.dump(agdp_config, Path(new_agdp_ls).open("wb"), sort_keys=True)

-
    @staticmethod
    def get_item_by_kv(iterable, key, value):
        item = None
@@ -792,7 +866,7 @@ class BuildOpenCore:
                zip_file.extractall(self.constants.oc_folder)
            item.unlink()

-        if self.constants.recovery_status == False:
+        if not self.constants.recovery_status:
            # Crashes in RecoveryOS for unknown reason
            for i in self.constants.build_path.rglob("__MACOSX"):
                shutil.rmtree(i)
@@ -802,7 +876,7 @@ class BuildOpenCore:
    def sign_files(self):
        if self.constants.vault is True:
            print("- Vaulting EFI")
-            subprocess.run([self.constants.vault_path] + f"{self.constants.oc_folder}/".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            subprocess.run([str(self.constants.vault_path), f"{self.constants.oc_folder}/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)

    def build_opencore(self):
        self.build_efi()
@@ -892,7 +966,7 @@ Please build OpenCore first!"""
                selected_disk["partitions"][partition]["type"] == "Microsoft Basic Data" and selected_disk["partitions"][partition]["size"] < 1024 * 1024 * 512
            ):  # 512 megabytes:
                text += " *"
-            menu.add_menu_option(text, key=partition[len(disk_identifier) + 1:])
+            menu.add_menu_option(text, key=partition[len(disk_identifier) + 1 :])

        response = menu.start()

@@ -909,7 +983,7 @@ Please build OpenCore first!"""
            " without altering line endings",
        ]

-        if self.constants.detected_os > self.constants.yosemite and self.constants.recovery_status == False:
+        if self.constants.detected_os >= self.constants.el_capitan and not self.constants.recovery_status:
            result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
        else:
            result = subprocess.run(f"diskutil mount {disk_identifier}s{response}".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -938,6 +1012,19 @@ Please build OpenCore first!"""
        Utilities.header(["Copying OpenCore"])

        if mount_path.exists():
+            if (mount_path / Path("EFI/Microsoft")).exists():
+                print("- Found Windows Boot Loader")
+                print("\nWould you like to continue installing OpenCore?")
+                print("Installing OpenCore onto this drive may make Windows unbootable until OpenCore")
+                print("is removed from the partition")
+                print("We highly recommend users partition 200MB off their drive with Disk Utility")
+                print("    Name:\t\t OPENCORE")
+                print("    Format:\t\t FAT32")
+                print("    Size:\t\t 200MB")
+                choice = input("\nWould you like to still install OpenCore to this drive?(y/n): ")
+                if not choice in ["y", "Y", "Yes", "yes"]:
+                    subprocess.run(["diskutil", "umount", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                    return
            if (mount_path / Path("EFI/OC")).exists():
                print("- Removing preexisting EFI/OC folder")
                shutil.rmtree(mount_path / Path("EFI/OC"), onerror=rmtree_handler)
@@ -969,10 +1056,10 @@ Please build OpenCore first!"""
                print("- Adding Internal Drive icon")
                shutil.copy(self.constants.icon_path_internal, mount_path)
            print("- Cleaning install location")
-            if self.constants.recovery_status == False:
+            if not self.constants.recovery_status:
                # RecoveryOS doesn't support dot_clean
                # Remove dot_clean, requires full disk access
-                #subprocess.run(["dot_clean", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                # subprocess.run(["dot_clean", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
                print("- Unmounting EFI partition")
                subprocess.run(["diskutil", "umount", mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
            print("- OpenCore transfer complete")
--- a/Resources/CliMenu.py
+++ b/Resources/CliMenu.py
@@ -3,7 +3,7 @@
 from __future__ import print_function
 import subprocess

-from Resources import ModelArray, Constants, Utilities
+from Resources import Constants, Utilities


 class MenuOptions:
@@ -11,24 +11,6 @@ class MenuOptions:
        self.model = model
        self.constants: Constants.Constants = versions

-    def change_os(self):
-        Utilities.cls()
-        Utilities.header(["Select Patcher's Target OS"])
-        print(f"""
-Minimum Target:\t{self.constants.min_os_support}
-Maximum Target:\t{self.constants.max_os_support}
-Current target:\t{self.constants.os_support}
-        """)
-        temp_os_support = float(input("Please enter OS target: "))
-        if (self.constants.max_os_support < temp_os_support) or (temp_os_support < self.constants.min_os_support):
-            print("Unsupported entry")
-        else:
-            self.constants.os_support = temp_os_support
-        if temp_os_support == 11.0:
-            ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS11
-        elif temp_os_support == 12.0:
-            ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS12
-
    def change_verbose(self):
        Utilities.cls()
        Utilities.header(["Set Verbose mode"])
@@ -67,7 +49,8 @@ Current target:\t{self.constants.os_support}
    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
+        print(
+            """This is for iMacs that have upgraded Metal GPUs, otherwise
 Patcher assumes based on stock configuration (ie. iMac10,x-12,x)

 Valid Options:
@@ -78,7 +61,8 @@ Valid Options:

 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
@@ -92,26 +76,11 @@ option is for those patching on a different machine or OCLP cannot detect.
        else:
            print("Invalid option")

-    def change_wifi(self):
-        Utilities.cls()
-        Utilities.header(["Assume Upgraded Wifi Always"])
-        print("""This is for Macs with upgraded wifi cards(ie. BCM94360/2)
-
-Note: Patcher will detect whether hardware has been upgraded regardless, this
-option is for those patching on a different machine or cannot detect.
-        """)
-        change_menu = input("Enable Upgraded Wifi build algorithm?(y/n): ")
-        if change_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.wifi_build = True
-        elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.wifi_build = False
-        else:
-            print("Invalid option")
-
    def change_serial(self):
        Utilities.cls()
        Utilities.header(["Set SMBIOS Mode"])
-        print("""This section is for setting how OpenCore generates the SMBIOS
+        print(
+            """This section is for setting how OpenCore generates the SMBIOS
 Recommended for adanced users who want control how serials are handled

 Valid options:
@@ -121,7 +90,8 @@ Valid options:
 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"
@@ -135,10 +105,12 @@ Note: For new users we recommend leaving as default(1. Minimal)
    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,
+        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
@@ -150,13 +122,15 @@ pressing the "Esc" key
    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
+        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
@@ -168,14 +142,11 @@ Note: For security reasons, OpenShell will be disabled when Vault is set.
    def change_sip(self):
        Utilities.cls()
        Utilities.header(["Set SIP and SecureBootModel"])
-        print("""SIP and SecureBootModel are used to ensure proper OTA functionality,
+        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

-Note: for minor changes, SIP can be adjusted in recovery like normal.
-Additionally, when disabling SIP via the patcher amfi_get_out_of_my_way=1
-will be added to boot-args.
-
 Valid options:

 1. Enable Both
@@ -183,7 +154,8 @@ Valid options:
 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
@@ -200,25 +172,28 @@ Valid options:
        else:
            print("Invalid option")

-    def change_imac_nvidia(self):
+    def set_amfi(self):
        Utilities.cls()
-        Utilities.header(["Assume Metal GPU Always"])
-        print("""Specifically for iMac10,x-12,x with Metal Nvidia GPU upgrades
-By default the patcher will try to detect what hardware is
-running, however this will enforce iMac Nvidia Build Patches.
-        """)
-        change_menu = input("Assume iMac Nvidia patches(y/n): ")
+        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.imac_nvidia_build = True
+            self.constants.disable_amfi = True
        elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.imac_nvidia_build = False
+            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
+        print(
+            """Sets OpenCore's bootstrap method, currently the patcher supports the
 following options.

 Valid options:
@@ -233,7 +208,8 @@ 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
@@ -242,11 +218,11 @@ see the EFI Boot entry in the boot picker.
        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.
+        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.

@@ -256,7 +232,8 @@ 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
@@ -265,30 +242,16 @@ Recommend only disabling if absolutely required.
        else:
            print("Invalid option")

-    def force_accel_setting(self):
-        Utilities.cls()
-        Utilities.header(["Assume Legacy GPU"])
-        print("""Allows any model to force install Legacy Acceleration
-patches. Only required for Mac Pro and Xserve users.
-
-DO NOT RUN IF METAL GPU IS INSTALLED
-        """)
-        change_menu = input("Enable Beta Acceleration Patches(y/n): ")
-        if change_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.assume_legacy = True
-        elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.assume_legacy = 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
+        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
@@ -302,13 +265,15 @@ power usage.
    def custom_cpu(self):
        Utilities.cls()
        Utilities.header(["Set custom CPU Model Name"])
-        print("""Change reported CPU Model name in About This Mac
+        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")
@@ -332,46 +297,36 @@ Custom names will report as follows:
    def custom_color_thing(self):
        Utilities.cls()
        Utilities.header(["Set custom CPU Model Name"])
-        print("""Change reported CPU Model name in About This Mac
+        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()
+            # 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 download_more_ram_dot_com(self):
-        Utilities.cls()
-        Utilities.header(["Download more RAM"])
-        print("""Downloads more RAM to your Mac!
-Currently only offers 1.5TB bundles
-        """)
-        change_menu = input("Download more RAM?(y/n): ")
-        if change_menu == "y":
-            self.constants.download_ram = True
-        elif change_menu == "n":
-            self.constants.download_ram = False
-        else:
-            print("Invalid option")
-
    def disable_cpufriend(self):
        Utilities.cls()
        Utilities.header(["Disable CPU Friend?"])
-        print("""Only recommended for advanced users
+        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
@@ -383,24 +338,30 @@ hardware
    def set_seedutil(self):
        Utilities.cls()
        Utilities.header(["Set SeedUtil Status"])
-        print("""Used for setting OS Update Preferences
+        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()
+            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()
+            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]
@@ -413,13 +374,15 @@ Valid options:
    def set_smbios(self):
        Utilities.cls()
        Utilities.header(["Override SMBIOS Spoof"])
-        print("""Change model OpenCore spoofs Mac too
+        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":
@@ -435,6 +398,130 @@ Valid options:
                self.constants.override_smbios = "Default"
        elif change_menu == "3":
            print("Disabling SMBIOS spoof")
-            self.constants.override_smbios = self.constants.custom_model or self.current_model
+            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")
+
+    def allow_wowl(self):
+        Utilities.cls()
+        Utilities.header(["Allow Wake on WLAN"])
+        print(
+            """
+Due to an unfortunate bug in macOS Big Sur+, Wake on WLAN is
+disabled by default for BCM943224, BCM94331 and BCM94360/2 chipsets.
+
+This is due to Wake on WLAN creating network instability and in other cases
+halving network speeds. This issue is not replicable across machines however
+be prepared if enabling.
+        """
+        )
+
+        change_menu = input("Allow Wake on WLAN?(y/n): ")
+        if change_menu == "y":
+            self.constants.enable_wake_on_wlan = True
+        elif change_menu == "n":
+            self.constants.enable_wake_on_wlan = False
+        else:
+            print("Invalid option")
+
+    def allow_ivy(self):
+        Utilities.cls()
+        Utilities.header(["Allow Ivy iMac iGPU"])
+        print(
+            """
+For iMac13,x systems with a Nvidia dGPU, the iGPU is disabled by default to
+allow Delta Updates, FileVault, SIP and such on macOS Monterey. However due to
+this, DRM and QuickSync support may be broken.
+
+Users can choose to override this option but be aware SIP and FileVault must be
+disabled to run root patches to fix DRM and QuickSync.
+
+Note: This does not apply for Big Sur, the iGPU can be renabled without
+consequence
+Note 2: This setting only affects iMac13,x with dGPUs
+        """
+        )
+
+        change_menu = input("Allow Ivy iMac iGPU?(y/n): ")
+        if change_menu == "y":
+            self.constants.allow_ivy_igpu = True
+        elif change_menu == "n":
+            self.constants.allow_ivy_igpu = False
+        else:
+            print("Invalid option")
--- a/Resources/Constants.py
+++ b/Resources/Constants.py
@@ -5,59 +5,63 @@
 from __future__ import print_function

 from pathlib import Path
+from typing import Optional
+
+from Resources import device_probe


 class Constants:
    def __init__(self):
-        self.patcher_version = "0.1.6"
+        self.patcher_version = "0.2.3"
        self.opencore_commit = "4e0ff2d - 05-23-2021"
        self.opencore_version = "0.7.0"
-        self.lilu_version = "1.5.3"
-        self.whatevergreen_version = "1.4.9"
-        self.airportbcrmfixup_version = "2.1.2"
+        self.lilu_version = "1.5.4"
+        self.whatevergreen_version = "1.5.1"
+        self.airportbcrmfixup_version = "2.1.3"
        self.bcm570_version = "1.0.1"
        self.marvel_version = "1.0.0"
        self.nforce_version = "1.0.0"
        self.mce_version = "1.0.0"
-        self.mousse_version = "0.93"
+        self.mousse_version = "0.95"
        self.telemetrap_version = "1.0.0"
        self.corecaptureelcap_version = "1.0.0"
        self.io80211elcap_version = "1.0.0"
        self.io80211high_sierra_version = "1.0.0"
        self.io80211mojave_version = "1.0.0"
-        self.applealc_version = "1.6.1"
-        self.restrictevents_version = "1.0.1"
-        self.restrictevents_mbp_version = "1.0.1"
+        self.applealc_version = "1.6.2"
+        self.restrictevents_version = "1.0.3"
+        self.restrictevents_mbp_version = "1.0.3"
        self.piixata_version = "1.0.0"
        self.backlight_version = "1.0.1"
        self.backlight_injector_version = "1.0.0"
-        self.cpufriend_version = "1.2.3"
+        self.cpufriend_version = "1.2.4"
        self.nightshift_version = "1.1.0"
        self.smcspoof_version = "1.0.0"
-        self.cputscsync = "1.0.3"
-        self.hibernationfixup = "1.3.9"
-        self.nvmefix_version = "1.0.7"
-        self.sidecarfixup_version = "1.0.0"
+        self.nvmefix_version = "1.0.9"
+        self.featureunlock_version = "1.0.3"
+        self.debugenhancer_version = "1.0.3"
        self.innie_version = "1.3.0"
-        self.payload_version = "0.0.8"
+        self.fw_kext = "1.0.0"
+        self.disk = ""
+        self.patch_disk = ""
+        self.patcher_support_pkg_version = "0.0.13"  # PatcherSupportPkg

        # Get resource path
        self.current_path = Path(__file__).parent.parent.resolve()
        self.payload_path = self.current_path / Path("payloads")

-        self.custom_model: str = None
-        self.custom_mxm_gpu: str = None
-        self.current_gpuv: str = None
-        self.current_gpud: str = None
+        # Hardware
+        self.computer: device_probe.Computer = None  # type: ignore
+
+        self.custom_model: Optional[str] = None
+        self.custom_mxm_gpu: bool = False

        # Patcher Settings
        self.opencore_debug = False
        self.opencore_build = "RELEASE"
        self.kext_debug = False
        self.verbose_debug = False
-        self.os_support = 11.0
-        self.min_os_support = 11.0
-        self.max_os_support = 11.0
+        self.os_support = 12.0
        self.metal_build = False
        self.imac_vendor = "None"
        self.wifi_build = False
@@ -66,12 +70,10 @@ class Constants:
        self.showpicker = True
        self.vault = False
        self.sip_status = True
-        self.secure_status = True
+        self.secure_status = False
        self.detected_os = 0
        self.boot_efi = False
        self.drm_support = False
-        self.legacy_acceleration_patch = True
-        self.assume_legacy = False
        self.allow_oc_everywhere = False
        self.custom_cpu_model = 2
        self.custom_cpu_model_value = ""
@@ -81,6 +83,13 @@ class Constants:
        self.recovery_status = False
        self.override_smbios = "Default"
        self.apecid_support = False
+        self.firewire_boot = False
+        self.nvme_boot = False
+        self.disable_amfi = False
+        self.terascale_2_patch = False
+        self.enable_wake_on_wlan = False
+        self.allow_ivy_igpu = False
+        self.moj_cat_accel = False

        # OS Versions
        self.tiger = 8
@@ -96,6 +105,7 @@ class Constants:
        self.mojave = 18
        self.catalina = 19
        self.big_sur = 20
+        self.monterey = 21

        # Vendor IDs
        self.pci_nvidia = "10DE"
@@ -121,243 +131,432 @@ class Constants:
        self.arch_kepler = "GK100"

        # External Files
-        self.url_apple_binaries = "https://github.com/dortania/Apple-Binaries-OCLP/archive/refs/tags/"
+        self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/"
+
+        self.legacy_accel_support = [
+            self.mojave,
+            self.catalina,
+            self.big_sur,
+        ]

    # Payload Location
    # OpenCore
    @property
-    def opencore_zip_source(self): return self.payload_path / Path(f"OpenCore/OpenCore-{self.opencore_build}.zip")
+    def opencore_zip_source(self):
+        return self.payload_path / Path(f"OpenCore/OpenCore-{self.opencore_build}.zip")
+
    @property
-    def plist_template(self): return self.payload_path / Path(f"Config/config.plist")
+    def plist_template(self):
+        return self.payload_path / Path("Config/config.plist")

    # Mount Location
    @property
-    def payload_mnt1_path(self): return self.payload_path / Path("mnt1")
+    def payload_mnt1_path(self):
+        return self.payload_path / Path("mnt1")

    # ACPI
    @property
-    def pci_ssdt_path(self): return self.payload_path / Path("ACPI/SSDT-CPBG.aml")
+    def pci_ssdt_path(self):
+        return self.payload_path / Path("ACPI/SSDT-CPBG.aml")
+
    @property
-    def windows_ssdt_path(self): return self.payload_path / Path("ACPI/SSDT-PCI.aml")
+    def windows_ssdt_path(self):
+        return self.payload_path / Path("ACPI/SSDT-PCI.aml")

    # Drivers
    @property
-    def nvme_driver_path(self): return self.payload_path / Path("Drivers/NvmExpressDxe.efi")
+    def nvme_driver_path(self):
+        return self.payload_path / Path("Drivers/NvmExpressDxe.efi")
+
    @property
-    def exfat_legacy_driver_path(self): return self.payload_path / Path("Drivers/ExFatDxeLegacy.efi")
+    def exfat_legacy_driver_path(self):
+        return self.payload_path / Path("Drivers/ExFatDxeLegacy.efi")
+
    @property
-    def xhci_driver_path(self): return self.payload_path / Path("Drivers/XhciDxe.efi")
+    def xhci_driver_path(self):
+        return self.payload_path / Path("Drivers/XhciDxe.efi")

    # Kexts
    @property
-    def payload_kexts_path(self): return self.payload_path / Path("Kexts")
+    def payload_kexts_path(self):
+        return self.payload_path / Path("Kexts")
+
    @property
-    def lilu_path(self): return self.payload_kexts_path / Path(f"Acidanthera/Lilu-v{self.lilu_version}.zip")
+    def lilu_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/Lilu-v{self.lilu_version}.zip")
+
    @property
-    def whatevergreen_path(self): return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}.zip")
+    def whatevergreen_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}.zip")
+
    @property
-    def airportbcrmfixup_path(self): return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}.zip")
+    def airportbcrmfixup_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}.zip")
+
    @property
-    def restrictevents_path(self): return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}.zip")
+    def restrictevents_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}.zip")
+
    @property
-    def restrictevents_mbp_path(self): return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-MBP91-v{self.restrictevents_mbp_version}.zip")
+    def restrictevents_mbp_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-MBP91-v{self.restrictevents_mbp_version}.zip")
+
    @property
-    def bcm570_path(self): return self.payload_kexts_path / Path(f"Ethernet/CatalinaBCM5701Ethernet-v{self.bcm570_version}.zip")
+    def bcm570_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/CatalinaBCM5701Ethernet-v{self.bcm570_version}.zip")
+
    @property
-    def marvel_path(self): return self.payload_kexts_path / Path(f"Ethernet/MarvelYukonEthernet-v{self.marvel_version}.zip")
+    def marvel_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/MarvelYukonEthernet-v{self.marvel_version}.zip")
+
    @property
-    def nforce_path(self): return self.payload_kexts_path / Path(f"Ethernet/nForceEthernet-v{self.nforce_version}.zip")
+    def nforce_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/nForceEthernet-v{self.nforce_version}.zip")
+
    @property
-    def mce_path(self): return self.payload_kexts_path / Path(f"Misc/AppleMCEReporterDisabler-v{self.mce_version}.zip")
+    def mce_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleMCEReporterDisabler-v{self.mce_version}.zip")
+
    @property
-    def mousse_path(self): return self.payload_kexts_path / Path(f"SSE/AAAMouSSE-v{self.mousse_version}.zip")
+    def mousse_path(self):
+        return self.payload_kexts_path / Path(f"SSE/AAAMouSSE-v{self.mousse_version}.zip")
+
    @property
-    def telemetrap_path(self): return self.payload_kexts_path / Path(f"SSE/telemetrap-v{self.telemetrap_version}.zip")
+    def telemetrap_path(self):
+        return self.payload_kexts_path / Path(f"SSE/telemetrap-v{self.telemetrap_version}.zip")
+
    @property
-    def corecaptureelcap_path(self): return self.payload_kexts_path / Path(f"Wifi/corecaptureElCap-v{self.corecaptureelcap_version}.zip")
+    def corecaptureelcap_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/corecaptureElCap-v{self.corecaptureelcap_version}.zip")
+
    @property
-    def io80211elcap_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211ElCap-v{self.io80211elcap_version}.zip")
+    def io80211elcap_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211ElCap-v{self.io80211elcap_version}.zip")
+
    @property
-    def io80211high_sierra_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211HighSierra-v{self.io80211high_sierra_version}.zip")
+    def io80211high_sierra_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211HighSierra-v{self.io80211high_sierra_version}.zip")
+
    @property
-    def io80211mojave_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211Mojave-v{self.io80211mojave_version}.zip")
+    def io80211mojave_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211Mojave-v{self.io80211mojave_version}.zip")
+
    @property
-    def applealc_path(self): return self.payload_kexts_path / Path(f"Acidanthera/AppleALC-v{self.applealc_version}.zip")
+    def applealc_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/AppleALC-v{self.applealc_version}.zip")
+
    @property
-    def piixata_path(self): return self.payload_kexts_path / Path(f"Misc/AppleIntelPIIXATA-v{self.piixata_version}.zip")
+    def piixata_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleIntelPIIXATA-v{self.piixata_version}.zip")
+
    @property
-    def backlight_path(self): return self.payload_kexts_path / Path(f"Misc/AppleBacklightFixup-v{self.backlight_version}.zip")
+    def backlight_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleBacklightFixup-v{self.backlight_version}.zip")
+
    @property
-    def backlight_injector_path(self): return self.payload_kexts_path / Path(f"Misc/BacklightInjector-v{self.backlight_injector_version}.zip")
+    def backlight_injector_path(self):
+        return self.payload_kexts_path / Path(f"Misc/BacklightInjector-v{self.backlight_injector_version}.zip")
+
    @property
-    def cpufriend_path(self): return self.payload_kexts_path / Path(f"Acidanthera/CPUFriend-v{self.cpufriend_version}.zip")
+    def cpufriend_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/CPUFriend-v{self.cpufriend_version}.zip")
+
    @property
-    def nightshift_path(self): return self.payload_kexts_path / Path(f"Misc/NightShiftEnabler-v{self.nightshift_version}.zip")
+    def nightshift_path(self):
+        return self.payload_kexts_path / Path(f"Misc/NightShiftEnabler-v{self.nightshift_version}.zip")
+
    @property
-    def smcspoof_path(self): return self.payload_kexts_path / Path(f"Misc/SMC-Spoof-v{self.smcspoof_version}.zip")
+    def smcspoof_path(self):
+        return self.payload_kexts_path / Path(f"Misc/SMC-Spoof-v{self.smcspoof_version}.zip")
+
    @property
-    def cputscsync_path(self): return self.payload_kexts_path / Path(f"Acidanthera/CpuTscSync-v{self.cputscsync}.zip")
+    def nvmefix_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/NVMeFix-v{self.nvmefix_version}.zip")
+
    @property
-    def hibernationfixup_path(self): return self.payload_kexts_path / Path(f"Acidanthera/HibernationFixup-v{self.hibernationfixup}.zip")
+    def featureunlock_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/FeatureUnlock-v{self.featureunlock_version}.zip")
+
    @property
-    def nvmefix_path(self): return self.payload_kexts_path / Path(f"Acidanthera/NVMeFix-v{self.nvmefix_version}.zip")
+    def debugenhancer_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/DebugEnhancer-v{self.debugenhancer_version}.zip")
+
    @property
-    def sidecarfixup_path(self): return self.payload_kexts_path / Path(f"Acidanthera/SidecarFixup-v{self.sidecarfixup_version}.zip")
+    def innie_path(self):
+        return self.payload_kexts_path / Path(f"Misc/Innie-v{self.innie_version}.zip")
+
    @property
-    def innie_path(self): return self.payload_kexts_path / Path(f"Misc/Innie-v{self.innie_version}.zip")
+    def plist_folder_path(self):
+        return self.payload_kexts_path / Path("Plists")
+
    @property
-    def plist_folder_path(self): return self.payload_kexts_path / Path(f"Plists")
+    def platform_plugin_plist_path(self):
+        return self.plist_folder_path / Path("PlatformPlugin")
+
    @property
-    def platform_plugin_plist_path(self): return self.plist_folder_path / Path(f"PlatformPlugin")
+    def fw_family_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireFamily-v{self.fw_kext}.zip")
+
+    @property
+    def fw_sbp2_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireSBP2-v{self.fw_kext}.zip")
+
+    @property
+    def fw_bus_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireSerialBusProtocolTransport-v{self.fw_kext}.zip")

    # Build Location
    @property
-    def build_path(self): return self.current_path / Path("Build-Folder/")
-    @property
-    def opencore_release_folder(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}")
-    @property
-    def opencore_zip_copied(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}.zip")
+    def build_path(self):
+        return self.current_path / Path("Build-Folder/")

    @property
-    def oc_folder(self): return self.opencore_release_folder / Path("EFI/OC/")
+    def opencore_release_folder(self):
+        return self.build_path / Path(f"OpenCore-Build")
+
    @property
-    def plist_path(self): return self.oc_folder / Path("config.plist")
+    def opencore_zip_copied(self):
+        return self.build_path / Path(f"OpenCore-{self.opencore_build}.zip")
+
    @property
-    def acpi_path(self): return self.oc_folder / Path("ACPI")
+    def oc_folder(self):
+        return self.opencore_release_folder / Path("EFI/OC/")
+
    @property
-    def drivers_path(self): return self.oc_folder / Path("Drivers")
+    def plist_path(self):
+        return self.oc_folder / Path("config.plist")
+
    @property
-    def kexts_path(self): return self.oc_folder / Path("Kexts")
+    def acpi_path(self):
+        return self.oc_folder / Path("ACPI")
+
    @property
-    def resources_path(self): return self.oc_folder / Path("Resources")
+    def drivers_path(self):
+        return self.oc_folder / Path("Drivers")
+
    @property
-    def map_kext_folder(self): return self.kexts_path / Path("USB-Map.kext")
+    def kexts_path(self):
+        return self.oc_folder / Path("Kexts")
+
    @property
-    def map_contents_folder(self): return self.map_kext_folder / Path("Contents")
+    def resources_path(self):
+        return self.oc_folder / Path("Resources")
+
    @property
-    def pp_kext_folder(self): return self.kexts_path / Path("CPUFriendDataProvider.kext")
+    def map_kext_folder(self):
+        return self.kexts_path / Path("USB-Map.kext")
+
    @property
-    def pp_contents_folder(self): return self.pp_kext_folder / Path("Contents")
+    def map_contents_folder(self):
+        return self.map_kext_folder / Path("Contents")
+
    @property
-    def agdp_kext_folder(self): return self.kexts_path / Path("AGDP-Override.kext")
+    def pp_kext_folder(self):
+        return self.kexts_path / Path("CPUFriendDataProvider.kext")
+
    @property
-    def agdp_contents_folder(self): return self.agdp_kext_folder / Path("Contents")
+    def pp_contents_folder(self):
+        return self.pp_kext_folder / Path("Contents")
+
    @property
-    def agpm_kext_folder(self): return self.kexts_path / Path("AGPM-Override.kext")
+    def agdp_kext_folder(self):
+        return self.kexts_path / Path("AGDP-Override.kext")
+
    @property
-    def agpm_contents_folder(self): return self.agpm_kext_folder / Path("Contents")
+    def agdp_contents_folder(self):
+        return self.agdp_kext_folder / Path("Contents")
+
    @property
-    def amc_kext_folder(self): return self.kexts_path / Path("AMC-Override.kext")
+    def agpm_kext_folder(self):
+        return self.kexts_path / Path("AGPM-Override.kext")
+
    @property
-    def amc_contents_folder(self): return self.amc_kext_folder / Path("Contents")
+    def agpm_contents_folder(self):
+        return self.agpm_kext_folder / Path("Contents")
+
+    @property
+    def amc_kext_folder(self):
+        return self.kexts_path / Path("AMC-Override.kext")
+
+    @property
+    def amc_contents_folder(self):
+        return self.amc_kext_folder / Path("Contents")

    # Tools
    @property
-    def macserial_path(self): return self.payload_path / Path("Tools/macserial")
+    def macserial_path(self):
+        return self.payload_path / Path("Tools/macserial")
+
    @property
-    def gfxutil_path(self): return self.payload_path / Path("Tools/gfxutil")
+    def gfxutil_path(self):
+        return self.payload_path / Path("Tools/gfxutil")
+
    @property
-    def vault_path(self): return self.payload_path / Path("Tools/CreateVault/sign.command")
+    def vault_path(self):
+        return self.payload_path / Path("Tools/CreateVault/sign.command")

    # Icons
    @property
-    def app_icon_path(self): return self.current_path / Path("OC-Patcher.icns")
+    def app_icon_path(self):
+        return self.current_path / Path("OC-Patcher.icns")
+
    @property
-    def icon_path_external(self): return self.payload_path / Path("Icon/External/.VolumeIcon.icns")
+    def icon_path_external(self):
+        return self.payload_path / Path("Icon/External/.VolumeIcon.icns")
+
    @property
-    def icon_path_internal(self): return self.payload_path / Path("Icon/Internal/.VolumeIcon.icns")
+    def icon_path_internal(self):
+        return self.payload_path / Path("Icon/Internal/.VolumeIcon.icns")
+
    @property
-    def icon_path_sd(self): return self.payload_path / Path("Icon/SD-Card/.VolumeIcon.icns")
+    def icon_path_sd(self):
+        return self.payload_path / Path("Icon/SD-Card/.VolumeIcon.icns")
+
    @property
-    def icon_path_ssd(self): return self.payload_path / Path("Icon/SSD/.VolumeIcon.icns")
+    def icon_path_ssd(self):
+        return self.payload_path / Path("Icon/SSD/.VolumeIcon.icns")
+
    @property
-    def gui_path(self): return self.payload_path / Path("Icon/Resources.zip")
+    def gui_path(self):
+        return self.payload_path / Path("Icon/Resources.zip")

    # Apple Payloads Paths
+
    @property
-    def payload_apple_root_path_unzip(self): return self.payload_path / Path(f"Apple-Binaries-OCLP-{self.payload_version}")
+    def payload_apple_root_path_zip(self):
+        return self.payload_path / Path("Apple.zip")
+
    @property
-    def payload_apple_root_path_zip(self): return self.payload_path / Path("Apple.zip")
+    def payload_apple_root_path(self):
+        return self.payload_path / Path("Apple")
+
    @property
-    def payload_apple_root_path(self): return self.payload_path / Path("Apple")
+    def payload_apple_kexts_path(self):
+        return self.payload_apple_root_path / Path("Extensions")
+
    @property
-    def payload_apple_kexts_path(self): return self.payload_apple_root_path / Path("Extensions")
+    def payload_apple_frameworks_path(self):
+        return self.payload_apple_root_path / Path("Frameworks")
+
    @property
-    def payload_apple_frameworks_path(self): return self.payload_apple_root_path / Path("Frameworks")
+    def payload_apple_frameworks_path_accel(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration")
+
    @property
-    def payload_apple_frameworks_path_accel(self): return self.payload_apple_frameworks_path / Path("Graphics-Acceleration")
+    def payload_apple_frameworks_path_accel_ts2(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration-TeraScale-2")
+
    @property
-    def payload_apple_lauchd_path(self): return self.payload_apple_root_path / Path("LaunchDaemons")
+    def payload_apple_frameworks_path_accel_ivy(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration-Ivy-Bridge")
+
    @property
-    def payload_apple_lauchd_path_accel(self): return self.payload_apple_lauchd_path / Path("Graphics-Acceleration")
+    def payload_apple_lauchd_path(self):
+        return self.payload_apple_root_path / Path("LaunchDaemons")
+
    @property
-    def payload_apple_private_frameworks_path(self): return self.payload_apple_root_path / Path("PrivateFrameworks")
+    def payload_apple_lauchd_path_accel(self):
+        return self.payload_apple_lauchd_path / Path("Graphics-Acceleration")
+
    @property
-    def payload_apple_private_frameworks_path_accel(self): return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration")
+    def payload_apple_private_frameworks_path(self):
+        return self.payload_apple_root_path / Path("PrivateFrameworks")
+
    @property
-    def payload_apple_private_frameworks_path_brightness(self): return self.payload_apple_private_frameworks_path / Path("Brightness-Control")
+    def payload_apple_private_frameworks_path_accel(self):
+        return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration")
+
+    @property
+    def payload_apple_private_frameworks_path_accel_ts2(self):
+        return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration-TeraScale-2")
+
+    @property
+    def payload_apple_private_frameworks_path_accel_ivy(self):
+        return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration-Ivy-Bridge")
+
+    @property
+    def payload_apple_private_frameworks_path_brightness(self):
+        return self.payload_apple_private_frameworks_path / Path("Brightness-Control")

    # Apple Extensions
    @property
-    def audio_path(self): return self.payload_apple_kexts_path / Path("Audio")
+    def audio_path(self):
+        return self.payload_apple_kexts_path / Path("Audio")

    # GPU Kexts and Bundles

    @property
-    def legacy_graphics(self): return self.payload_apple_kexts_path / Path("Graphics-Acceleration")
-    @property
-    def legacy_nvidia_path(self): return self.legacy_graphics / Path("Nvidia-Tesla-Fermi")
-    @property
-    def legacy_nvidia_kepler_path(self): return self.legacy_graphics / Path("Nvidia-Kepler")
-    @property
-    def legacy_amd_path(self): return self.legacy_graphics / Path("AMD-ATI")
-    @property
-    def legacy_intel_gen1_path(self): return self.legacy_graphics / Path("Intel-Gen5-Ironlake")
-    @property
-    def legacy_intel_gen2_path(self): return self.legacy_graphics / Path("Intel-Gen6-SandyBridge")
-    @property
-    def legacy_intel_gen3_path(self): return self.legacy_graphics / Path("Intel-Gen7-IvyBridge")
-    @property
-    def legacy_general_path(self): return self.legacy_graphics / Path("General-Patches")
+    def legacy_graphics(self):
+        return self.payload_apple_kexts_path / Path("Graphics-Acceleration")

    @property
-    def legacy_brightness(self): return self.payload_apple_kexts_path / Path("Brightness-Control")
+    def legacy_nvidia_path(self):
+        return self.legacy_graphics / Path("Nvidia-Tesla")

-    # Apple Frameworks
    @property
-    def coredisplay_path(self): return self.payload_apple_frameworks_path_accel / Path("CoreDisplay.framework")
-    @property
-    def iosurface_f_path(self): return self.payload_apple_frameworks_path_accel / Path("IOSurface.framework")
-    @property
-    def opengl_path(self): return self.payload_apple_frameworks_path_accel / Path("OpenGL.framework")
+    def legacy_nvidia_kepler_path(self):
+        return self.legacy_graphics / Path("Nvidia-Kepler")

-    # Apple LaunchDaemons
    @property
-    def hiddhack_path(self): return self.payload_apple_lauchd_path_accel / Path("IOHID-Fixup.plist")
-    @property
-    def legacy_hiddhack_path(self): return self.payload_apple_lauchd_path_accel / Path("HiddHack.plist")
+    def legacy_amd_path(self):
+        return self.legacy_graphics / Path("AMD-TeraScale")

-    # Apple PrivateFrameworks
    @property
-    def gpusupport_path(self): return self.payload_apple_private_frameworks_path_accel / Path("GPUSupport.framework")
+    def legacy_amd_path_ts2(self):
+        return self.legacy_graphics / Path("AMD-TeraScale-2")
+
    @property
-    def skylight_path(self): return self.payload_apple_private_frameworks_path_accel / Path("SkyLight.framework")
+    def legacy_intel_gen1_path(self):
+        return self.legacy_graphics / Path("Intel-Gen5-Ironlake")
+
+    @property
+    def legacy_intel_gen2_path(self):
+        return self.legacy_graphics / Path("Intel-Gen6-SandyBridge")
+
+    @property
+    def legacy_intel_gen3_path(self):
+        return self.legacy_graphics / Path("Intel-Gen7-IvyBridge")
+
+    @property
+    def legacy_general_path(self):
+        return self.legacy_graphics / Path("General-Patches")
+
+    @property
+    def legacy_brightness(self):
+        return self.payload_apple_kexts_path / Path("Brightness-Control")

    csr_values = {
-        "CSR_ALLOW_UNTRUSTED_KEXTS":            False,  # 0x1   - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_UNRESTRICTED_FS":            False,  # 0x2   - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_TASK_FOR_PID":               False,  # 0x4   - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_KERNEL_DEBUGGER":            False,  # 0x8   - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_APPLE_INTERNAL":             False,  # 0x10  - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_UNRESTRICTED_DTRACE":        False,  # 0x20  - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_UNRESTRICTED_NVRAM":         False,  # 0x40  - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_DEVICE_CONFIGURATION":       False,  # 0x80  - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_ANY_RECOVERY_OS":            False,  # 0x100 - Introduced in Sierra      # noqa: E241
-        "CSR_ALLOW_UNAPPROVED_KEXTS":           False,  # 0x200 - Introduced in High Sierra # noqa: E241
-        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE": False,  # 0x400 - Introduced in Mojave      # noqa: E241
-        "CSR_ALLOW_UNAUTHENTICATED_ROOT":       False,  # 0x800 - Introduced in Big Sur     # noqa: E241
+        "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 Debugging          - 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_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 Device Configuration(?)   - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_ANY_RECOVERY_OS": False,  # 0x100 - Disable BaseSystem Verification - Introduced in Sierra      # noqa: E241
+        "CSR_ALLOW_UNAPPROVED_KEXTS": False,  # 0x200 - Allow Unapproved Kexts          - Introduced in High Sierra # noqa: E241
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE": False,  # 0x400 - Override Executable Policy      - Introduced in Mojave      # noqa: E241
+        "CSR_ALLOW_UNAUTHENTICATED_ROOT": False,  # 0x800 - Allow Root Volume Mounting      - Introduced in Big Sur     # noqa: E241
    }

+    root_patch_sip_mojave = [
+        # Variables required to root patch in Mojave and Catalina
+        "CSR_ALLOW_UNTRUSTED_KEXTS",
+        "CSR_ALLOW_UNRESTRICTED_FS",
+        "CSR_ALLOW_UNAPPROVED_KEXTS",
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE",
+    ]
+
+    root_patch_sip_big_sur = [
+        # Variables required to root patch in Big Sur and Monterey
+        "CSR_ALLOW_UNTRUSTED_KEXTS",
+        "CSR_ALLOW_UNRESTRICTED_FS",
+        "CSR_ALLOW_UNAPPROVED_KEXTS",
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE",
+        "CSR_ALLOW_UNAUTHENTICATED_ROOT",
+    ]
+
    sbm_values = [
        "j137",
        "j680",
@@ -377,6 +576,15 @@ class Constants:
        "j185f",
    ]

+    sandy_board_id = [
+        "Mac-E43C1C25D4880AD6",
+        "Mac-06F11F11946D27C5",
+        "Mac-9F18E312C5C2BF0B",
+        "Mac-937CB26E2E02BB01",
+        "Mac-35C5E08120C7EEAF",
+        "Mac-7BA5B2D9E42DDD94",
+    ]
+
    board_id = {
        "MacBook1,1": "Mac-F4208CC8",
        "MacBook2,1": "Mac-F4208CA9",
@@ -402,7 +610,7 @@ class Constants:
        "MacBookAir7,1": "Mac-9F18E312C5C2BF0B",
        "MacBookAir7,2": "Mac-937CB26E2E02BB01",
        "MacBookAir8,1": "Mac-827FAC58A8FDFA22",
-        "MacBookAir8,1": "Mac-226CB3C6A851A671",
+        "MacBookAir8,2": "Mac-226CB3C6A851A671",
        "MacBookAir9,1": "Mac-0CFF9C7C2B63DF8D",
        "MacBookPro1,1": "Mac-F425BEC8",
        "MacBookPro1,2": "Mac-F42DBEC8",
@@ -465,14 +673,13 @@ class Constants:
        "iMac8,1": "Mac-F227BEC8",
        "iMac9,1": "Mac-F2218FA9",
        "iMac10,1": "Mac-F221DCC8",
-        "iMac10,1": "Mac-F2268CC8",
+        # "iMac10,1": "Mac-F2268CC8",
        "iMac11,1": "Mac-F2268DAE",
        "iMac11,2": "Mac-F2238AC8",
        "iMac11,3": "Mac-F2238BAE",
        "iMac12,1": "Mac-942B5BF58194151B",
        "iMac12,2": "Mac-942B59F58194171B",
        "iMac13,1": "Mac-00BE6ED71E35EB86",
-        "iMac13,1": "Mac-00BE6ED71E35EB86",
        "iMac13,2": "Mac-FC02E91DDD3FA6A4",
        "iMac13,3": "Mac-7DF2A3B5E5D671ED",
        "iMac14,1": "Mac-031B6874CF7F642A",
@@ -501,4 +708,4 @@ class Constants:
        "Xserve1,1": "Mac-F4208AC8",
        "Xserve2,1": "Mac-F42289C8",
        "Xserve3,1": "Mac-F223BEC8",
-    }
+    }
--- a/Resources/DeviceProbe.py
+++ b/Resources/DeviceProbe.py
@@ -1,106 +0,0 @@
-# Probe devices, return device entries
-# Copyright (C) 2021 Mykola Grymalyuk
-from __future__ import print_function
-
-import binascii
-import plistlib
-import subprocess
-
-from Resources import Constants, Utilities
-
-class pci_probe:
-    def __init__(self):
-        self.constants = Constants.Constants()
-
-    # Converts given device IDs to DeviceProperty pathing, requires ACPI pathing as DeviceProperties shouldn't be used otherwise
-    def deviceproperty_probe(self, vendor_id, device_id, acpi_path):
-        gfxutil_output: str = subprocess.run([self.constants.gfxutil_path] + f"-v".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-        try:
-            if acpi_path == "":
-                acpi_path = "No ACPI Path Given"
-                raise IndexError
-            device_path = [line.strip().split("= ", 1)[1] for line in gfxutil_output.split("\n") if f'{vendor_id}:{device_id}'.lower() in line.strip() and acpi_path in line.strip()][0]
-            return device_path
-        except IndexError:
-            print(f"- No DevicePath found for {vendor_id}:{device_id} ({acpi_path})")
-            return ""
-
-    # Returns the device path of parent controller
-    def device_property_parent(self, device_path):
-        device_path_parent = "/".join(device_path.split("/")[:-1])
-        return device_path_parent
-
-    def acpi_strip(self, acpi_path_full):
-        # Strip IOACPIPlane:/_SB, remove 000's, convert ffff into 0 and finally make everything upper case
-        # IOReg                                      | gfxutil
-        # IOACPIPlane:/_SB/PC00@0/DMI0@0             -> /PC00@0/DMI0@0
-        # IOACPIPlane:/_SB/PC03@0/BR3A@0/SL09@ffff   -> /PC03@0/BR3A@0/SL09@0
-        # IOACPIPlane:/_SB/PC03@0/M2U0@150000        -> /PC03@0/M2U0@15
-        # IOACPIPlane:/_SB/PC01@0/CHA6@100000        -> /PC01@0/CHA6@10
-        # IOACPIPlane:/_SB/PC00@0/RP09@1d0000/PXSX@0 -> /PC00@0/RP09@1D/PXSX@0
-        # IOACPIPlane:/_SB/PCI0@0/P0P2@10000         -> /PCI0@0/P0P2@1
-        acpi_path = acpi_path_full.replace("IOACPIPlane:/_SB", "")
-        acpi_path = acpi_path.replace("0000", "")
-        acpi_path = acpi_path.replace("0001", "")
-        acpi_path = acpi_path.replace("ffff", "0")
-        acpi_path = acpi_path.upper()
-        return acpi_path
-
-    # Note gpu_probe should only be used on IGPU and GFX0 entries
-    def gpu_probe(self, gpu_type):
-        try:
-            devices = plistlib.loads(subprocess.run(f"ioreg -r -n {gpu_type} -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            vendor_id = Utilities.hexswap(binascii.hexlify(devices[0]["vendor-id"]).decode()[:4])
-            device_id = Utilities.hexswap(binascii.hexlify(devices[0]["device-id"]).decode()[:4])
-            try:
-                acpi_path = devices[0]["acpi-path"]
-                acpi_path = self.acpi_strip(acpi_path)
-                return vendor_id, device_id, acpi_path
-            except KeyError:
-                print(f"- No ACPI entry found for {gpu_type}")
-                return vendor_id, device_id, ""
-        except ValueError:
-            print(f"- No IOService entry found for {gpu_type} (V)")
-            return "", "", ""
-        except IndexError:
-            print(f"- No IOService entry found for {gpu_type} (I)")
-            return "", "", ""
-
-    def wifi_probe(self):
-        devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        try:
-            devices = [i for i in devices if i["class-code"] == binascii.unhexlify(self.constants.classcode_wifi)]
-            vendor_id = Utilities.hexswap(binascii.hexlify(devices[0]["vendor-id"]).decode()[:4])
-            device_id = Utilities.hexswap(binascii.hexlify(devices[0]["device-id"]).decode()[:4])
-            ioname = devices[0]["IOName"]
-            try:
-                acpi_path = devices[0]["acpi-path"]
-                acpi_path = self.acpi_strip(acpi_path)
-                return vendor_id, device_id, ioname, acpi_path
-            except KeyError:
-                print(f"- No ACPI entry found for {vendor_id}:{device_id}")
-                return vendor_id, device_id, ioname, ""
-        except ValueError:
-            print(f"- No IOService entry found for Wireless Card (V)")
-            return "", "", "", ""
-        except IndexError:
-            print(f"- No IOService entry found for Wireless Card (I)")
-            return "", "", "", ""
-
-class smbios_probe:
-    def model_detect(self, custom):
-        opencore_model: str = subprocess.run("nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:oem-product".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-        if not opencore_model.startswith("nvram: Error getting variable") and custom is False:
-            current_model = [line.strip().split(":oem-product	", 1)[1] for line in opencore_model.split("\n") if line.strip().startswith("4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:")][0]
-        else:
-            current_model = plistlib.loads(subprocess.run("system_profiler -detailLevel mini -xml SPHardwareDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.strip())[0]["_items"][0]["machine_model"]
-        return current_model
-
-    def board_detect(self, custom):
-        opencore_model: str = subprocess.run("nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:oem-board".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-        if not opencore_model.startswith("nvram: Error getting variable") and custom is False:
-            current_model = [line.strip().split(":oem-board	", 1)[1] for line in opencore_model.split("\n") if line.strip().startswith("4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:")][0]
-        else:
-            current_model = plistlib.loads(subprocess.run(f"ioreg -p IODeviceTree -r -n / -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            current_model = current_model[0]["board-id"]
-        return current_model
--- a/Resources/ModelArray.py
+++ b/Resources/ModelArray.py
@@ -1,16 +1,13 @@
 # Lists all models and required patches
 # Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
 SupportedSMBIOS = [
-    # To be overwritten on program start
-]
-
-SupportedSMBIOS11 = [
    # MacBook
    "MacBook4,1",
    "MacBook5,1",
    "MacBook5,2",
    "MacBook6,1",
    "MacBook7,1",
+    "MacBook8,1",
    # MacBook Air
    "MacBookAir2,1",
    "MacBookAir3,1",
@@ -19,6 +16,8 @@ SupportedSMBIOS11 = [
    "MacBookAir4,2",
    "MacBookAir5,1",
    "MacBookAir5,2",
+    "MacBookAir6,1",
+    "MacBookAir6,2",
    # MacBook Pro
    "MacBookPro4,1",
    "MacBookPro5,1",
@@ -36,6 +35,9 @@ SupportedSMBIOS11 = [
    "MacBookPro9,2",
    "MacBookPro10,1",
    "MacBookPro10,2",
+    "MacBookPro11,1",
+    "MacBookPro11,2",
+    "MacBookPro11,3",
    # Mac Mini
    "Macmini3,1",
    "Macmini4,1",
@@ -60,6 +62,8 @@ SupportedSMBIOS11 = [
    "iMac14,1",
    "iMac14,2",
    "iMac14,3",
+    "iMac14,4",
+    "iMac15,1",
    # Mac Pro
    "MacPro3,1",
    "MacPro4,1",
@@ -70,10 +74,6 @@ SupportedSMBIOS11 = [
    "Dortania1,1",
 ]

-SupportedSMBIOS12 = [
-
-]
-
 # CPU patches

 MissingSSE42 = [
@@ -100,32 +100,14 @@ MissingSSE42 = [
    "iMac10,1",
    "MacPro3,1",
    "Xserve2,1",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

-SSEEmulator = [
-    "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"
-]
+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"
-]
+pciSSDT = ["MacBookPro6,1", "MacBookPro6,2", "iMac11,1", "iMac11,2", "iMac11,3", "Dortania1,1"]

 # Ethernet patches

@@ -142,16 +124,12 @@ EthernetNvidia = [
    "Macmini3,1",
    "iMac9,1",
    "iMac10,1",
-    "Dortania1,1"
-]
-EthernetMarvell = [
-    "MacBook4,1",
-    "MacBookPro4,1",
-    "iMac7,1",
-    "iMac8,1",
-    "Dortania1,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",
@@ -167,31 +145,14 @@ EthernetBroadcom = [
    "iMac11,3",
    "iMac12,1",
    "iMac12,2",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

 # Wifi patches

-WifiAtheros = [
-    "iMac10,1",
-    "iMac11,1",
-    "iMac11,2",
-    "iMac11,3",
-    "iMac12,1",
-    "iMac12,2",
-    "MacPro3,1",
-    "MacPro4,1",
-    "Dortania1,1"
-]
+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"
-]
+WifiBCM94328 = ["MacBook4,1", "MacBookAir2,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "Dortania1,1"]

 WifiBCM94322 = [
    "MacBook5,1",
@@ -207,12 +168,12 @@ WifiBCM94322 = [
    "Macmini3,1",
    "iMac9,1",
    "MacPro5,1",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

 WifiBCM94331 = [
-    "MacBook6,1",    # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBook7,1",    # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
+    "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)
@@ -226,16 +187,16 @@ WifiBCM94331 = [
    "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"
+    "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
@@ -268,8 +229,8 @@ LegacyAudio = [
    "Macmini5,1",
    "Macmini5,2",
    "Macmini5,3",
-    #"iMac7,1",
-    #"iMac8,1",
+    # "iMac7,1",
+    # "iMac8,1",
    "iMac9,1",
    "iMac10,1",
    "iMac11,1",
@@ -278,7 +239,7 @@ LegacyAudio = [
    "iMac12,1",
    "iMac12,2",
    "MacPro3,1",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

 nvidiaHDEF = [
@@ -298,11 +259,24 @@ nvidiaHDEF = [
    "Macmini3,1",
    "Macmini4,1",
    "iMac9,1",
-    "iMac10,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
@@ -340,7 +314,7 @@ LegacyGPU = [
    "iMac11,3",  # AMD 5000
    "iMac12,1",  # AMD 6000
    "iMac12,2",  # AMD 6000
-    "Dortania1,1"  # RTX 3080
+    "Dortania1,1",  # RTX 3080
 ]

 LegacyGPUNvidia = [
@@ -432,15 +406,10 @@ LegacyHID = [
    "iMac9,1",
    "iMac10,1",
    "MacPro3,1",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

-NVMePatch = [
-    "MacPro3,1",
-    "MacPro4,1",
-    "Xserve3,1",
-    "Dortania1,1"
-]
+NVMePatch = ["MacPro3,1", "MacPro4,1", "Xserve3,1", "Dortania1,1"]

 XhciSupport = [
    "MacBookAir5,1",
@@ -472,17 +441,39 @@ XhciSupport = [
    "iMac16,1",
    "iMac16,2",
    "MacPro6,1",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

 SidecarPatch = [
+    "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",
    "MacBookAir7,1",
    "MacBookAir7,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",
@@ -493,9 +484,30 @@ SidecarPatch = [
    "MacBookPro11,4",
    "MacBookPro11,5",
    "MacBookPro12,1",
+    "MacBookPro13,1",
+    "MacBookPro13,2",
+    "MacBookPro13,3",
+    "MacBookPro14,1",
+    "MacBookPro14,2",
+    "MacBookPro14,3",
+    "Macmini3,1",
+    "Macmini4,1",
+    "Macmini5,1",
+    "Macmini5,2",
+    "Macmini5,3",
    "Macmini6,1",
    "Macmini6,2",
    "Macmini7,1",
+    "Macmini8,1",
+    "iMac7,1",
+    "iMac8,1",
+    "iMac9,1",
+    "iMac10,1",
+    "iMac11,1",
+    "iMac11,2",
+    "iMac11,3",
+    "iMac12,1",
+    "iMac12,2",
    "iMac13,1",
    "iMac13,2",
    "iMac13,3",
@@ -505,9 +517,15 @@ SidecarPatch = [
    "iMac15,1",
    "iMac16,1",
    "iMac16,2",
+    "iMac17,1",
+    "iMac18,1",
+    "iMac18,2",
+    "iMac18,3",
+    "MacPro3,1",
+    "MacPro4,1",
    "MacPro5,1",
    "MacPro6,1",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

 DualGPUPatch = [
@@ -525,11 +543,12 @@ DualGPUPatch = [
    "iMac13,2",
    "iMac14,2",
    "iMac14,3",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

 DualGPUPatchRetina = [
    "MacBookPro10,1",
+    "MacBookPro11,3",
 ]

 IntelNvidiaDRM = [
@@ -539,30 +558,19 @@ IntelNvidiaDRM = [
    "iMac14,3",
 ]

-HiDPIpicker = [
-    "MacBookPro10,1",
-    "MacBookPro10,2",
-    "Dortania1,1"
-]
+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"
-]
+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",
 ]

-# MacBook and 13" Air
+# Classic MacBook and 13" Air
 MacBookAir62 = [
    "MacBook4,1",
    "MacBook5,1",
@@ -572,7 +580,13 @@ MacBookAir62 = [
    "MacBookAir2,1",
    "MacBookAir3,2",
    "MacBookAir4,2",
-    "MacBookAir5,2"
+    "MacBookAir5,2",
+    "MacBookAir6,2",
+]
+
+# Retina MacBook
+MacBook81 = [
+    "MacBook8,1",
 ]

 # MacBook Pro 13"
@@ -583,9 +597,14 @@ MacBookPro111 = [
    "MacBookPro8,1",
    "MacBookPro9,2",
    "MacBookPro10,2",
+    "MacBookPro11,1",
 ]

-# MacBook Pro 15" and 17"
+# MacBook Pro 15" (iGPU)
+
+MacBookPro112 = ["MacBookPro11,2"]
+
+# MacBook Pro 15" and 17" (dGPU)

 MacBookPro113 = [
    "MacBookPro4,1",
@@ -599,19 +618,12 @@ MacBookPro113 = [
    "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"
-]
+Macmini71 = ["Macmini3,1", "Macmini4,1", "Macmini5,1", "Macmini5,2", "Macmini5,3", "Macmini6,1", "Macmini6,2"]
 # iMacPro = dGPU only iMacs
 iMacPro11 = [
    "iMac7,1",
@@ -629,23 +641,14 @@ iMacPro11 = [
 iMac151 = [
    "iMac13,2",
    "iMac14,2",
-    "iMac14,3"
+    "iMac14,3",
+    "iMac15,1",
 ]
 # iMac = Intel iGPU
-iMac144 = [
-    "iMac13,1",
-    "iMac14,1"
-]
+iMac144 = ["iMac13,1", "iMac14,1", "iMac14,4"]

 # Mac Pro and Xserve
-MacPro71 = [
-    "MacPro3,1",
-    "MacPro4,1",
-    "MacPro5,1",
-    "Xserve2,1",
-    "Xserve3,1",
-    "Dortania1,1"
-]
+MacPro71 = ["MacPro3,1", "MacPro4,1", "MacPro5,1", "Xserve2,1", "Xserve3,1", "Dortania1,1"]

 XXerve = [
    "Xserve3,1",
@@ -740,32 +743,51 @@ ControllerTypes = [
    "-InternalHub",
 ]

-upgradableMXMGPUs = [
-    "iMac10,1"
+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"
-]
-
-NightShiftExclude = [
-    "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",
+    "Dortania1,1",
 ]

 UGAtoGOP = [
@@ -777,17 +799,51 @@ UGAtoGOP = [
    "Xserve2,1",
 ]

-NoSATAPatch = [
-    "MacBookAir5,1",
-    "MacBookAir5,2",
-    "MacBookPro10,1",
-    "MacBookPro10,2",
-    "iMac13,1",
-    "iMac13,2",
-    "iMac13,3",
-    "iMac14,1",
-    "iMac14,2",
-    "iMac14,3",
+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 = [
@@ -809,7 +865,7 @@ NoAPFSsupport = [
    "MacPro4,1",
    "Xserve2,1",
    "Xserve3,1",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

 NoRootPatch11 = [
@@ -859,7 +915,7 @@ NoExFat = [
    "MacPro5,1",
    "Xserve2,1",
    "Xserve3,1",
-    "Dortania1,1"
+    "Dortania1,1",
 ]

 SandyIGPU = [
@@ -897,14 +953,7 @@ windows_audio = [
    "iMac13,3",
 ]

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

 AGDPSupport = [
    "MacBookPro9,1",
@@ -914,180 +963,35 @@ AGDPSupport = [
    "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"
+    # "MacBookPro9,1",
+    # "MacBookPro10,1"
 ]

-DeleteNvidiaAccel11 = [
-    "AMDRadeonX4000.kext",
-    "AMDRadeonX4000HWServices.kext",
-    "AMDRadeonX5000.kext",
-    "AMDRadeonX5000HWServices.kext",
-    "AMDRadeonX6000.kext",
-    "AMDRadeonX6000Framebuffer.kext",
-    "AMDRadeonX6000HWServices.kext",
-    "AppleIntelBDWGraphics.kext",
-    "AppleIntelBDWGraphicsFramebuffer.kext",
-    "AppleIntelCFLGraphicsFramebuffer.kext",
-    "AppleIntelHD4000Graphics.kext",
-    "AppleIntelHD5000Graphics.kext",
-    "AppleIntelICLGraphics.kext",
-    "AppleIntelICLLPGraphicsFramebuffer.kext",
-    "AppleIntelKBLGraphics.kext",
-    "AppleIntelKBLGraphicsFramebuffer.kext",
-    "AppleIntelSKLGraphics.kext",
-    "AppleIntelSKLGraphicsFramebuffer.kext",
-    "AppleIntelFramebufferAzul.kext",
-    "AppleIntelFramebufferCapri.kext",
-    "AppleParavirtGPU.kext",
-    "GeForce.kext",
-    "IOAcceleratorFamily2.kext",
-    "IOGPUFamily.kext",
+NoFireWireSupport = [
+    "MacBook5,1",
+    "MacBook6,1",
+    "MacBook7,1",
+    "MacBookAir1,1",
+    "MacBookAir2,1",
+    "MacBookAir3,1",
+    "MacBookAir3,2",
 ]

-DeleteAMDAccel11 = [
-    "AMDRadeonX4000.kext",
-    "AMDRadeonX4000HWServices.kext",
-    "AMDRadeonX5000.kext",
-    "AMDRadeonX5000HWServices.kext",
-    "AMDRadeonX6000.kext",
-    "AMDRadeonX6000Framebuffer.kext",
-    "AMDRadeonX6000HWServices.kext",
-    "AMD7000Controller.kext",  # AMDSupport Dependency
-    "AMD8000Controller.kext",  # AMDSupport Dependency
-    "AMD9000Controller.kext",  # AMDSupport Dependency
-    "AMD9500Controller.kext",  # AMDSupport Dependency
-    "AMD10000Controller.kext",  # AMDSupport Dependency
-    "AppleIntelBDWGraphics.kext",
-    "AppleIntelBDWGraphicsFramebuffer.kext",
-    "AppleIntelCFLGraphicsFramebuffer.kext",
-    "AppleIntelHD4000Graphics.kext",
-    "AppleIntelHD5000Graphics.kext",
-    "AppleIntelICLGraphics.kext",
-    "AppleIntelICLLPGraphicsFramebuffer.kext",
-    "AppleIntelKBLGraphics.kext",
-    "AppleIntelKBLGraphicsFramebuffer.kext",
-    "AppleIntelSKLGraphics.kext",
-    "AppleIntelSKLGraphicsFramebuffer.kext",
-    "AppleIntelFramebufferAzul.kext",
-    "AppleIntelFramebufferCapri.kext",
-    "AppleParavirtGPU.kext",
-    "GeForce.kext",
-    "IOGPUFamily.kext",
-]
-
-AddNvidiaAccel11 = [
-    "GeForceGA.bundle",
-    "GeForceTesla.kext",
-    "GeForceTeslaGLDriver.bundle",
-    "GeForceTeslaVADriver.bundle",
-    "NVDANV50HalTesla.kext",
-    "NVDAResmanTesla.kext",
-    "IOSurface.kext",
-]
-
-AddNvidiaKeplerAccel11 = [
-    "GeForce.kext",
-    "GeForceAIRPlugin.bundle",
-    "GeForceGLDriver.bundle",
-    "GeForceMTLDriver.bundle",
-    "GeForceVADriver.bundle",
-    "NVDAGF100Hal.kext",
-    "NVDAGK100Hal.kext",
-    "NVDAResman.kext",
-    "NVDAStartup.kext",
-    "NVSMU.kext",
-]
-
-AddAMDAccel11 = [
-    "AMD2400Controller.kext",
-    "AMD2600Controller.kext",
-    "AMD3800Controller.kext",
-    "AMD4600Controller.kext",
-    "AMD4800Controller.kext",
-    "AMD5000Controller.kext",
-    "AMD6000Controller.kext",
-    "AMDFramebuffer.kext",
-    "AMDLegacyFramebuffer.kext",
-    "AMDLegacySupport.kext",
-    "AMDRadeonVADriver.bundle",
-    "AMDRadeonVADriver2.bundle",
-    #"AMDRadeonX3000.kext",
-    "AMDRadeonX3000GLDriver.bundle",
-    "AMDShared.bundle",
-    "AMDSupport.kext",
-    "ATIRadeonX2000.kext",
-    "ATIRadeonX2000GA.plugin",
-    "ATIRadeonX2000GLDriver.bundle",
-    "ATIRadeonX2000VADriver.bundle",
-]
-
-AddIntelGen1Accel = [
-    "AppleIntelHDGraphics.kext",
-    "AppleIntelHDGraphicsFB.kext",
-    "AppleIntelHDGraphicsGA.plugin",
-    "AppleIntelHDGraphicsGLDriver.bundle",
-    "AppleIntelHDGraphicsVADriver.bundle",
-]
-
-AddIntelGen2Accel = [
-    "AppleIntelHD3000Graphics.kext",
-    "AppleIntelHD3000GraphicsGA.plugin",
-    "AppleIntelHD3000GraphicsGLDriver.bundle",
-    "AppleIntelHD3000GraphicsVADriver.bundle",
-    "AppleIntelSNBGraphicsFB.kext",
-    "AppleIntelSNBVA.bundle",
-]
-
-AddIntelGen3Accel = [
-    "AppleIntelFramebufferCapri.kext",
-    "AppleIntelHD4000Graphics.kext",
-    "AppleIntelHD4000GraphicsGLDriver.bundle",
-    "AppleIntelHD4000GraphicsMTLDriver.bundle",
-    "AppleIntelHD4000GraphicsVADriver.bundle",
-]
-
-AddGeneralAccel = [
-    # Below 5 from dosdude1, unknown whether they benifit
-    #"AppleGraphicsControl.kext",
-    #"AppleGraphicsPowerManagement.kext",
-    #"AppleMCCSControl.kext",
-    #"IOGraphicsFamily.kext",
-    #"IONDRVSupport.kext",
-    "IOAcceleratorFamily2.kext",
-    "IOSurface.kext"
-]
-
-DeleteBrightness = [
-    "AppleGraphicsControl.kext/Contents/PlugIns/AGDCBacklightControl.kext"
-]
-
-AddBrightness = [
-    "AppleBacklight.kext",
-    "AppleBacklightExpert.kext",
-]
-
-AddVolumeControl = [
-    "AppleHDA.kext",
-    "IOAudioFamily.kext",
-]
-
-DeleteVolumeControl = [
-    "AppleVirtIO.kext",
-    "AppleVirtualGraphics.kext",
-    "AppleVirtualPlatform.kext",
-    "ApplePVPanic.kext",
-    "AppleVirtIOStorage.kext",
-]
-
-RecoveryIgnore = [
-    "Update",
-    "VM",
-    "Recovery",
-    "Preboot"
-]
+RecoveryIgnore = ["Update", "VM", "Recovery", "Preboot"]
--- a/Resources/PCIIDArray.py
+++ b/Resources/PCIIDArray.py
--- a/Resources/SysPatch.py
+++ b/Resources/SysPatch.py
@@ -6,166 +6,60 @@
 # - Work-around battery throttling on laptops with no battery (IOPlatformPluginFamily.kext/Contents/PlugIns/ACPI_SMC_PlatformPlugin.kext/Contents/Resources/)

 import os
-import plistlib
 import shutil
 import subprocess
 import zipfile
 from pathlib import Path
-from typing import Any

-from Resources import Constants, DeviceProbe, ModelArray, PCIIDArray, Utilities
+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.sip_patch_status = True
+        self.computer = self.constants.computer
        self.root_mount_path = None
-        self.sip_status = 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.brightness_legacy = False
+        self.legacy_audio = False
+        self.added_legacy_kexts = False
+        self.amfi_must_disable = False
+        self.check_board_id = False
+        self.bad_board_id = False
+        self.no_patch = True

-        # TODO: Put this in a better place
-        if self.constants.recovery_status is True:
-            if not Path("/Volumes/mnt1").exists:
-                self.elevated(["mkdir", "/Volumes/mnt1"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            self.mount_location = "/Volumes/mnt1"
-        else:
+        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([Any], returncode=0):
-        if os.getuid() == 0:
+    def elevated(self, *args, **kwargs) -> subprocess.CompletedProcess:
+        if os.getuid() == 0 or self.constants.gui_mode is True:
            return subprocess.run(*args, **kwargs)
        else:
            return subprocess.run(["sudo"] + [args[0][0]] + args[0][1:], **kwargs)

-    def csr_decode(self, print_status):
-        sip_int = int.from_bytes(self.sip_status, byteorder="little")
-        i = 0
-        for current_sip_bit in self.constants.csr_values:
-            if sip_int & (1 << i):
-                temp = True
-                self.constants.csr_values[current_sip_bit] = True
-            else:
-                temp = False
-            if print_status is True:
-                print(f"- {current_sip_bit}\t {temp}")
-            i = i + 1
-
-        sip_needs_change = all(
-            self.constants.csr_values[i]
-            for i in [
-                "CSR_ALLOW_UNTRUSTED_KEXTS",
-                "CSR_ALLOW_UNRESTRICTED_FS",
-                "CSR_ALLOW_UNRESTRICTED_DTRACE",
-                "CSR_ALLOW_UNRESTRICTED_NVRAM",
-                "CSR_ALLOW_DEVICE_CONFIGURATION",
-                "CSR_ALLOW_UNAPPROVED_KEXTS",
-                "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE",
-                "CSR_ALLOW_UNAUTHENTICATED_ROOT",
-            ]
-        )
-        if sip_needs_change is True:
-            self.sip_patch_status = False
-        else:
-            self.sip_patch_status = True
-
-    def recovery_root_mount(self):
-        def human_fmt(num):
-            for unit in ["B", "KB", "MB", "GB", "TB", "PB"]:
-                if abs(num) < 1000.0:
-                    return "%3.1f %s" % (num, unit)
-                num /= 1000.0
-            return "%.1f %s" % (num, "EB")
-
-        print("- Starting Root Volume Picker")
-        # Planned logic:
-        # Load "diskutil list -plist"
-        # Find all APFSVolumes entries where VolumeName is not named Update, VM, Recovery or Preboot
-        # Omit any VolumeName entries containing "- Data"
-        # Parse remianing options for macOS 11.x with /Volumes/$disk/System/Library/CoreServices/SystemVersion.plist
-        # List remaining drives as user options
-        all_disks = {}
-        disks = plistlib.loads(subprocess.run("diskutil list -plist".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        for disk in disks["AllDisksAndPartitions"]:
-            disk_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            try:
-                all_disks[disk["DeviceIdentifier"]] = {"identifier": disk_info["DeviceNode"], "name": disk_info["MediaName"], "size": disk_info["TotalSize"], "partitions": {}}
-                for partition in disk["Partitions"] + disk.get("APFSVolumes", []):
-                    partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {partition['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-                    all_disks[disk["DeviceIdentifier"]]["partitions"][partition["DeviceIdentifier"]] = {
-                        "fs": partition_info.get("FilesystemType", partition_info["Content"]),
-                        "type": partition_info["Content"],
-                        "name": partition_info.get("VolumeName", ""),
-                        "size": partition_info["TotalSize"],
-                        "sealed": partition_info.get("Sealed", "No"),
-                    }
-            except KeyError:
-                # Avoid crashing with CDs installed
-                continue
-        menu = Utilities.TUIMenu(
-            ["Select Disk"],
-            "Please select the disk you would like to patch: ",
-            in_between=["Missing disks? Ensure they have a macOS Big Sur install present."],
-            return_number_instead_of_direct_call=True,
-            loop=True,
-        )
-        for disk in all_disks:
-            if not any(all_disks[disk]["partitions"][partition]["fs"] == "apfs" for partition in all_disks[disk]["partitions"]):
-                continue
-            menu.add_menu_option(f"{disk}: {all_disks[disk]['name']} ({human_fmt(all_disks[disk]['size'])})", key=disk[4:])
-
-        response = menu.start()
-
-        if response == -1:
-            return
-
-        disk_identifier = "disk" + response
-        selected_disk = all_disks[disk_identifier]
-
-        menu = Utilities.TUIMenu(
-            ["Select Partition"],
-            "Please select the partition you would like to install OpenCore to: ",
-            return_number_instead_of_direct_call=True,
-            loop=True,
-            in_between=["Missing disks? Ensure they have a macOS Big Sur install present.", "", "* denotes likely candidate."],
-        )
-        # TODO: check if Big Sur, when macOS 12 comes out
-        for partition in selected_disk["partitions"]:
-            if selected_disk["partitions"][partition]["fs"] != "apfs":
-                continue
-            text = f"{partition}: {selected_disk['partitions'][partition]['name']} ({human_fmt(selected_disk['partitions'][partition]['size'])})"
-            if selected_disk["partitions"][partition]["sealed"] != "No":
-                text += " *"
-            menu.add_menu_option(text, key=partition[len(disk_identifier) + 1 :])
-
-        response = menu.start()
-
-        if response == -1:
-            return
-        else:
-            return f"{disk_identifier}s{response}"
-
    def find_mount_root_vol(self, patch):
-        if self.constants.recovery_status is True:
-            print("- Running RecoveryOS logic")
-            self.root_mount_path = self.recovery_root_mount()
-            if not self.root_mount_path:
-                return
-            print(f"- Root Mount Path: {self.root_mount_path}")
-            if not Path(self.constants.payload_mnt1_path).exists():
-                print("- Creating mnt1 folder")
-                Path(self.constants.payload_mnt1_path).mkdir()
-        else:
-            root_partition_info = plistlib.loads(subprocess.run("diskutil info -plist /".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-            self.root_mount_path = root_partition_info["DeviceIdentifier"]
-
+        self.root_mount_path = Utilities.get_disk_path()
        if self.root_mount_path.startswith("disk"):
-            if self.constants.recovery_status is False:
-                self.root_mount_path = self.root_mount_path[:-2] if self.root_mount_path.count("s") > 1 else self.root_mount_path
+            if self.constants.detected_os == self.constants.catalina:
+                print("- Mounting Catalina Root Volume as writable")
+                self.elevated(["mount", "-uw", f"{self.mount_location}/"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
            print(f"- Found Root Volume at: {self.root_mount_path}")
            if Path(self.mount_extensions).exists():
                print("- Root Volume is already mounted")
@@ -176,15 +70,8 @@ class PatchSysVolume:
                    self.unpatch_root_vol()
                    return True
            else:
-                if self.constants.recovery_status is True:
-                    print("- Mounting drive as writable in Recovery")
-
-                    umount_drive = plistlib.loads(subprocess.run(f"diskutil info -plist {self.root_mount_path}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-                    umount_drive = umount_drive["VolumeName"]
-                    self.elevated(["umount", f'/Volumes/{umount_drive}'], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-                    self.elevated(["mount", "-t", "apfs", "-rw", f"/dev/{self.root_mount_path}", self.mount_location], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-                else:
-                    print("- Mounting drive as writable in OS")
+                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()
                if Path(self.mount_extensions).exists():
                    print("- Successfully mounted the Root Volume")
@@ -196,15 +83,78 @@ class PatchSysVolume:
                        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", f"{self.mount_location}/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
+        # kextcache always returns 0, even if it fails
+        # Check the output for 'KernelCache ID' to see if the cache was successfully rebuilt
+        if result.returncode != 0 or (self.constants.detected_os < self.constants.catalina and "KernelCache ID" not in result):
+            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:
+                if self.constants.detected_os > self.constants.catalina:
+                    input("Press [ENTER] to continue with snapshotting")
+                else:
+                    input("Press [ENTER] to continue with kernel and dyld cache merging")
+            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()
+            else:
+                print("Merging kernel cache")
+                self.elevated(["kcditto"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                print("Merging dyld cache")
+                self.elevated(["update_dyld_shared_cache", "-root", f"{self.mount_location}/"]).stdout.decode().strip().encode()
+            print("- Patching complete")
+            print("\nPlease reboot the machine for patches to take effect")
+            if self.amd_ts2 is True:
+                print(
+                    """\nPlease note that with ATI TeraScale 2 GPUs, you may experience colour strobing
+on reboot. Please use SwitchResX or ResXtreme to force 1 million colours on your
+monitor to fix this. If you are epileptic, please ask for someone to aid you or
+set million colour before rebooting"""
+                )
+            if self.constants.gui_mode is False:
+                input("\nPress [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()
+                self.elevated(["rm", "-R", delete_path], stdout=subprocess.PIPE).stdout.decode().strip().encode()
            else:
                print(f"- Couldn't find {delete_current_kext}, skipping")

@@ -220,201 +170,216 @@ class PatchSysVolume:
            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):
-        print("- Merging legacy Brightness Control Patches")
-        self.delete_old_binaries(ModelArray.DeleteBrightness)
-        self.add_new_binaries(ModelArray.AddBrightness, self.constants.legacy_brightness)
-        self.elevated(["ditto", self.constants.payload_apple_private_frameworks_path_brightness, self.mount_private_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+        self.delete_old_binaries(SysPatchArray.DeleteBrightness)
+        self.add_new_binaries(SysPatchArray.AddBrightness, self.constants.legacy_brightness)
+        self.elevated(
+            ["rsync", "-r", "-i", "-a", 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 gpu_accel_patches_11(self):
-        igpu_vendor, igpu_device, igpu_acpi = DeviceProbe.pci_probe().gpu_probe("IGPU")
-        dgpu_vendor, dgpu_device, dgpu_acpi = DeviceProbe.pci_probe().gpu_probe("GFX0")
-        if dgpu_vendor:
-            print(f"- Found GFX0: {dgpu_vendor}:{dgpu_device}")
-            if dgpu_vendor == self.constants.pci_nvidia:
-                if dgpu_device in PCIIDArray.nvidia_ids().tesla_ids or dgpu_device in PCIIDArray.nvidia_ids().fermi_ids:
-                    print("- Merging legacy Nvidia Tesla and Fermi Kexts and Bundles")
-                    self.delete_old_binaries(ModelArray.DeleteNvidiaAccel11)
-                    self.add_new_binaries(ModelArray.AddGeneralAccel, self.constants.legacy_general_path)
-                    self.add_new_binaries(ModelArray.AddNvidiaAccel11, self.constants.legacy_nvidia_path)
-                    self.added_kexts = True
-                # TODO: Enable below code if macOS 12 drops support
-                # elif dgpu_device in PCIIDArray.nvidia_ids().kepler_ids and self.constants.detected_os > self.constants.big_sur:
-                #    print("- Merging legacy Nvidia Kepler Kexts and Bundles")
-                #    self.add_new_binaries(ModelArray.AddNvidiaKeplerAccel11, self.constants.legacy_nvidia_kepler_path)
-            elif dgpu_vendor == self.constants.pci_amd_ati:
-                if dgpu_device in PCIIDArray.amd_ids().terascale_1_ids:
-                    print("- Merging legacy AMD Kexts and Bundles")
-                    self.delete_old_binaries(ModelArray.DeleteAMDAccel11)
-                    self.add_new_binaries(ModelArray.AddGeneralAccel, self.constants.legacy_general_path)
-                    self.add_new_binaries(ModelArray.AddAMDAccel11, self.constants.legacy_amd_path)
-                    self.added_kexts = True
-                if self.model in ["MacBookPro8,2", "MacBookPro8,3"]:
-                    # This is used for MacBookPro8,2/3 where dGPU is disabled via NVRAM and still requires AMD framebuffer
-                    # For reference:
-                    #- deMUX: Don't need the AMD patches
-                    #- dGPUs enabled:  Don't install the AMD patches (Infinite login loop otherwise)
-                    #- dGPUs disabled: Do need the AMD patches (Restores Brightness control)
-                    dgpu_status: str = subprocess.run("nvram FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-                    if dgpu_status.startswith("FA4CE28D-B62F-4C99-9CC3-6815686E30F9:gpu-power-prefs	%01"):
-                        print("- Detected dGPU is disabled via NVRAM")
-                        print("- Merging legacy AMD Kexts and Bundles")
-                        self.delete_old_binaries(ModelArray.DeleteAMDAccel11)
-                        self.add_new_binaries(ModelArray.AddGeneralAccel, self.constants.legacy_general_path)
-                        self.add_new_binaries(ModelArray.AddAMDAccel11, self.constants.legacy_amd_path)
-                        self.added_kexts = True
-                    else:
-                        print("- Cannot install Brightness Control, pleas ensure the dGPU is disabled via NVRAM")
-        if igpu_vendor:
-            print(f"- Found IGPU: {igpu_vendor}:{igpu_device}")
-            if igpu_vendor == self.constants.pci_intel:
-                if igpu_device in PCIIDArray.intel_ids().iron_ids:
-                    print("- Merging legacy Intel 1st Gen Kexts and Bundles")
-                    self.delete_old_binaries(ModelArray.DeleteNvidiaAccel11)
-                    self.add_new_binaries(ModelArray.AddGeneralAccel, self.constants.legacy_general_path)
-                    self.add_new_binaries(ModelArray.AddIntelGen1Accel, self.constants.legacy_intel_gen1_path)
-                    self.added_kexts = True
-                elif igpu_device in PCIIDArray.intel_ids().sandy_ids:
-                    print("- Merging legacy Intel 2nd Gen Kexts and Bundles")
-                    self.delete_old_binaries(ModelArray.DeleteNvidiaAccel11)
-                    self.add_new_binaries(ModelArray.AddGeneralAccel, self.constants.legacy_general_path)
-                    self.add_new_binaries(ModelArray.AddIntelGen2Accel, self.constants.legacy_intel_gen2_path)
-                    self.added_kexts = True
+    def add_audio_patch(self):
+        self.delete_old_binaries(SysPatchArray.DeleteVolumeControl)
+        self.add_new_binaries(SysPatchArray.AddVolumeControl, self.constants.audio_path)

-                # TODO: Enable below code if macOS 12 drops support
-                # elif igpu_device in PCIIDArray.intel_ids().ivy_ids:
-                #    print("- Merging legacy Intel 3rd Gen Kexts and Bundles")
-                #    self.add_new_binaries(ModelArray.AddIntelGen3Accel, self.constants.legacy_intel_gen3_path)
-            elif igpu_vendor == self.constants.pci_nvidia:
-                if not dgpu_vendor:
-                    # Avoid patching twice, as Nvidia iGPUs will only have Nvidia dGPUs
-                    print("- Merging legacy Nvidia Kexts and Bundles")
-                    self.delete_old_binaries(ModelArray.DeleteNvidiaAccel11)
-                    self.add_new_binaries(ModelArray.AddGeneralAccel, self.constants.legacy_general_path)
-                    self.add_new_binaries(ModelArray.AddNvidiaAccel11, self.constants.legacy_nvidia_path)
-                    self.added_kexts = True
+    def gpu_accel_legacy(self):
+        if self.constants.detected_os == self.constants.mojave:
+            print("- Installing General Acceleration Kext patches for Mojave")
+            self.add_new_binaries(SysPatchArray.AddGeneralAccelMojave, self.constants.legacy_general_path)
+        elif self.constants.detected_os == self.constants.catalina:
+            print("- Installing General Acceleration Kext patches for Catalina")
+            self.add_new_binaries(SysPatchArray.AddGeneralAccelCatalina, self.constants.legacy_general_path)
+        elif self.constants.detected_os == self.constants.big_sur:
+            print("- Installing General Acceleration Kext patches for Big Sur")
+            self.add_new_binaries(SysPatchArray.AddGeneralAccel, self.constants.legacy_general_path)

-        if self.added_kexts == True:
-            # Frameworks
-            print("- Merging legacy Frameworks")
-            self.elevated(["ditto", self.constants.payload_apple_frameworks_path_accel, self.mount_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-            if self.model in ModelArray.LegacyBrightness:
-                self.add_brightness_patch()
-
-            # LaunchDaemons
-            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(["ditto", 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()
-
-            # PrivateFrameworks
-            print("- Merging legacy PrivateFrameworks")
-            self.elevated(["ditto", self.constants.payload_apple_private_frameworks_path_accel, self.mount_private_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-            # Sets AppKit to Catalina Window Drawing codepath
-            # Disabled upon ASentientBot request
-            # print("- Enabling NSDefenestratorModeEnabled")
-            # subprocess.run("defaults write -g NSDefenestratorModeEnabled -bool true".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+    # Nvidia
+    def gpu_accel_legacy_nvidia_master(self):
+        if self.constants.detected_os in [self.constants.mojave, self.constants.catalina]:
+            print("- Installing Nvidia Acceleration Kext patches for Mojave/Catalina")
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddNvidiaAccelLegacy, self.constants.legacy_nvidia_path)
+        elif self.constants.detected_os == self.constants.big_sur:
+            print("- Installing Nvidia Acceleration Kext patches for Big Sur")
+            self.delete_old_binaries(SysPatchArray.DeleteNvidiaAccel11)
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddNvidiaAccel11, self.constants.legacy_nvidia_path)
        else:
-            print("- No Acceleration Kexts were installed, skipping remaining acceleration patches")
+            print("- Installing basic Nvidia Framebuffer Kext patches for generic OS")
+            self.add_new_binaries(SysPatchArray.AddNvidiaBrightness, self.constants.legacy_nvidia_path)
+
+    # AMD/ATI
+    def gpu_accel_legacy_ts1_master(self):
+        if self.constants.detected_os in [self.constants.mojave, self.constants.catalina]:
+            print("- Installing TeraScale 1 Acceleration Kext patches for Mojave/Catalina")
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddAMDAccelLegacy, self.constants.legacy_amd_path)
+        elif self.constants.detected_os == self.constants.big_sur:
+            print("- Installing TeraScale 1 Acceleration Kext patches for Big Sur")
+            self.delete_old_binaries(SysPatchArray.DeleteAMDAccel11)
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddAMDAccel11, self.constants.legacy_amd_path)
+        else:
+            print("- Installing basic TeraScale 1 Framebuffer Kext patches for generic OS")
+            self.add_new_binaries(SysPatchArray.AddAMDBrightness, self.constants.legacy_amd_path)
+
+    def gpu_accel_legacy_ts2_master(self):
+        if self.constants.detected_os in [self.constants.mojave, self.constants.catalina]:
+            print("- Installing TeraScale 2 Acceleration Kext patches for Mojave/Catalina")
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddAMDAccelLegacy, self.constants.legacy_amd_path)
+        elif self.constants.detected_os == self.constants.big_sur:
+            print("- Installing TeraScale 2 Acceleration Kext patches for Big Sur")
+            self.delete_old_binaries(SysPatchArray.DeleteAMDAccel11)
+            self.delete_old_binaries(SysPatchArray.DeleteAMDAccel11TS2)
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddAMDAccel11, self.constants.legacy_amd_path)
+        else:
+            print("- Installing basic TeraScale 2 Framebuffer Kext patches for generic OS")
+            self.add_new_binaries(SysPatchArray.AddAMDBrightness, self.constants.legacy_amd_path)
+
+    # Intel
+    def gpu_accel_legacy_ironlake_master(self):
+        if self.constants.detected_os in [self.constants.mojave, self.constants.catalina]:
+            print("- Installing Ironlake Acceleration Kext patches for Mojave/Catalina")
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddIntelGen1Accel, self.constants.legacy_intel_gen1_path)
+        elif self.constants.detected_os == self.constants.big_sur:
+            print("- Installing Ironlake Acceleration Kext patches for Big Sur")
+            self.delete_old_binaries(SysPatchArray.DeleteNvidiaAccel11)
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddIntelGen1Accel, self.constants.legacy_intel_gen1_path)
+        else:
+            print("- Installing basic Ironlake Framebuffer Kext patches for generic OS")
+            self.add_new_binaries(SysPatchArray.AddIntelGen1Accel, self.constants.legacy_intel_gen1_path)
+
+    def gpu_accel_legacy_sandybridge_master(self):
+        if self.constants.detected_os in [self.constants.mojave, self.constants.catalina]:
+            print("- Installing Sandy Bridge Acceleration Kext patches for Mojave/Catalina")
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddIntelGen2Accel, self.constants.legacy_intel_gen2_path)
+        elif self.constants.detected_os == self.constants.big_sur:
+            print("- Installing Sandy Bridge Acceleration Kext patches for Big Sur")
+            self.delete_old_binaries(SysPatchArray.DeleteNvidiaAccel11)
+            self.gpu_accel_legacy()
+            self.add_new_binaries(SysPatchArray.AddIntelGen2Accel, self.constants.legacy_intel_gen2_path)
+        else:
+            print("- Installing basic Sandy Bridge Framebuffer Kext patches for generic OS")
+            self.add_new_binaries(SysPatchArray.AddIntelGen2Accel, self.constants.legacy_intel_gen2_path)
+
+    def gpu_framebuffer_ivybridge_master(self):
+        if self.constants.detected_os == self.constants.monterey:
+            print("- Installing IvyBridge Acceleration Kext patches for Monterey")
+            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", "enable"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            print("- Merging Ivy Bridge Frameworks")
+            self.elevated(["rsync", "-r", "-i", "-a", f"{self.constants.payload_apple_frameworks_path_accel_ivy}/", self.mount_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            print("- Merging Ivy Bridge PrivateFrameworks")
+            self.elevated(
+                ["rsync", "-r", "-i", "-a", f"{self.constants.payload_apple_private_frameworks_path_accel_ivy}/", self.mount_private_frameworks], stdout=subprocess.PIPE
+            ).stdout.decode().strip().encode()
+        else:
+            print("- Installing basic Ivy Bridge Kext patches for generic OS")
+            self.add_new_binaries(SysPatchArray.AddIntelGen3Accel, self.constants.legacy_intel_gen3_path)
+
+    def gpu_accel_legacy_extended(self):
+        print("- Merging general legacy Frameworks")
+        self.elevated(["rsync", "-r", "-i", "-a", f"{self.constants.payload_apple_frameworks_path_accel}/", self.mount_frameworks], stdout=subprocess.PIPE).stdout.decode().strip().encode()
+        print("- Merging general legacy PrivateFrameworks")
+        self.elevated(
+            ["rsync", "-r", "-i", "-a", f"{self.constants.payload_apple_private_frameworks_path_accel}/", self.mount_private_frameworks], stdout=subprocess.PIPE
+        ).stdout.decode().strip().encode()
+        print("- Adding IOHID-Fixup.plist")
+        self.elevated(["rsync", "-r", "-i", "-a", 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()
+
+    def gpu_accel_legacy_extended_ts2(self):
+        print("- Merging TeraScale 2 legacy Frameworks")
+        self.elevated(["rsync", "-r", "-i", "-a", 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", "-a", 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"- Detecting patches for {self.model}")
-        rebuild_required = False
-        # TODO: Create Backup of S*/L*/Extensions, Frameworks and PrivateFramework to easily revert changes
-        # APFS snapshotting seems to ignore System Volume changes inconsistently, would like a backup to avoid total brick
-        # Perhaps a basic py2 script to run in recovery to restore
-        # Ensures no .DS_Stores got in
-        print("- Preparing Files")
-        self.elevated(["find", self.constants.payload_apple_root_path, "-name", "'.DS_Store'", "-delete"], stdout=subprocess.PIPE).stdout.decode().strip().encode()
-
-        if self.model in ModelArray.LegacyGPU or self.constants.assume_legacy is True:
-            dgpu_vendor, dgpu_device, dgpu_acpi = DeviceProbe.pci_probe().gpu_probe("GFX0")
-            if (
-                dgpu_vendor
-                and dgpu_vendor == self.constants.pci_amd_ati
-                and (
-                    dgpu_device in PCIIDArray.amd_ids().polaris_ids
-                    or dgpu_device in PCIIDArray.amd_ids().vega_ids
-                    or dgpu_device in PCIIDArray.amd_ids().navi_ids
-                    or dgpu_device in PCIIDArray.amd_ids().legacy_gcn_ids
-                )
-            ):
-                print("- Detected Metal-based AMD GPU, skipping legacy patches")
-            elif dgpu_vendor and dgpu_vendor == self.constants.pci_nvidia and dgpu_device in PCIIDArray.nvidia_ids().kepler_ids:
-                print("- Detected Metal-based Nvidia GPU, skipping legacy patches")
+        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 in self.constants.legacy_accel_support:
+                print("- Detected supported OS, installing Acceleration Patches")
+                self.added_legacy_kexts = True
            else:
-                print("- Detected legacy GPU, attempting legacy acceleration patches")
-                self.gpu_accel_patches_11()
-                rebuild_required = True
+                print("- Detected unsupported OS, installing Basic Framebuffer")
+            self.gpu_accel_legacy_nvidia_master()

-        if self.model in ["iMac7,1", "iMac8,1"]:
+        elif self.amd_ts1 is True:
+            print("- Installing legacy TeraScale 1 Patches")
+            if self.constants.detected_os in self.constants.legacy_accel_support:
+                print("- Detected supported OS, installing Acceleration Patches")
+                self.added_legacy_kexts = True
+            else:
+                print("- Detected unsupported OS, installing Basic Framebuffer")
+            self.gpu_accel_legacy_ts1_master()
+
+        elif self.amd_ts2 is True:
+            print("- Installing legacy TeraScale 2 Patches")
+            if self.constants.detected_os in self.constants.legacy_accel_support:
+                print("- Detected supported OS, installing Acceleration Patches")
+                self.added_legacy_kexts = True
+            else:
+                print("- Detected unsupported OS, installing Basic Framebuffer")
+            self.gpu_accel_legacy_ts2_master()
+
+        if self.iron_gpu is True:
+            print("- Installing legacy Ironlake Patches")
+            if self.constants.detected_os in self.constants.legacy_accel_support:
+                print("- Detected supported OS, installing Acceleration Patches")
+                self.added_legacy_kexts = True
+            else:
+                print("- Detected unsupported OS, installing Basic Framebuffer")
+            self.gpu_accel_legacy_ironlake_master()
+
+        elif self.sandy_gpu is True:
+            print("- Installing legacy Sandy Bridge Patches")
+            if self.constants.detected_os in self.constants.legacy_accel_support:
+                print("- Detected supported OS, installing Acceleration Patches")
+                self.added_legacy_kexts = True
+            else:
+                print("- Detected unsupported OS, installing Basic Framebuffer")
+            self.gpu_accel_legacy_sandybridge_master()
+
+        elif self.ivy_gpu is True:
+            print("- Installing Ivy Bridge Patches")
+            if self.constants.detected_os == self.constants.monterey:
+                print("- Detected supported OS, installing Acceleration Patches")
+            else:
+                print("- Detected unsupported OS, installing Basic Framebuffer")
+            self.gpu_framebuffer_ivybridge_master()
+
+        if self.amd_ts2 is True and self.constants.detected_os in self.constants.legacy_accel_support:
+            # TeraScale 2 patches must be installed after Intel HD3000
+            self.add_new_binaries(SysPatchArray.AddAMDAccel11TS2, self.constants.legacy_amd_path_ts2)
+
+        if self.added_legacy_kexts is True and self.constants.detected_os in self.constants.legacy_accel_support:
+            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.delete_old_binaries(ModelArray.DeleteVolumeControl)
-            self.add_new_binaries(ModelArray.AddVolumeControl, self.constants.audio_path)
-            rebuild_required = True
+            self.add_audio_patch()

-        if rebuild_required is True:
-            self.rebuild_snapshot()
-
-    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)")
-        result = self.elevated(["kmutil", "install", "--volume-root", self.mount_location, "--update-all"], 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("")
-        else:
-            self.success_status = True
-            print("- Successfully built new kernel cache")
-            if self.constants.gui_mode is False:
-                input("Press [ENTER] to continue with snapshotting")
-            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()
-
-    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 check_status(self):
-        nvram_dump = plistlib.loads(subprocess.run("nvram -x -p".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        try:
-            self.sip_status = nvram_dump["csr-active-config"]
-        except KeyError:
-            self.sip_status = b"\x00\x00\x00\x00"
-
-        self.smb_model: str = subprocess.run("nvram 94B73556-2197-4702-82A8-3E1337DAFBFB:HardwareModel	".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-        if not self.smb_model.startswith("nvram: Error getting variable"):
-            self.smb_model = [line.strip().split(":HardwareModel	", 1)[1] for line in self.smb_model.split("\n") if line.strip().startswith("94B73556-2197-4702-82A8-3E1337DAFBFB:")][0]
-            if self.smb_model.startswith("j137"):
-                self.smb_status = True
-            else:
-                self.smb_status = False
-        else:
-            self.smb_status = False
-        self.fv_status = True
-        if self.constants.recovery_status == False:
-            self.fv_status: str = subprocess.run("fdesetup status".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
-            if self.fv_status.startswith("FileVault is Off"):
-                self.fv_status = False
-        else:
-            # Assume FileVault is off for Recovery purposes
-            self.fv_status = False
-        self.csr_decode(False)
+        self.rebuild_snapshot()

    def check_files(self):
        if Path(self.constants.payload_apple_root_path).exists():
@@ -431,109 +396,199 @@ class PatchSysVolume:
            self.download_files()

    def download_files(self):
-        Utilities.cls()
-        print("- Downloading Apple binaries")
-        popen_oclp = subprocess.Popen(
-            ["curl", "-S", "-L", f"{self.constants.url_apple_binaries}{self.constants.payload_version}.zip", "--output", self.constants.payload_apple_root_path_zip],
-            stdin=subprocess.PIPE,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            universal_newlines=True,
-        )
-        for stdout_line in iter(popen_oclp.stdout.readline, ""):
-            print(stdout_line, end="")
-        popen_oclp.stdout.close()
+        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_apple_root_path_unzip, self.constants.payload_apple_root_path)
+                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")
-            os.remove(self.constants.payload_apple_root_path_zip)
+                return
        else:
            print("- Download failed, please verify the below link works:")
-            print(f"{self.constants.url_apple_binaries}{self.constants.payload_version}")
+            print(link)
+            input("Press [ENTER] to continue")

-    def start_patch(self):
-        # Check SIP
-        # self.check_files()
-        if self.constants.custom_model is not None:
-            print("Root Patching must be done on target machine!")
-        elif self.model in ModelArray.NoRootPatch11 and self.constants.assume_legacy is False:
-            print("Root Patching not required for this machine!")
-        elif self.model not in ModelArray.SupportedSMBIOS11 and self.constants.assume_legacy is False:
-            print("Cannot run on this machine, model is unsupported!")
-        elif self.constants.detected_os != self.constants.big_sur:
-            print("Cannot run on this OS, requires macOS 11!")
+    def detect_gpus(self):
+        dgpu = self.constants.computer.dgpu
+        igpu = self.constants.computer.igpu
+        if self.constants.moj_cat_accel is True:
+            non_metal_os = self.constants.high_sierra
        else:
-            self.check_status()
-            Utilities.cls()
-            if (self.sip_patch_status is False) and (self.smb_status is False):
-                print("- Detected SIP and SecureBootModel are disabled, continuing")
-                if self.constants.gui_mode is False:
-                    input("\nPress [ENTER] to continue")
+            non_metal_os = self.constants.catalina
+        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 > non_metal_os:
+                    self.nvidia_legacy = True
+                    self.amfi_must_disable = True
+            elif dgpu.arch == device_probe.AMD.Archs.TeraScale_1:
+                if self.constants.detected_os > non_metal_os:
+                    self.amd_ts1 = True
+                    self.amfi_must_disable = True
+            elif dgpu.arch == device_probe.AMD.Archs.TeraScale_2:
+                if self.constants.detected_os > non_metal_os:
+                    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 > non_metal_os:
+                    self.iron_gpu = True
+                    self.amfi_must_disable = True
+            elif igpu.arch == device_probe.Intel.Archs.Sandy_Bridge:
+                if self.constants.detected_os > non_metal_os:
+                    self.sandy_gpu = True
+                    self.amfi_must_disable = True
+                    self.check_board_id = 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 > non_metal_os:
+                    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):
+        sip = self.constants.root_patch_sip_big_sur if self.constants.detected_os > self.constants.catalina else self.constants.root_patch_sip_mojave
+        if sip == self.constants.root_patch_sip_mojave:
+            sip_value = "For Hackintoshes, please set csr-active-config to '03060000' (0x603)\nFor non-OpenCore Macs, please run 'csrutil disable' in RecoveryOS"
+        else:
+            sip_value = (
+                "For Hackintoshes, please set csr-active-config to '030A0000' (0xA03)\nFor non-OpenCore Macs, please run 'csrutil disable' and \n'csrutil authenticated-root disable' in RecoveryOS"
+            )
+        self.sip_enabled, self.sbm_enabled, self.amfi_enabled, self.fv_enabled = Utilities.patching_status(sip)
+        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(sip))
+            print(sip_value)
+
+        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 self.check_board_id is True and self.computer.reported_board_id not in self.constants.sandy_board_id:
+            print("\nCannot patch! Board ID not supported by AppleIntelSNBGraphicsFB")
+            print(f"Detected Board ID: {self.computer.reported_board_id}")
+            print("Please ensure your Board ID is listed below:")
+            print("\n".join(self.constants.sandy_board_id))
+            self.bad_board_id = True
+
+        if any([self.sip_enabled, self.sbm_enabled, self.fv_enabled, self.amfi_enabled if self.amfi_must_disable else False, self.bad_board_id if self.check_board_id 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 True:
+            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: ")
+        elif self.constants.gui_mode is False:
+            change_menu = input("Would you like to continue with Root Volume Patching?(y/n): ")
+        else:
+            change_menu = "y"
+            print("Continuing root patching")
+        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()
-                if self.constants.payload_apple_root_path.exists():
-                    if not self.find_mount_root_vol(True):
-                        return
-                    self.unmount_drive()
-                    print("- Patching complete")
-                    if self.success_status is True:
-                        print("\nPlease reboot the machine for patches to take effect")
-                    else:
-                        print("\nPlease reboot the machine to avoid potential issues rerunning the patcher")
-            if self.sip_patch_status is True:
-                print("SIP set incorrectly, cannot patch on this machine!")
-                print("Please disable SIP and SecureBootModel in Patcher Settings")
-                self.csr_decode(True)
-                print("")
-            if self.smb_status is True:
-                print("SecureBootModel set incorrectly, unable to patch!")
-                print("Please disable SecureBootModel in Patcher Settings")
-                print("")
-            if self.fv_status is True:
-                print("FileVault enabled, unable to patch!")
-                print("Please disable FileVault in System Preferences")
-                print("")
-        if self.constants.gui_mode is False:
-            input("Press [Enter] to go exit.")
+                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):
-        if self.constants.custom_model is not None:
-            print("Unpatching must be done on target machine!")
-        elif self.constants.detected_os != self.constants.big_sur:
-            print("Cannot run on this OS, requires macOS 11!")
-        else:
-            self.check_status()
-            Utilities.cls()
-            if (self.sip_patch_status is False) and (self.smb_status is False):
-                print("- Detected SIP and SecureBootModel are disabled, continuing")
-                if self.constants.gui_mode is False:
-                    input("\nPress [ENTER] to continue")
-                if not self.find_mount_root_vol(False):
-                    return
-                self.unmount_drive()
-                print("- Unpatching complete")
-                print("\nPlease reboot the machine for patches to take effect")
-            if self.sip_patch_status is True:
-                print("SIP set incorrectly, cannot unpatch on this machine!")
-                print("Please disable SIP and SecureBootModel in Patcher Settings")
-                self.csr_decode(True)
-                print("")
-            if self.smb_status is True:
-                print("SecureBootModel set incorrectly, unable to unpatch!")
-                print("Please disable SecureBootModel in Patcher Settings")
-                print("")
-            if self.fv_status is True:
-                print("FileVault enabled, unable to unpatch!")
-                print("Please disable FileVault in System Preferences")
-                print("")
-        if self.constants.gui_mode is False:
-            input("Press [Enter] to go exit.")
+        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/SysPatchArray.py
+++ b/Resources/SysPatchArray.py
@@ -0,0 +1,247 @@
+# Lists Root patches used by SysPatch.py
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
+DeleteNvidiaAccel11 = [
+    "AMDRadeonX4000.kext",
+    "AMDRadeonX4000HWServices.kext",
+    "AMDRadeonX5000.kext",
+    "AMDRadeonX5000HWServices.kext",
+    "AMDRadeonX6000.kext",
+    "AMDRadeonX6000Framebuffer.kext",
+    "AMDRadeonX6000HWServices.kext",
+    "AppleIntelBDWGraphics.kext",
+    "AppleIntelBDWGraphicsFramebuffer.kext",
+    "AppleIntelCFLGraphicsFramebuffer.kext",
+    "AppleIntelHD4000Graphics.kext",
+    "AppleIntelHD5000Graphics.kext",
+    "AppleIntelICLGraphics.kext",
+    "AppleIntelICLLPGraphicsFramebuffer.kext",
+    "AppleIntelKBLGraphics.kext",
+    "AppleIntelKBLGraphicsFramebuffer.kext",
+    "AppleIntelSKLGraphics.kext",
+    "AppleIntelSKLGraphicsFramebuffer.kext",
+    "AppleIntelFramebufferAzul.kext",
+    "AppleIntelFramebufferCapri.kext",
+    "AppleParavirtGPU.kext",
+    "GeForce.kext",
+    "IOAcceleratorFamily2.kext",
+    "IOGPUFamily.kext",
+]
+
+DeleteAMDAccel11 = [
+    "AMDRadeonX4000.kext",
+    "AMDRadeonX4000HWServices.kext",
+    "AMDRadeonX5000.kext",
+    "AMDRadeonX5000HWServices.kext",
+    "AMDRadeonX6000.kext",
+    "AMDRadeonX6000Framebuffer.kext",
+    "AMDRadeonX6000HWServices.kext",
+    "AMD7000Controller.kext",  # AMDSupport Dependency
+    "AMD8000Controller.kext",  # AMDSupport Dependency
+    "AMD9000Controller.kext",  # AMDSupport Dependency
+    "AMD9500Controller.kext",  # AMDSupport Dependency
+    "AMD10000Controller.kext",  # AMDSupport Dependency
+    "AppleIntelBDWGraphics.kext",
+    "AppleIntelBDWGraphicsFramebuffer.kext",
+    "AppleIntelCFLGraphicsFramebuffer.kext",
+    "AppleIntelHD4000Graphics.kext",
+    "AppleIntelHD5000Graphics.kext",
+    "AppleIntelICLGraphics.kext",
+    "AppleIntelICLLPGraphicsFramebuffer.kext",
+    "AppleIntelKBLGraphics.kext",
+    "AppleIntelKBLGraphicsFramebuffer.kext",
+    "AppleIntelSKLGraphics.kext",
+    "AppleIntelSKLGraphicsFramebuffer.kext",
+    "AppleIntelFramebufferAzul.kext",
+    "AppleIntelFramebufferCapri.kext",
+    "AppleParavirtGPU.kext",
+    "GeForce.kext",
+    "IOGPUFamily.kext",
+]
+
+DeleteAMDAccel11TS2 = [
+    "AppleCameraInterface.kext",
+]
+
+AddNvidiaAccel11 = [
+    "GeForceGA.bundle",
+    "GeForceTesla.kext",
+    "GeForceTeslaGLDriver.bundle",
+    "GeForceTeslaVADriver.bundle",
+    "NVDANV50HalTesla.kext",
+    "NVDAResmanTesla.kext",
+    "IOSurface.kext",
+]
+
+AddNvidiaBrightness = [
+    "GeForceGA.bundle",
+    "GeForceTesla.kext",
+    "GeForceTeslaGLDriver.bundle",
+    "GeForceTeslaVADriver.bundle",
+    "NVDANV50HalTesla.kext",
+    "NVDAResmanTesla.kext",
+]
+
+AddNvidiaKeplerAccel11 = [
+    "GeForce.kext",
+    "GeForceAIRPlugin.bundle",
+    "GeForceGLDriver.bundle",
+    "GeForceMTLDriver.bundle",
+    "GeForceVADriver.bundle",
+    "NVDAGF100Hal.kext",
+    "NVDAGK100Hal.kext",
+    "NVDAResman.kext",
+    "NVDAStartup.kext",
+    "NVSMU.kext",
+]
+
+AddAMDAccel11 = [
+    "AMD2400Controller.kext",
+    "AMD2600Controller.kext",
+    "AMD3800Controller.kext",
+    "AMD4600Controller.kext",
+    "AMD4800Controller.kext",
+    "AMD5000Controller.kext",
+    "AMD6000Controller.kext",
+    "AMDFramebuffer.kext",
+    "AMDLegacyFramebuffer.kext",
+    "AMDLegacySupport.kext",
+    "AMDRadeonVADriver.bundle",
+    "AMDRadeonVADriver2.bundle",
+    "AMDRadeonX3000.kext",
+    "AMDRadeonX3000GLDriver.bundle",
+    "AMDShared.bundle",
+    "AMDSupport.kext",
+    "ATIRadeonX2000.kext",
+    "ATIRadeonX2000GA.plugin",
+    "ATIRadeonX2000GLDriver.bundle",
+    "ATIRadeonX2000VADriver.bundle",
+]
+
+AddAMDBrightness = [
+    "AMD2400Controller.kext",
+    "AMD2600Controller.kext",
+    "AMD3800Controller.kext",
+    "AMD4600Controller.kext",
+    "AMD4800Controller.kext",
+    "AMD5000Controller.kext",
+    "AMD6000Controller.kext",
+    "AMDLegacyFramebuffer.kext",
+    "AMDLegacySupport.kext",
+    "AMDRadeonVADriver.bundle",
+    "AMDRadeonVADriver2.bundle",
+    # "AMDRadeonX3000.kext",
+    # "AMDRadeonX3000GLDriver.bundle",
+    "AMDShared.bundle",
+    "ATIRadeonX2000.kext",
+    "ATIRadeonX2000GA.plugin",
+    "ATIRadeonX2000GLDriver.bundle",
+    "ATIRadeonX2000VADriver.bundle",
+]
+
+AddAMDAccel11TS2 = [
+    "IOSurface.kext",
+    "IOAcceleratorFamily2.kext",
+]
+
+AddIntelGen1Accel = [
+    "AppleIntelHDGraphics.kext",
+    "AppleIntelHDGraphicsFB.kext",
+    "AppleIntelHDGraphicsGA.plugin",
+    "AppleIntelHDGraphicsGLDriver.bundle",
+    "AppleIntelHDGraphicsVADriver.bundle",
+]
+
+AddIntelGen2Accel = [
+    "AppleIntelHD3000Graphics.kext",
+    "AppleIntelHD3000GraphicsGA.plugin",
+    "AppleIntelHD3000GraphicsGLDriver.bundle",
+    "AppleIntelHD3000GraphicsVADriver.bundle",
+    "AppleIntelSNBGraphicsFB.kext",
+    "AppleIntelSNBVA.bundle",
+]
+
+AddIntelGen3Accel = [
+    "AppleIntelFramebufferCapri.kext",
+    "AppleIntelHD4000Graphics.kext",
+    "AppleIntelHD4000GraphicsGLDriver.bundle",
+    "AppleIntelHD4000GraphicsMTLDriver.bundle",
+    "AppleIntelHD4000GraphicsVADriver.bundle",
+    "AppleIntelIVBVA.bundle",
+    "AppleIntelGraphicsShared.bundle",
+]
+
+AddGeneralAccel = ["IOAcceleratorFamily2.kext", "IOSurface.kext"]
+
+DeleteBrightness = ["AppleGraphicsControl.kext/Contents/PlugIns/AGDCBacklightControl.kext"]
+
+AddBrightness = [
+    "AppleBacklight.kext",
+    "AppleBacklightExpert.kext",
+]
+
+AddVolumeControl = [
+    "AppleHDA.kext",
+    "IOAudioFamily.kext",
+]
+
+DeleteVolumeControl = [
+    "AppleVirtIO.kext",
+    "AppleVirtualGraphics.kext",
+    "AppleVirtualPlatform.kext",
+    "ApplePVPanic.kext",
+    "AppleVirtIOStorage.kext",
+]
+
+AddNvidiaAccelLegacy = [
+    "GeForceGA.bundle",
+    "GeForceTesla.kext",
+    "GeForceTeslaGLDriver.bundle",
+    "GeForceTeslaVADriver.bundle",
+    "NVDANV50HalTesla.kext",
+    "NVDAResmanTesla.kext",
+]
+
+AddAMDAccelLegacy = [
+    "AMD2400Controller.kext",
+    "AMD2600Controller.kext",
+    "AMD3800Controller.kext",
+    "AMD4600Controller.kext",
+    "AMD4800Controller.kext",
+    "AMD5000Controller.kext",
+    "AMD6000Controller.kext",
+    "AMDFramebuffer.kext",
+    "AMDLegacyFramebuffer.kext",
+    "AMDLegacySupport.kext",
+    "AMDRadeonVADriver.bundle",
+    "AMDRadeonVADriver2.bundle",
+    "AMDRadeonX3000.kext",
+    "AMDRadeonX3000GLDriver.bundle",
+    "AMDRadeonX4000HWServices.kext",
+    "AMDRadeonX4000.kext",
+    "AMDRadeonX4000GLDriver.bundle",
+    "AMDShared.bundle",
+    "AMDSupport.kext",
+    "ATIRadeonX2000.kext",
+    "ATIRadeonX2000GA.plugin",
+    "ATIRadeonX2000GLDriver.bundle",
+    "ATIRadeonX2000VADriver.bundle",
+]
+
+AddGeneralAccelCatalina = [
+    "AppleGraphicsControl.kext",
+    "AppleGraphicsPowerManagement.kext",
+    "AppleMCCSControl.kext",
+    "IOGraphicsFamily.kext",
+    "IONDRVSupport.kext",
+    "IOSurface.kext",
+]
+
+AddGeneralAccelMojave = [
+    "IONDRVSupport.kext",
+    "AppleGraphicsControl.kext",
+    "AppleGraphicsPowerManagement.kext",
+    "AppleMCCSControl.kext",
+    "IOAccelerator2D.plugin",
+    "IOAcceleratorFamily2.kext",
+    "IOGraphicsFamily.kext",
+]
--- a/Resources/Utilities.py
+++ b/Resources/Utilities.py
@@ -1,10 +1,16 @@
 # Copyright (C) 2020-2021, Dhinak G
 from __future__ import print_function

-import os
+import hashlib
 import math
+import os
 import plistlib
 import subprocess
+from pathlib import Path
+
+import requests
+
+from Resources import Constants, ioreg


 def hexswap(input_hex: str):
@@ -24,20 +30,138 @@ def header(lines):
    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())
-    if root_partition_info["VolumeName"] == "macOS Base System" and root_partition_info["FilesystemType"] == "apfs" and root_partition_info["BusProtocol"] == "Disk Image":
-        return True
-    else:
+    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, os_sip):
+    if csr_active_config is None:
+        csr_active_config = b"\x00\x00\x00\x00"
+    sip_int = int.from_bytes(csr_active_config, byteorder="little")
+    i = 0
+    for current_sip_bit in Constants.Constants.csr_values:
+        if sip_int & (1 << i):
+            Constants.Constants.csr_values[current_sip_bit] = True
+        i = i + 1
+
+    # Can be adjusted to whatever OS needs patching
+    sip_needs_change = all(Constants.Constants.csr_values[i] for i in os_sip)
+    if sip_needs_change is True:
        return False
+    else:
+        return True
+
+
+def friendly_hex(integer: int):
+    return "{:02X}".format(integer)
+
+
+def patching_status(os_sip):
+    # 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), os_sip) 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():
-    if check_recovery() == False:
-         os.system('cls' if os.name == 'nt' else 'clear')
+    global clear
+    if not clear:
+        return
+    if not check_recovery():
+        os.system("cls" if os.name == "nt" else "clear")
    else:
        print("\u001Bc")

+
+def get_nvram(variable: str, uuid: str = None, *, decode: bool = False):
+    # TODO: Properly fix for El Capitan, which does not print the XML representation even though we say to
+
+    if uuid is not None:
+        uuid += ":"
+    else:
+        uuid = ""
+
+    nvram = ioreg.IORegistryEntryFromPath(ioreg.kIOMasterPortDefault, "IODeviceTree:/options".encode())
+
+    value = ioreg.IORegistryEntryCreateCFProperty(nvram, f"{uuid}{variable}", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)
+
+    ioreg.IOObjectRelease(nvram)
+
+    if not value:
+        return None
+
+    value = ioreg.corefoundation_to_native(value)
+
+    if decode and isinstance(value, bytes):
+        value = value.strip(b"\0").decode()
+    return value
+
+
+def 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)
--- a/Resources/device_probe.py
+++ b/Resources/device_probe.py
@@ -0,0 +1,418 @@
+# Hardware probing
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
+
+from __future__ import annotations
+
+import binascii
+import enum
+import itertools
+import subprocess
+from dataclasses import dataclass, field
+from typing import Any, ClassVar, Optional, Type, Union
+
+from Resources import PCIIDArray, Utilities, ioreg
+
+
+@dataclass
+class CPU:
+    name: str
+    flags: list[str]
+
+
+@dataclass
+class PCIDevice:
+    VENDOR_ID: ClassVar[int]  # Default vendor id, for subclasses.
+
+    vendor_id: int  # The vendor ID of this PCI device
+    device_id: int  # The device ID of this PCI device
+    class_code: int  # The class code of this PCI device
+
+    # ioregistryentry: Optional[ioreg.IORegistryEntry] = None
+    name: Optional[str] = None  # Name of IORegistryEntry
+    model: Optional[str] = None  # model property
+    pci_path: Optional[str] = None
+
+    # def __getstate__(self):
+    #     state = self.__dict__.copy()
+    #     state.pop("ioregistryentry")
+    #     return state
+
+    @classmethod
+    def from_ioregistry(cls, entry: ioreg.io_registry_entry_t, anti_spoof=False):
+        properties: dict = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperties(entry, None, ioreg.kCFAllocatorDefault, ioreg.kNilOptions)[1])  # type: ignore
+        if anti_spoof and "IOName" in properties:
+            vendor_id, device_id = (int(i, 16) for i in properties["IOName"][3:].split(","))
+        else:
+            vendor_id, device_id = [int.from_bytes(properties[i][:4], byteorder="little") for i in ["vendor-id", "device-id"]]
+
+        device = cls(vendor_id, device_id, int.from_bytes(properties["class-code"][:6], byteorder="little"), name=ioreg.io_name_t_to_str(ioreg.IORegistryEntryGetName(entry, None)[1]))
+        if "model" in properties:
+            device.model = properties["model"].strip(b"\0").decode()
+        device.populate_pci_path(entry)
+        return device
+
+    # @staticmethod
+    # def vendor_detect_old(device):
+    #     for i in [NVIDIA, AMD]:
+    #         if i.detect(device):
+    #             return i
+    #     return None
+
+    def vendor_detect(self, *, inherits: ClassVar[Any] = None, classes: list = None):
+        for i in classes or itertools.chain.from_iterable([subclass.__subclasses__() for subclass in PCIDevice.__subclasses__()]):
+            if issubclass(i, inherits or object) and i.detect(self):
+                return i
+        return None
+
+    @classmethod
+    def detect(cls, device):
+        return device.vendor_id == cls.VENDOR_ID and ((device.class_code == cls.CLASS_CODE) if getattr(cls, "CLASS_CODE", None) else True)  # type: ignore  # pylint: disable=no-member
+
+    # def acpi_path(self):
+    #     # Eventually
+    #     raise NotImplementedError
+
+    def populate_pci_path(self, original_entry: ioreg.io_registry_entry_t):
+        # Based off gfxutil logic, seems to work.
+        paths = []
+        entry = original_entry
+        while entry:
+            if ioreg.IOObjectConformsTo(entry, "IOPCIDevice".encode()):
+                location = [hex(int(i, 16)) for i in ioreg.io_name_t_to_str(ioreg.IORegistryEntryGetLocationInPlane(entry, "IOService".encode(), None)[1]).split(",") + ["0"]]
+                paths.append(f"Pci({location[0]},{location[1]})")
+            elif ioreg.IOObjectConformsTo(entry, "IOACPIPlatformDevice".encode()):
+                paths.append(f"PciRoot({hex(int(ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, '_UID', ioreg.kCFAllocatorDefault, ioreg.kNilOptions)) or 0))})")  # type: ignore
+                break
+            elif ioreg.IOObjectConformsTo(entry, "IOPCIBridge".encode()):
+                pass
+            else:
+                # There's something in between that's not PCI! Abort
+                paths = []
+                break
+            parent = ioreg.IORegistryEntryGetParentEntry(entry, "IOService".encode(), None)[1]
+            if entry != original_entry:
+                ioreg.IOObjectRelease(entry)
+            entry = parent
+        self.pci_path = "/".join(reversed(paths))
+
+
+@dataclass
+class GPU(PCIDevice):
+    arch: enum.Enum = field(init=False)  # The architecture, see subclasses.
+
+    def __post_init__(self):
+        self.detect_arch()
+
+    def detect_arch(self):
+        raise NotImplementedError
+
+
+@dataclass
+class WirelessCard(PCIDevice):
+    CLASS_CODE: ClassVar[int] = 0x028000  # 00800200 hexswapped
+    country_code: str = field(init=False)
+    chipset: enum.Enum = field(init=False)
+
+    def __post_init__(self):
+        self.detect_chipset()
+
+    @classmethod
+    def from_ioregistry(cls, entry: ioreg.io_registry_entry_t, anti_spoof=True):
+        device = super().from_ioregistry(entry, anti_spoof=anti_spoof)
+
+        matching_dict = {
+            "IOParentMatch": ioreg.corefoundation_to_native(ioreg.IORegistryEntryIDMatching(ioreg.IORegistryEntryGetRegistryEntryID(entry, None)[1])),
+            "IOProviderClass": "IO80211Interface",
+        }
+
+        interface = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, matching_dict, None)[1]), None)
+        if interface:
+            device.country_code = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(interface, "IO80211CountryCode", ioreg.kCFAllocatorDefault, ioreg.kNilOptions))  # type: ignore # If not present, will be None anyways
+        else:
+            device.country_code = None  # type: ignore
+
+        return device
+
+    def detect_chipset(self):
+        raise NotImplementedError
+
+
+@dataclass
+class NVMeController(PCIDevice):
+    CLASS_CODE: ClassVar[int] = 0x010802
+
+    aspm: Optional[int] = None
+    # parent_aspm: Optional[int] = None
+
+
+@dataclass
+class SATAController(PCIDevice):
+    CLASS_CODE: ClassVar[int] = 0x010601
+
+
+@dataclass
+class NVIDIA(GPU):
+    VENDOR_ID: ClassVar[int] = 0x10DE
+
+    class Archs(enum.Enum):
+        # pylint: disable=invalid-name
+        Fermi = "Fermi"
+        Tesla = "Tesla"
+        Kepler = "Kepler"
+        Unknown = "Unknown"
+
+    arch: Archs = field(init=False)
+
+    def detect_arch(self):
+        # G80/G80GL
+        if self.device_id in PCIIDArray.nvidia_ids.tesla_ids:
+            self.arch = NVIDIA.Archs.Tesla
+        elif self.device_id in PCIIDArray.nvidia_ids.fermi_ids:
+            self.arch = NVIDIA.Archs.Fermi
+        elif self.device_id in PCIIDArray.nvidia_ids.kepler_ids:
+            self.arch = NVIDIA.Archs.Kepler
+        else:
+            self.arch = NVIDIA.Archs.Unknown
+
+
+@dataclass
+class AMD(GPU):
+    VENDOR_ID: ClassVar[int] = 0x1002
+
+    class Archs(enum.Enum):
+        # pylint: disable=invalid-name
+        Legacy_GCN = "Legacy GCN"
+        TeraScale_1 = "TeraScale 1"
+        TeraScale_2 = "TeraScale 2"
+        Polaris = "Polaris"
+        Vega = "Vega"
+        Navi = "Navi"
+        Unknown = "Unknown"
+
+    arch: Archs = field(init=False)
+
+    def detect_arch(self):
+        if self.device_id in PCIIDArray.amd_ids.legacy_gcn_ids:
+            self.arch = AMD.Archs.Legacy_GCN
+        elif self.device_id in PCIIDArray.amd_ids.terascale_1_ids:
+            self.arch = AMD.Archs.TeraScale_1
+        elif self.device_id in PCIIDArray.amd_ids.terascale_2_ids:
+            self.arch = AMD.Archs.TeraScale_2
+        elif self.device_id in PCIIDArray.amd_ids.polaris_ids:
+            self.arch = AMD.Archs.Polaris
+        elif self.device_id in PCIIDArray.amd_ids.vega_ids:
+            self.arch = AMD.Archs.Vega
+        elif self.device_id in PCIIDArray.amd_ids.navi_ids:
+            self.arch = AMD.Archs.Navi
+        else:
+            self.arch = AMD.Archs.Unknown
+
+
+@dataclass
+class Intel(GPU):
+    VENDOR_ID: ClassVar[int] = 0x8086
+
+    class Archs(enum.Enum):
+        # pylint: disable=invalid-name
+        Iron_Lake = "Iron Lake"
+        Sandy_Bridge = "Sandy Bridge"
+        Ivy_Bridge = "Ivy Bridge"
+        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
+    opencore_version: Optional[str] = None
+
+    @staticmethod
+    def probe():
+        computer = Computer()
+        computer.gpu_probe()
+        computer.dgpu_probe()
+        computer.igpu_probe()
+        computer.wifi_probe()
+        computer.storage_probe()
+        computer.smbios_probe()
+        computer.cpu_probe()
+        return computer
+
+    def gpu_probe(self):
+        # Chain together two iterators: one for class code 00000300, the other for class code 00800300
+        devices = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(
+                ioreg.kIOMasterPortDefault, {"IOProviderClass": "IOPCIDevice", "IOPropertyMatch": [{"class-code": binascii.a2b_hex("00000300")}, {"class-code": binascii.a2b_hex("00800300")}]}, None
+            )[1]
+        )
+
+        for device in devices:
+            vendor: Type[GPU] = PCIDevice.from_ioregistry(device).vendor_detect(inherits=GPU)  # type: ignore
+            if vendor:
+                self.gpus.append(vendor.from_ioregistry(device))  # type: ignore
+            ioreg.IOObjectRelease(device)
+
+    def dgpu_probe(self):
+        device = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceNameMatching("GFX0".encode()), None)[1]), None)
+        if not device:
+            # No devices
+            return
+
+        vendor: Type[GPU] = PCIDevice.from_ioregistry(device).vendor_detect(inherits=GPU)  # type: ignore
+        if vendor:
+            self.dgpu = vendor.from_ioregistry(device)  # type: ignore
+        ioreg.IOObjectRelease(device)
+
+    def igpu_probe(self):
+        device = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceNameMatching("IGPU".encode()), None)[1]), None)
+        if not device:
+            # No devices
+            return
+
+        vendor: Type[GPU] = PCIDevice.from_ioregistry(device).vendor_detect(inherits=GPU)  # type: ignore
+        if vendor:
+            self.igpu = vendor.from_ioregistry(device)  # type: ignore
+        ioreg.IOObjectRelease(device)
+
+    def wifi_probe(self):
+        # result = subprocess.run("ioreg -r -c IOPCIDevice -a -d2".split(), stdout=subprocess.PIPE).stdout.strip()
+        devices = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(
+                ioreg.kIOMasterPortDefault,
+                {"IOProviderClass": "IOPCIDevice", "IOPropertyMatch": {"class-code": binascii.a2b_hex(Utilities.hexswap(hex(WirelessCard.CLASS_CODE)[2:].zfill(8)))}},
+                None,
+            )[1]
+        )
+
+        for device in devices:
+            vendor: Type[WirelessCard] = PCIDevice.from_ioregistry(device, anti_spoof=True).vendor_detect(inherits=WirelessCard)  # type: ignore
+            if vendor:
+                self.wifi = vendor.from_ioregistry(device, anti_spoof=True)  # type: ignore
+                break
+            ioreg.IOObjectRelease(device)
+
+    def storage_probe(self):
+        sata_controllers = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(
+                ioreg.kIOMasterPortDefault,
+                {"IOProviderClass": "IOPCIDevice", "IOPropertyMatch": [{"class-code": binascii.a2b_hex(Utilities.hexswap(hex(SATAController.CLASS_CODE)[2:].zfill(8)))}]},
+                None,
+            )[1]
+        )
+        nvme_controllers = ioreg.ioiterator_to_list(
+            ioreg.IOServiceGetMatchingServices(
+                ioreg.kIOMasterPortDefault, {"IOProviderClass": "IONVMeController", "IOParentMatch": {"IOProviderClass": "IOPCIDevice"}, "IOPropertyMatch": {"IOClass": "IONVMeController"}}, None
+            )[1]
+        )
+        for device in sata_controllers:
+            self.storage.append(SATAController.from_ioregistry(device))
+            ioreg.IOObjectRelease(device)
+        for device in nvme_controllers:
+            parent = ioreg.IORegistryEntryGetParentEntry(device, "IOService".encode(), None)[1]
+            ioreg.IOObjectRelease(device)
+
+            aspm: Union[int, bytes] = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(parent, "pci-aspm-default", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)) or 0  # type: ignore
+            if isinstance(aspm, bytes):
+                aspm = int.from_bytes(aspm, byteorder="little")
+
+            controller = NVMeController.from_ioregistry(parent)
+            controller.aspm = aspm
+
+            if controller.vendor_id != 0x106B:
+                self.storage.append(controller)
+
+            ioreg.IOObjectRelease(parent)
+
+    def smbios_probe(self):
+        # Reported model
+        entry = next(ioreg.ioiterator_to_list(ioreg.IOServiceGetMatchingServices(ioreg.kIOMasterPortDefault, ioreg.IOServiceMatching("IOPlatformExpertDevice".encode()), None)[1]))
+        self.reported_model = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, "model", ioreg.kCFAllocatorDefault, ioreg.kNilOptions)).strip(b"\0").decode()  # type: ignore
+        translated = subprocess.run("sysctl -in sysctl.proc_translated".split(), stdout=subprocess.PIPE).stdout.decode()
+        if translated:
+            board = "target-type"
+        else:
+            board = "board-id"
+        self.reported_board_id = ioreg.corefoundation_to_native(ioreg.IORegistryEntryCreateCFProperty(entry, board, ioreg.kCFAllocatorDefault, ioreg.kNilOptions)).strip(b"\0").decode()  # type: ignore
+        ioreg.IOObjectRelease(entry)
+
+        # Real model
+        # TODO: We previously had logic for OC users using iMacPro1,1 with incorrect ExposeSensitiveData. Add logic?
+        self.real_model = Utilities.get_nvram("oem-product", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True) or self.reported_model
+        self.real_board_id = Utilities.get_nvram("oem-board", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True) or self.reported_board_id
+
+        # OCLP version
+        self.oclp_version = Utilities.get_nvram("OCLP-Version", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True)
+        self.opencore_version = Utilities.get_nvram("opencore-version", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=True)
+
+    def cpu_probe(self):
+        self.cpu = CPU(
+            subprocess.run("sysctl machdep.cpu.brand_string".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip(),
+            subprocess.run("sysctl machdep.cpu.features".split(), stdout=subprocess.PIPE).stdout.decode().partition(": ")[2].strip().split(" "),
+        )
--- a/Resources/ioreg.py
+++ b/Resources/ioreg.py
@@ -0,0 +1,244 @@
+# Handle misc CLI menu options
+# Copyright (C) 2020-2021, Dhinak G
+
+from __future__ import annotations
+
+from typing import NewType, Union
+
+import objc
+from CoreFoundation import CFRelease, kCFAllocatorDefault  # type: ignore # pylint: disable=no-name-in-module
+from Foundation import NSBundle  # type: ignore # pylint: disable=no-name-in-module
+from PyObjCTools import Conversion
+
+IOKit_bundle = NSBundle.bundleWithIdentifier_("com.apple.framework.IOKit")
+
+# pylint: disable=invalid-name
+io_name_t_ref_out = b"[128c]"  # io_name_t is char[128]
+const_io_name_t_ref_in = b"r*"
+CFStringRef = b"^{__CFString=}"
+CFDictionaryRef = b"^{__CFDictionary=}"
+CFAllocatorRef = b"^{__CFAllocator=}"
+# pylint: enable=invalid-name
+
+# https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/ObjCRuntimeGuide/Articles/ocrtTypeEncodings.html
+functions = [
+    ("IORegistryEntryCreateCFProperties", b"IIo^@" + CFAllocatorRef + b"I"),
+    ("IOServiceMatching", CFDictionaryRef + b"r*"),
+    ("IOServiceGetMatchingServices", b"II" + CFDictionaryRef + b"o^I"),
+    ("IOIteratorNext", b"II"),
+    ("IORegistryEntryGetParentEntry", b"IIr*o^I"),
+    ("IOObjectRelease", b"II"),
+    ("IORegistryEntryGetName", b"IIo" + io_name_t_ref_out),
+    ("IOObjectGetClass", b"IIo" + io_name_t_ref_out),
+    ("IOObjectCopyClass", CFStringRef + b"I"),
+    ("IOObjectCopySuperclassForClass", CFStringRef + CFStringRef),
+    ("IORegistryEntryGetChildIterator", b"IIr*o^I"),
+    ("IORegistryCreateIterator", b"IIr*Io^I"),
+    ("IORegistryEntryCreateIterator", b"IIr*Io^I"),
+    ("IORegistryIteratorEnterEntry", b"II"),
+    ("IORegistryIteratorExitEntry", b"II"),
+    ("IORegistryEntryCreateCFProperty", b"@I" + CFStringRef + CFAllocatorRef + b"I"),
+    ("IORegistryEntryGetPath", b"IIr*oI"),
+    ("IORegistryEntryCopyPath", CFStringRef + b"Ir*"),
+    ("IOObjectConformsTo", b"II" + const_io_name_t_ref_in),
+    ("IORegistryEntryGetLocationInPlane", b"II" + const_io_name_t_ref_in + b"o" + io_name_t_ref_out),
+    ("IOServiceNameMatching", CFDictionaryRef + b"r*"),
+    ("IORegistryEntryGetRegistryEntryID", b"IIo^Q"),
+    ("IORegistryEntryIDMatching", CFDictionaryRef + b"Q"),
+    ("IORegistryEntryFromPath", b"II" + const_io_name_t_ref_in),
+]
+
+variables = [("kIOMasterPortDefault", b"I")]
+
+# pylint: disable=invalid-name
+pointer = type(None)
+
+kern_return_t = NewType("kern_return_t", int)
+boolean_t = int
+
+io_object_t = NewType("io_object_t", object)
+io_name_t = bytes
+io_string_t = bytes
+
+# io_registry_entry_t = NewType("io_registry_entry_t", io_object_t)
+io_registry_entry_t = io_object_t
+io_iterator_t = NewType("io_iterator_t", io_object_t)
+
+CFTypeRef = Union[int, float, bytes, dict, list]
+
+IOOptionBits = int
+mach_port_t = int
+CFAllocatorType = type(kCFAllocatorDefault)
+
+NULL = 0
+
+kIOMasterPortDefault: mach_port_t
+kNilOptions: IOOptionBits = NULL
+
+# IOKitLib.h
+kIORegistryIterateRecursively = 1
+kIORegistryIterateParents = 2
+
+# pylint: enable=invalid-name
+
+
+# kern_return_t IORegistryEntryCreateCFProperties(io_registry_entry_t entry, CFMutableDictionaryRef * properties, CFAllocatorRef allocator, IOOptionBits options);
+def IORegistryEntryCreateCFProperties(entry: io_registry_entry_t, properties: pointer, allocator: CFAllocatorType, options: IOOptionBits) -> tuple[kern_return_t, dict]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFMutableDictionaryRef IOServiceMatching(const char * name);
+def IOServiceMatching(name: bytes) -> dict:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IOServiceGetMatchingServices(mach_port_t masterPort, CFDictionaryRef matching CF_RELEASES_ARGUMENT, io_iterator_t * existing);
+def IOServiceGetMatchingServices(masterPort: mach_port_t, matching: dict, existing: pointer) -> tuple[kern_return_t, io_iterator_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# io_object_t IOIteratorNext(io_iterator_t iterator);
+def IOIteratorNext(iterator: io_iterator_t) -> io_object_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetParentEntry(io_registry_entry_t entry, const io_name_t plane, io_registry_entry_t * parent);
+def IORegistryEntryGetParentEntry(entry: io_registry_entry_t, plane: io_name_t, parent: pointer) -> tuple[kern_return_t, io_registry_entry_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IOObjectRelease(io_object_t object);
+def IOObjectRelease(object: io_object_t) -> kern_return_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetName(io_registry_entry_t entry, io_name_t name);
+def IORegistryEntryGetName(entry: io_registry_entry_t, name: pointer) -> tuple[kern_return_t, bytes]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IOObjectGetClass(io_object_t object, io_name_t className);
+def IOObjectGetClass(object: io_object_t, className: pointer) -> tuple[kern_return_t, bytes]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFStringRef IOObjectCopyClass(io_object_t object);
+def IOObjectCopyClass(object: io_object_t) -> str:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFStringRef IOObjectCopySuperclassForClass(CFStringRef classname)
+def IOObjectCopySuperclassForClass(classname: str) -> str:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetChildIterator(io_registry_entry_t entry, const io_name_t plane, io_iterator_t * iterator);
+def IORegistryEntryGetChildIterator(entry: io_registry_entry_t, plane: io_name_t, iterator: pointer) -> tuple[kern_return_t, io_iterator_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryCreateIterator(mach_port_t masterPort, const io_name_t plane, IOOptionBits options, io_iterator_t * iterator)
+def IORegistryCreateIterator(masterPort: mach_port_t, plane: io_name_t, options: IOOptionBits, iterator: pointer) -> tuple[kern_return_t, io_iterator_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryCreateIterator(io_registry_entry_t entry, const io_name_t plane, IOOptionBits options, io_iterator_t * iterator)
+def IORegistryEntryCreateIterator(entry: io_registry_entry_t, plane: io_name_t, options: IOOptionBits, iterator: pointer) -> tuple[kern_return_t, io_iterator_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryIteratorEnterEntry(io_iterator_t iterator)
+def IORegistryIteratorEnterEntry(iterator: io_iterator_t) -> kern_return_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryIteratorExitEntry(io_iterator_t iterator)
+def IORegistryIteratorExitEntry(iterator: io_iterator_t) -> kern_return_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFTypeRef IORegistryEntryCreateCFProperty(io_registry_entry_t entry, CFStringRef key, CFAllocatorRef allocator, IOOptionBits options);
+def IORegistryEntryCreateCFProperty(entry: io_registry_entry_t, key: str, allocator: CFAllocatorType, options: IOOptionBits) -> CFTypeRef:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetPath(io_registry_entry_t entry, const io_name_t plane, io_string_t path);
+def IORegistryEntryGetPath(entry: io_registry_entry_t, plane: io_name_t, path: pointer) -> tuple[kern_return_t, io_string_t]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFStringRef IORegistryEntryCopyPath(io_registry_entry_t entry, const io_name_t plane)
+def IORegistryEntryCopyPath(entry: io_registry_entry_t, plane: bytes) -> str:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# boolean_t IOObjectConformsTo(io_object_t object, const io_name_t className)
+def IOObjectConformsTo(object: io_object_t, className: bytes) -> boolean_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetLocationInPlane(io_registry_entry_t entry, const io_name_t plane, io_name_t location)
+def IORegistryEntryGetLocationInPlane(entry: io_registry_entry_t, plane: io_name_t, location: pointer) -> tuple[kern_return_t, bytes]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFMutableDictionaryRef IOServiceNameMatching(const char * name);
+def IOServiceNameMatching(name: bytes) -> dict:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# kern_return_t IORegistryEntryGetRegistryEntryID(io_registry_entry_t entry, uint64_t * entryID)
+def IORegistryEntryGetRegistryEntryID(entry: io_registry_entry_t, entryID: pointer) -> tuple[kern_return_t, int]:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# CFMutableDictionaryRef IORegistryEntryIDMatching(uint64_t entryID);
+def IORegistryEntryIDMatching(entryID: int) -> dict:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+# io_registry_entry_t IORegistryEntryFromPath(mach_port_t mainPort, const io_string_t path)
+def IORegistryEntryFromPath(mainPort: mach_port_t, path: io_string_t) -> io_registry_entry_t:  # pylint: disable=invalid-name
+    raise NotImplementedError
+
+
+objc.loadBundleFunctions(IOKit_bundle, globals(), functions)  # type: ignore # pylint: disable=no-member
+objc.loadBundleVariables(IOKit_bundle, globals(), variables)  # type: ignore # pylint: disable=no-member
+
+
+def ioiterator_to_list(iterator: io_iterator_t):
+    # items = []
+    item = IOIteratorNext(iterator)  # noqa: F821
+    while item:
+        # items.append(next)
+        yield item
+        item = IOIteratorNext(iterator)  # noqa: F821
+    IOObjectRelease(iterator)  # noqa: F821
+    # return items
+
+
+def corefoundation_to_native(collection):
+    if collection is None:  # nullptr
+        return None
+    native = Conversion.pythonCollectionFromPropertyList(collection)
+    CFRelease(collection)
+    return native
+
+
+def native_to_corefoundation(native):
+    return Conversion.propertyListFromPythonCollection(native)
+
+
+def io_name_t_to_str(name):
+    return name.partition(b"\0")[0].decode()
+
+
+def get_class_inheritance(io_object):
+    classes = []
+    cls = IOObjectCopyClass(io_object)
+    while cls:
+        # yield cls
+        classes.append(cls)
+        CFRelease(cls)
+        cls = IOObjectCopySuperclassForClass(cls)
+    return classes
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -93,6 +93,14 @@ module.exports = {
            ]

        },
+        {
+            title: 'macOS Monterey',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'MONTEREY-DROP',
+            ]
+        },
        {
            title: 'Misc',
            collapsable: false,
--- a/docs/LICENSE.md
+++ b/docs/LICENSE.md
@@ -9,14 +9,13 @@ This patcher is made of multiple external applications from different people and
  * [AirportBrcmFixup](https://github.com/acidanthera/AirportBrcmFixup/blob/master/LICENSE.txt)
  * [CPUFriend](https://github.com/acidanthera/CPUFriend/blob/master/LICENSE)
  * [RestrictEvents](https://github.com/acidanthera/RestrictEvents/blob/master/LICENSE.txt)
-  * [NightShiftEnabler](https://github.com/cdf/NightShiftEnabler/blob/master/LICENSE.txt)
+  * [FeatureUnlock](https://github.com/acidanthera/FeatureUnlock/blob/master/LICENSE.txt)
  * [Innie](https://github.com/cdf/Innie/blob/master/LICENSE.txt)
 * GPL 2.0
  * [NVMeFix](https://github.com/acidanthera/NVMeFix/blob/master/LICENSE.txt)
 * All rights reserved to respective authors
  * [AAAMouSSE](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/) - Syncretic
  * [telemetrap](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/post-28447707) - Syncretic
-  * [SidecarFixup](https://github.com/khronokernel/SidecarFixup) - Khronokernel
  * 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/MONTEREY-DROP.md
+++ b/docs/MONTEREY-DROP.md
@@ -0,0 +1,116 @@
+# 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.
+
+Current models with full, unhindered support in OpenCore Legacy Patcher are the following:
+
+* 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
+
+## Current Hardware Drawbacks:
+
+Below is a list of hardware that currently has issues with Monterey:
+
+* [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)
+
+## Acceleration Support Dropped
+
+### Metal GPUs
+
+* Intel HD4000 iGPUs lost support
+
+By default these machines require root volume patches to gain graphics acceleration in Monterey. OpenCore Legacy Patcher supports readding support however SIP 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
+
+* Hardware DRM Playback unsupported
+  * Chrome uses Software DRM so has no such limitation in Monterey
+
+:::
+
+### Non-Metal GPUs
+
+* Non-Metal GPUs no longer have working acceleration patches:
+  * Intel Ironlake and Sandy Bridge iGPUs
+  * Nvidia Tesla and Fermi GPUs
+  * AMD TeraScale 1 and 2 GPUs
+
+The following machines cannot gain graphics acceleration at all in Monterey, only basic framebuffer and brightness control (iMac8,1/9,1 and MacBook5,2 excluded):
+
+* iMac12,x and older
+* Macmini5,x and older
+* MacBook7,1 and older
+* MacBookAir4,x and older
+* MacBookPro8,x and older
+
+Note: iMac10,1 through iMac12,x can be upgraded with Metal GPUs, [see here for more info](https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/)
+
+## Bluetooth Support Dropped
+
+* BRCM2046 and BRCM2070 Bluetooth Chipsets lost support
+
+The following models lost Bluetooth support in macOS Monterey due to their legacy Bluetooth chipset:
+
+* iMac12,x and older
+* Macmini5,1 and older
+* MacBook7,1 and older
+* MacBookAir4,1 and older
+* MacBookPro8,1 and older
+* MacPro5,1 and older
+
+::: details Dropped Firmwares
+
+Here are the firmwares macOS Monterey Dropped (previously located within IOBluetoothUSBDFU.kext):
+
+* 2046_820F.dfu
+* 2046_8210.dfu
+* 2046_8213.dfu
+* 2046_8215.dfu
+* 2046_8216.dfu
+* 2046_8217.dfu
+* 2070_821A.dfu
+* 2070_821B.dfu
+* 2070_8218.dfu
+* 20702_821D.dfu
+* 20702_821F.dfu
+* 20702_828A.dfu
+* 20702_828B.dfu
+* 20702_828C.dfu
+* 20702_8281.dfu
+* 20702_8286.dfu
+
+:::
+
+Note: Native BRCM20702 and BRCM20703 are still fully support by OpenCore Legacy Patcher
+
+## Wireless Support Dropped
+
+* Broadcom BCM94328, BCM94322 and Atheros Wireless Chipsets lost support
+
+The following models lost Bluetooth support in macOS Monterey due to their legacy Wireless chipset:
+
+* iMac12,x and older
+* Macmini3,1 and older
+* MacBook5,x and older
+* MacBookAir2,1 and older
+* MacBookPro7,1 and older
+* MacPro5,1 and older
+
+Note: BCM943224, BCM94331, BCM94360 and BCM943602 are still fully support by OpenCore Legacy Patcher
--- a/docs/POST-INSTALL.md
+++ b/docs/POST-INSTALL.md
@@ -28,6 +28,14 @@ Here you can change different patcher settings, however the main interest is:

 Once you've toggled them both off, build your OpenCore EFI once again and install to your desired drive. Now to show the OpenCore selector, you can simply hold down the "ESC" key while clicking on EFI boot, then you can release the "ESC" key when you see the cursor arrow at the top left.

+## Enabling SIP
+
+For many users, SIP will be enabled by default on build. For Intel HD 4000 users, you may have noticed that SIP is disabled. This is to ensure full compatibility with macOS Monterey and allow seamless booting between it and older OSes. However for users who do not plan to boot Monterey, you can re-enable under Patcher Settings.
+
+Note: Machines with non-Metal GPUs cannot enable SIP in Big Sur either due to patched root volume
+
+Note 2: NVRAM may need to be reset to ensure SIP is correctly re-enabled
+
 ## Applying Post Install Volume Patches

 **Note**: For users who need Post-Install Volume patches for legacy video acceleration support, you **must** disable the following settings in "Patcher Settings" when building and installing your new OpenCore:
--- 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/entitlements.plist
+++ b/entitlements.plist
@@ -4,5 +4,7 @@
 <dict>
 	<key>com.apple.security.cs.disable-library-validation</key>
 	<true/>
+	<key>com.apple.security.cs.disable-executable-page-protection</key>
+	<true/>
 </dict>
 </plist>
--- 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/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -169,6 +169,8 @@
 			<false/>
 			<key>ResetLogoStatus</key>
 			<false/>
+			<key>SyncTableIds</key>
+			<false/>
 		</dict>
 	</dict>
 	<key>Booter</key>
@@ -236,7 +238,7 @@
 				<key>Comment</key>
 				<string>Patching Engine</string>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -272,7 +274,7 @@
 				<key>Comment</key>
 				<string>GPU Patching</string>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -418,7 +420,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>20.99.99</string>
 				<key>MinKernel</key>
 				<string>16.0.0</string>
 				<key>BundlePath</key>
@@ -436,7 +438,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>20.99.99</string>
 				<key>MinKernel</key>
 				<string>16.0.0</string>
 				<key>BundlePath</key>
@@ -454,7 +456,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>20.99.99</string>
 				<key>MinKernel</key>
 				<string>16.0.0</string>
 				<key>BundlePath</key>
@@ -472,7 +474,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>20.99.99</string>
 				<key>MinKernel</key>
 				<string>18.0.0</string>
 				<key>BundlePath</key>
@@ -490,7 +492,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>20.99.99</string>
 				<key>MinKernel</key>
 				<string>18.0.0</string>
 				<key>BundlePath</key>
@@ -508,7 +510,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>20.99.99</string>
 				<key>MinKernel</key>
 				<string>19.0.0</string>
 				<key>BundlePath</key>
@@ -526,7 +528,7 @@
 				<key>Enabled</key>
 				<false/>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>20.99.99</string>
 				<key>MinKernel</key>
 				<string>19.0.0</string>
 				<key>BundlePath</key>
@@ -582,7 +584,7 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string>20.0.0</string>
+				<string>19.0.0</string>
 				<key>BundlePath</key>
 				<string>AppleIntelPIIXATA.kext</string>
 				<key>ExecutablePath</key>
@@ -810,17 +812,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>
@@ -860,6 +862,96 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>IOFireWireFamily.kext</string>
+				<key>Comment</key>
+				<string></string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/IOFireWireFamily</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>19.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>IOFireWireFamily.kext/Contents/PlugIns/AppleFWOHCI.kext</string>
+				<key>Comment</key>
+				<string></string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleFWOHCI</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>19.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>IOFireWireSBP2.kext</string>
+				<key>Comment</key>
+				<string></string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/IOFireWireSBP2</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>19.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>IOFireWireSerialBusProtocolTransport.kext</string>
+				<key>Comment</key>
+				<string></string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/IOFireWireSerialBusProtocolTransport</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>19.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>DebugEnhancer.kext</string>
+				<key>Comment</key>
+				<string></string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/DebugEnhancer</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 		</array>
 		<key>Block</key>
 		<array/>
@@ -986,6 +1078,8 @@
 		</dict>
 		<key>Scheme</key>
 		<dict>
+			<key>CustomKernel</key>
+			<false/>
 			<key>FuzzyMatch</key>
 			<true/>
 			<key>KernelArch</key>
@@ -1011,7 +1105,7 @@
 			<key>LauncherOption</key>
 			<string>Full</string>
 			<key>PickerAttributes</key>
-			<integer>17</integer>
+			<integer>145</integer>
 			<key>PickerAudioAssist</key>
 			<false/>
 			<key>PickerMode</key>
@@ -1047,13 +1141,17 @@
 			<integer>3</integer>
 		</dict>
 		<key>Entries</key>
-		<array/>
+		<array>
+			<string>\EFI\Microsoft\Boot\bootmgfw.efi</string>
+		</array>
 		<key>Security</key>
 		<dict>
 			<key>AllowNvramReset</key>
 			<true/>
 			<key>AllowSetDefault</key>
 			<true/>
+			<key>AllowToggleSip</key>
+			<false/>
 			<key>ApECID</key>
 			<integer>0</integer>
 			<key>AuthRestart</key>
@@ -1131,8 +1229,6 @@
 			<dict>
 				<key>DefaultBackgroundColor</key>
 				<data>AAAAAA==</data>
-				<key>UIScale</key>
-				<data>AQ==</data>
 			</dict>
 			<key>4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102</key>
 			<dict>
@@ -1141,10 +1237,8 @@
 			</dict>
 			<key>7C436110-AB2A-4BBB-A880-FE41995C9F82</key>
 			<dict>
-				<key>SystemAudioVolume</key>
-				<data>Rg==</data>
 				<key>boot-args</key>
-				<string>keepsyms=1 debug=0x100 -no_compat_check -lilubetaall</string>
+				<string>keepsyms=1 debug=0x100 -lilubetaall</string>
 				<key>csr-active-config</key>
 				<data>AAAAAA==</data>
 			</dict>
@@ -1155,7 +1249,6 @@
 		<dict>
 			<key>4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14</key>
 			<array>
-				<string>UIScale</string>
 				<string>DefaultBackgroundColor</string>
 			</array>
 			<key>4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102</key>
@@ -1219,7 +1312,7 @@
 		</dict>
 		<key>Generic</key>
 		<dict>
-			<key>AdviseWindows</key>
+			<key>AdviseFeatures</key>
 			<false/>
 			<key>SystemMemoryStatus</key>
 			<string>Auto</string>
@@ -1266,7 +1359,7 @@
 					<key>DeviceLocator</key>
 					<string>Slot 1</string>
 					<key>Manufacturer</key>
-					<string>Acidanthera</string>
+					<string>Acidanthera\GoldenGate</string>
 					<key>PartNumber</key>
 					<string>M00001-4GB</string>
 					<key>SerialNumber</key>
--- a/payloads/Icon/Resources.zip
+++ b/payloads/Icon/Resources.zip
--- a/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.2.zip
+++ b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.2.zip
--- a/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3.zip
+++ b/payloads/Kexts/Acidanthera/AirportBrcmFixup-v2.1.3.zip
--- a/payloads/Kexts/Acidanthera/AppleALC-v1.6.1.zip
+++ b/payloads/Kexts/Acidanthera/AppleALC-v1.6.1.zip
--- a/payloads/Kexts/Acidanthera/AppleALC-v1.6.2.zip
+++ b/payloads/Kexts/Acidanthera/AppleALC-v1.6.2.zip
--- a/payloads/Kexts/Acidanthera/CPUFriend-v1.2.3.zip
+++ b/payloads/Kexts/Acidanthera/CPUFriend-v1.2.3.zip
--- a/payloads/Kexts/Acidanthera/CPUFriend-v1.2.4.zip
+++ b/payloads/Kexts/Acidanthera/CPUFriend-v1.2.4.zip
--- a/payloads/Kexts/Acidanthera/CpuTscSync-v1.0.3.zip
+++ b/payloads/Kexts/Acidanthera/CpuTscSync-v1.0.3.zip
--- a/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.3.zip
+++ b/payloads/Kexts/Acidanthera/DebugEnhancer-v1.0.3.zip
--- a/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3.zip
+++ b/payloads/Kexts/Acidanthera/FeatureUnlock-v1.0.3.zip
--- a/payloads/Kexts/Acidanthera/HibernationFixup-v1.3.9.zip
+++ b/payloads/Kexts/Acidanthera/HibernationFixup-v1.3.9.zip
--- a/payloads/Kexts/Acidanthera/Lilu-v1.5.3.zip
+++ b/payloads/Kexts/Acidanthera/Lilu-v1.5.3.zip
--- a/payloads/Kexts/Acidanthera/Lilu-v1.5.4.zip
+++ b/payloads/Kexts/Acidanthera/Lilu-v1.5.4.zip
--- a/payloads/Kexts/Acidanthera/NVMeFix-v1.0.7.zip
+++ b/payloads/Kexts/Acidanthera/NVMeFix-v1.0.7.zip
--- a/payloads/Kexts/Acidanthera/NVMeFix-v1.0.9.zip
+++ b/payloads/Kexts/Acidanthera/NVMeFix-v1.0.9.zip
--- a/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.1.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-MBP91-v1.0.1.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-v1.0.1.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.1.zip
--- a/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.3.zip
+++ b/payloads/Kexts/Acidanthera/RestrictEvents-v1.0.3.zip
--- a/payloads/Kexts/Acidanthera/SidecarFixup-v1.0.0.zip
+++ b/payloads/Kexts/Acidanthera/SidecarFixup-v1.0.0.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.4.9.zip
+++ b/payloads/Kexts/Acidanthera/WhateverGreen-v1.4.9.zip
--- a/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.1.zip
+++ b/payloads/Kexts/Acidanthera/WhateverGreen-v1.5.1.zip
--- a/payloads/Kexts/FireWire/IOFireWireFamily-v1.0.0.zip
+++ b/payloads/Kexts/FireWire/IOFireWireFamily-v1.0.0.zip
--- a/payloads/Kexts/FireWire/IOFireWireSBP2-v1.0.0.zip
+++ b/payloads/Kexts/FireWire/IOFireWireSBP2-v1.0.0.zip
--- a/payloads/Kexts/FireWire/IOFireWireSerialBusProtocolTransport-v1.0.0.zip
+++ b/payloads/Kexts/FireWire/IOFireWireSerialBusProtocolTransport-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/Plists/AppleGraphicsDevicePolicy/Info.plist
+++ b/payloads/Kexts/Plists/AppleGraphicsDevicePolicy/Info.plist
@@ -113,6 +113,28 @@
 				<string>none</string>
 				<key>iMac14,3</key>
 				<string>none</string>
+				<key>iMac14,4</key>
+				<string>Config2</string>
+				<key>iMac15,1</key>
+				<string>Config2</string>
+				<key>iMac17,1</key>
+				<string>Config2</string>
+				<key>iMac18,2</key>
+				<string>Config3</string>
+				<key>iMac18,3</key>
+				<string>Config3</string>
+				<key>iMac19,1</key>
+				<string>Config3</string>
+				<key>iMac19,2</key>
+				<string>Config3</string>
+				<key>iMac20,1</key>
+				<string>Config3</string>
+				<key>iMac20,2</key>
+				<string>Config3</string>
+				<key>iMacPro1,1</key>
+				<string>Config4</string>
+				<key>MacPro6,1</key>
+				<string>Config1</string>
 				<key>MacBookPro9,1</key>
 				<string>none</string>
 				<key>MacBookPro10,1</key>
--- a/payloads/Kexts/Plists/AppleGraphicsPowerManagement/Info.plist
+++ b/payloads/Kexts/Plists/AppleGraphicsPowerManagement/Info.plist
@@ -295,6 +295,166 @@
 					<key>LogControl</key>
 					<integer>0</integer>
 				</dict>
+				<key>MacBook8,1</key>
+				<dict>
+					<key>IGPU</key>
+					<dict>
+						<key>BoostPState</key>
+						<array>
+							<integer>18</integer>
+							<integer>18</integer>
+							<integer>18</integer>
+							<integer>18</integer>
+						</array>
+						<key>BoostTime</key>
+						<array>
+							<integer>1</integer>
+							<integer>1</integer>
+							<integer>1</integer>
+							<integer>15</integer>
+						</array>
+						<key>HardPlimit</key>
+						<integer>1</integer>
+						<key>Heuristic</key>
+						<dict>
+							<key>BusyDownThresholdPercent</key>
+							<integer>60</integer>
+							<key>BusyUpThresholdPercent</key>
+							<integer>80</integer>
+							<key>DownStep</key>
+							<integer>1</integer>
+							<key>EnableOverride</key>
+							<integer>1</integer>
+							<key>EnableRingTableOverride</key>
+							<integer>1</integer>
+							<key>EvaluateDownInterval</key>
+							<integer>31250</integer>
+							<key>EvaluateUpInterval</key>
+							<integer>31250</integer>
+							<key>GT3Floor</key>
+							<integer>6</integer>
+							<key>ID</key>
+							<integer>2</integer>
+							<key>IOBusynessSamplingInterval</key>
+							<integer>1</integer>
+							<key>LowPriorityPeff</key>
+							<integer>11</integer>
+							<key>NumOfRingTableOverride</key>
+							<integer>23</integer>
+							<key>NumOfRingTables</key>
+							<integer>3</integer>
+							<key>NumOfThresholdsForRingTables</key>
+							<integer>2</integer>
+							<key>RingOverrideTable0</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+							</array>
+							<key>RingOverrideTable1</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+							</array>
+							<key>RingOverrideTable2</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>18</integer>
+								<integer>19</integer>
+								<integer>20</integer>
+								<integer>21</integer>
+								<integer>23</integer>
+								<integer>24</integer>
+								<integer>25</integer>
+								<integer>26</integer>
+								<integer>28</integer>
+								<integer>29</integer>
+								<integer>30</integer>
+								<integer>31</integer>
+								<integer>33</integer>
+							</array>
+							<key>StartingPstateForRingTableOverride</key>
+							<integer>11</integer>
+							<key>ThresholdsForRingOverrideTable0</key>
+							<array>
+								<integer>0</integer>
+								<integer>10</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable1</key>
+							<array>
+								<integer>5</integer>
+								<integer>15</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable2</key>
+							<array>
+								<integer>10</integer>
+								<integer>100</integer>
+							</array>
+							<key>UpStep</key>
+							<integer>2</integer>
+							<key>sampleInterval</key>
+							<integer>1000</integer>
+						</dict>
+						<key>NumPriorityLevels</key>
+						<integer>4</integer>
+						<key>PriorityLevelMask</key>
+						<integer>8</integer>
+						<key>ThermalSupport</key>
+						<integer>1</integer>
+						<key>control-id</key>
+						<integer>16</integer>
+					</dict>
+				</dict>
 				<key>MacBookAir2,1</key>
 				<dict>
 					<key>IGPU</key>
@@ -2274,6 +2434,500 @@
 						<integer>16</integer>
 					</dict>
 				</dict>
+				<key>MacBookPro11,1</key>
+				<dict>
+					<key>IGPU</key>
+					<dict>
+						<key>Heuristic</key>
+						<dict>
+							<key>BusyDownThresholdPercent</key>
+							<integer>50</integer>
+							<key>BusyUpThresholdPercent</key>
+							<integer>70</integer>
+							<key>DownStep</key>
+							<integer>1</integer>
+							<key>EnableOverride</key>
+							<integer>1</integer>
+							<key>EnableRingTableOverride</key>
+							<integer>1</integer>
+							<key>EvaluateDownInterval</key>
+							<integer>31250</integer>
+							<key>EvaluateUpInterval</key>
+							<integer>31250</integer>
+							<key>GT2Floor</key>
+							<integer>8</integer>
+							<key>GT3Floor</key>
+							<integer>11</integer>
+							<key>ID</key>
+							<integer>2</integer>
+							<key>IOBusynessSamplingInterval</key>
+							<integer>1</integer>
+							<key>NumOfRingTableOverride</key>
+							<integer>23</integer>
+							<key>NumOfRingTables</key>
+							<integer>3</integer>
+							<key>NumOfThresholdsForRingTables</key>
+							<integer>2</integer>
+							<key>RingOverrideTable0</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+							</array>
+							<key>RingOverrideTable1</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+							</array>
+							<key>RingOverrideTable2</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>18</integer>
+								<integer>19</integer>
+								<integer>20</integer>
+								<integer>21</integer>
+								<integer>23</integer>
+								<integer>24</integer>
+								<integer>25</integer>
+								<integer>26</integer>
+								<integer>28</integer>
+								<integer>29</integer>
+								<integer>30</integer>
+								<integer>31</integer>
+								<integer>33</integer>
+							</array>
+							<key>StartingPstateForRingTableOverride</key>
+							<integer>11</integer>
+							<key>ThresholdsForRingOverrideTable0</key>
+							<array>
+								<integer>0</integer>
+								<integer>10</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable1</key>
+							<array>
+								<integer>5</integer>
+								<integer>15</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable2</key>
+							<array>
+								<integer>10</integer>
+								<integer>100</integer>
+							</array>
+							<key>UpStep</key>
+							<integer>1</integer>
+						</dict>
+						<key>SliceControl</key>
+						<integer>1</integer>
+						<key>control-id</key>
+						<integer>16</integer>
+					</dict>
+				</dict>
+				<key>MacBookPro11,2</key>
+				<dict>
+					<key>IGPU</key>
+					<dict>
+						<key>Heuristic</key>
+						<dict>
+							<key>BusyDownThresholdPercent</key>
+							<integer>50</integer>
+							<key>BusyUpThresholdPercent</key>
+							<integer>70</integer>
+							<key>DownStep</key>
+							<integer>1</integer>
+							<key>EnableOverride</key>
+							<integer>1</integer>
+							<key>EnableRingTableOverride</key>
+							<integer>1</integer>
+							<key>EvaluateDownInterval</key>
+							<integer>31250</integer>
+							<key>EvaluateUpInterval</key>
+							<integer>31250</integer>
+							<key>GT2Floor</key>
+							<integer>12</integer>
+							<key>GT3Floor</key>
+							<integer>15</integer>
+							<key>ID</key>
+							<integer>2</integer>
+							<key>IOBusynessSamplingInterval</key>
+							<integer>1</integer>
+							<key>NumOfRingTableOverride</key>
+							<integer>23</integer>
+							<key>NumOfRingTables</key>
+							<integer>3</integer>
+							<key>NumOfThresholdsForRingTables</key>
+							<integer>2</integer>
+							<key>RingOverrideTable0</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+							</array>
+							<key>RingOverrideTable1</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>29</integer>
+								<integer>30</integer>
+								<integer>31</integer>
+								<integer>33</integer>
+							</array>
+							<key>RingOverrideTable2</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>18</integer>
+								<integer>19</integer>
+								<integer>20</integer>
+								<integer>21</integer>
+								<integer>23</integer>
+								<integer>24</integer>
+								<integer>25</integer>
+								<integer>26</integer>
+								<integer>28</integer>
+								<integer>29</integer>
+								<integer>30</integer>
+								<integer>31</integer>
+								<integer>33</integer>
+							</array>
+							<key>StartingPstateForRingTableOverride</key>
+							<integer>11</integer>
+							<key>ThresholdsForRingOverrideTable0</key>
+							<array>
+								<integer>0</integer>
+								<integer>10</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable1</key>
+							<array>
+								<integer>5</integer>
+								<integer>15</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable2</key>
+							<array>
+								<integer>10</integer>
+								<integer>100</integer>
+							</array>
+							<key>UpStep</key>
+							<integer>1</integer>
+						</dict>
+						<key>SliceControl</key>
+						<integer>1</integer>
+						<key>control-id</key>
+						<integer>16</integer>
+					</dict>
+				</dict>
+				<key>MacBookPro11,3</key>
+				<dict>
+					<key>GFX0</key>
+					<dict>
+						<key>BoostPState</key>
+						<array>
+							<integer>6</integer>
+							<integer>14</integer>
+							<integer>14</integer>
+							<integer>6</integer>
+						</array>
+						<key>BoostTime</key>
+						<array>
+							<integer>1</integer>
+							<integer>1</integer>
+							<integer>1</integer>
+							<integer>1</integer>
+						</array>
+						<key>Heuristic</key>
+						<dict>
+							<key>ID</key>
+							<integer>4</integer>
+							<key>MinP0P1</key>
+							<integer>10</integer>
+							<key>MinP5</key>
+							<integer>14</integer>
+							<key>MinP8</key>
+							<integer>15</integer>
+							<key>MinVP0</key>
+							<integer>10</integer>
+							<key>MinVP1</key>
+							<integer>21</integer>
+							<key>MinVP5</key>
+							<integer>28</integer>
+							<key>MinVP8</key>
+							<integer>29</integer>
+							<key>NumOfPstates</key>
+							<integer>16</integer>
+							<key>NumOfVPstates</key>
+							<integer>31</integer>
+							<key>P0Table</key>
+							<array>
+								<integer>0</integer>
+								<integer>1</integer>
+								<integer>2</integer>
+								<integer>3</integer>
+								<integer>4</integer>
+								<integer>5</integer>
+								<integer>6</integer>
+								<integer>7</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>25</integer>
+								<integer>26</integer>
+								<integer>27</integer>
+								<integer>28</integer>
+								<integer>29</integer>
+							</array>
+							<key>P1Table</key>
+							<array>
+								<integer>11</integer>
+								<integer>12</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>17</integer>
+								<integer>18</integer>
+								<integer>19</integer>
+								<integer>20</integer>
+								<integer>21</integer>
+								<integer>25</integer>
+								<integer>26</integer>
+								<integer>27</integer>
+								<integer>28</integer>
+								<integer>29</integer>
+							</array>
+						</dict>
+						<key>control-id</key>
+						<integer>17</integer>
+					</dict>
+					<key>IGPU</key>
+					<dict>
+						<key>Heuristic</key>
+						<dict>
+							<key>BusyDownThresholdPercent</key>
+							<integer>50</integer>
+							<key>BusyUpThresholdPercent</key>
+							<integer>70</integer>
+							<key>DownStep</key>
+							<integer>1</integer>
+							<key>EnableOverride</key>
+							<integer>1</integer>
+							<key>EnableRingTableOverride</key>
+							<integer>1</integer>
+							<key>EvaluateDownInterval</key>
+							<integer>31250</integer>
+							<key>EvaluateUpInterval</key>
+							<integer>31250</integer>
+							<key>GT2Floor</key>
+							<integer>12</integer>
+							<key>GT3Floor</key>
+							<integer>15</integer>
+							<key>ID</key>
+							<integer>2</integer>
+							<key>IOBusynessSamplingInterval</key>
+							<integer>1</integer>
+							<key>NumOfRingTableOverride</key>
+							<integer>23</integer>
+							<key>NumOfRingTables</key>
+							<integer>3</integer>
+							<key>NumOfThresholdsForRingTables</key>
+							<integer>2</integer>
+							<key>RingOverrideTable0</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+							</array>
+							<key>RingOverrideTable1</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>29</integer>
+								<integer>30</integer>
+								<integer>31</integer>
+								<integer>33</integer>
+							</array>
+							<key>RingOverrideTable2</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>18</integer>
+								<integer>19</integer>
+								<integer>20</integer>
+								<integer>21</integer>
+								<integer>23</integer>
+								<integer>24</integer>
+								<integer>25</integer>
+								<integer>26</integer>
+								<integer>28</integer>
+								<integer>29</integer>
+								<integer>30</integer>
+								<integer>31</integer>
+								<integer>33</integer>
+							</array>
+							<key>StartingPstateForRingTableOverride</key>
+							<integer>11</integer>
+							<key>ThresholdsForRingOverrideTable0</key>
+							<array>
+								<integer>0</integer>
+								<integer>10</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable1</key>
+							<array>
+								<integer>5</integer>
+								<integer>15</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable2</key>
+							<array>
+								<integer>10</integer>
+								<integer>100</integer>
+							</array>
+							<key>UpStep</key>
+							<integer>1</integer>
+						</dict>
+						<key>SliceControl</key>
+						<integer>1</integer>
+						<key>control-id</key>
+						<integer>16</integer>
+					</dict>
+				</dict>
 				<key>MacPro4,1</key>
 				<dict>
 					<key>Vendor10deDevice05e2</key>
@@ -4249,6 +4903,175 @@
 						<integer>16</integer>
 					</dict>
 				</dict>
+				<key>iMac14,4</key>
+				<dict>
+					<key>IGPU</key>
+					<dict>
+						<key>Heuristic</key>
+						<dict>
+							<key>BusyDownThresholdPercent</key>
+							<integer>50</integer>
+							<key>BusyUpThresholdPercent</key>
+							<integer>70</integer>
+							<key>DownStep</key>
+							<integer>1</integer>
+							<key>EnableOverride</key>
+							<integer>1</integer>
+							<key>EnableRingTableOverride</key>
+							<integer>1</integer>
+							<key>EvaluateDownInterval</key>
+							<integer>31250</integer>
+							<key>EvaluateUpInterval</key>
+							<integer>31250</integer>
+							<key>GT2Floor</key>
+							<integer>12</integer>
+							<key>GT3Floor</key>
+							<integer>15</integer>
+							<key>ID</key>
+							<integer>2</integer>
+							<key>IOBusynessSamplingInterval</key>
+							<integer>1</integer>
+							<key>NumOfRingTableOverride</key>
+							<integer>23</integer>
+							<key>NumOfRingTables</key>
+							<integer>3</integer>
+							<key>NumOfThresholdsForRingTables</key>
+							<integer>2</integer>
+							<key>RingOverrideTable0</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+								<integer>10</integer>
+							</array>
+							<key>RingOverrideTable1</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+								<integer>16</integer>
+							</array>
+							<key>RingOverrideTable2</key>
+							<array>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>8</integer>
+								<integer>9</integer>
+								<integer>10</integer>
+								<integer>11</integer>
+								<integer>13</integer>
+								<integer>14</integer>
+								<integer>15</integer>
+								<integer>16</integer>
+								<integer>18</integer>
+								<integer>19</integer>
+								<integer>20</integer>
+								<integer>21</integer>
+								<integer>23</integer>
+								<integer>24</integer>
+								<integer>25</integer>
+								<integer>26</integer>
+								<integer>28</integer>
+								<integer>29</integer>
+								<integer>30</integer>
+								<integer>31</integer>
+								<integer>33</integer>
+							</array>
+							<key>StartingPstateForRingTableOverride</key>
+							<integer>11</integer>
+							<key>ThresholdsForRingOverrideTable0</key>
+							<array>
+								<integer>0</integer>
+								<integer>10</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable1</key>
+							<array>
+								<integer>5</integer>
+								<integer>15</integer>
+							</array>
+							<key>ThresholdsForRingOverrideTable2</key>
+							<array>
+								<integer>10</integer>
+								<integer>100</integer>
+							</array>
+							<key>UpStep</key>
+							<integer>1</integer>
+						</dict>
+						<key>SliceControl</key>
+						<integer>1</integer>
+						<key>control-id</key>
+						<integer>16</integer>
+					</dict>
+				</dict>
+				<key>iMac15,1</key>
+				<dict>
+					<key>GFX0</key>
+					<dict>
+						<key>AGDCEnabled</key>
+						<integer>1</integer>
+						<key>Heuristic</key>
+						<dict>
+							<key>ID</key>
+							<integer>-1</integer>
+						</dict>
+						<key>control-id</key>
+						<integer>17</integer>
+						<key>max-power-state</key>
+						<integer>15</integer>
+						<key>min-power-state</key>
+						<integer>0</integer>
+					</dict>
+					<key>IGPU</key>
+					<dict>
+						<key>Heuristic</key>
+						<dict>
+							<key>EnableOverride</key>
+							<integer>0</integer>
+							<key>ID</key>
+							<integer>2</integer>
+						</dict>
+						<key>control-id</key>
+						<integer>16</integer>
+					</dict>
+				</dict>
 			</dict>
 		</dict>
 	</dict>
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBook8,1/Info.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBook8,1/Info.plist
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBook8,1/Mac-BE0E8AC46FE800CC.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBook8,1/Mac-BE0E8AC46FE800CC.plist
@@ -0,0 +1,658 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>pmspFile</key>
+    <integer>8</integer>
+    <key>IOPlatformPowerProfile</key>
+    <dict>
+      <key>power_reduced_playback</key>
+      <true/>
+      <key>thermally_optimized_xcode</key>
+      <true/>
+      <key>optimized_photobooth</key>
+      <true/>
+      <key>optimized_screensavers</key>
+      <true/>
+      <key>optimized_slideshows</key>
+      <true/>
+      <key>optimized_visualizers</key>
+      <true/>
+      <key>thermally_optimized_maps</key>
+      <true/>
+      <key>CPUFloor</key>
+      <integer>1000</integer>
+      <key>BoostLimit</key>
+      <integer>0</integer>
+      <key>UnifiedSleepSliderPref</key>
+      <true/>
+      <key>PublishBatteryFactors</key>
+      <true/>
+      <key>NetworkTimerDelay</key>
+      <integer>900</integer>
+      <key>StandbyDelayHigh</key>
+      <integer>86400</integer>
+      <key>StandbyDelay</key>
+      <integer>10800</integer>
+      <key>StandbyBatteryThreshold</key>
+      <integer>50</integer>
+      <key>AutoPowerOff</key>
+      <true/>
+      <key>ProximityWake</key>
+      <integer>0</integer>
+      <key>IOPlatformSystemSleepPolicy</key>
+      <data>U0xQVAIAEwCEHhIABAAAAAAUAAAABAAABgAAAAAAAAAPJQAAAAAAAAAAQAAAAEAAAAAQAAAAEAAH
+AAAAAAAAAA8lAAAAAAAAhB4SAAQAAAAAGAAAAAgAAAUAAAAAAAAADyUAAAAAAACEHhIABAAAAAgQ
+AAAIAAAABQAAAAAAAAAPJQAAAAAAACAAAAAgAAAAAAAAAAAAAAAFAAAAAAAAAA8lAAAAAAAACAAA
+AAgAAAAAAAAAAAAAAAYAAAAAAAAABAEAAAEAAAAAAAQAAAAEAAAAAAAAAAAABQAAAAAAAAAPJQAA
+AAAAAAAAAQAAAAEAAAAAAAAAAAAGAAAAAAAAAAQBAAAAAAAAxBYAAAAAAAAIAAAACAAAAAUAAAAA
+AAAADyUAAAAAAADEFhAAAAAQACBAAAAgQAAABwAAAAgAAAAPPQAAAAAAAMQWAAAAAAAAIAAAACAA
+AAAFAAAAAAAAAA8lAAAAAAAA1BYAABAAAAAAAAAAAAAAAAUAAAAAAAAADyUAAAAAAADEHhIARAAA
+AAYQAAAGAAAABwAAAAIAAAAPPQAAAAAAAIQeEgAEAAAAABAAAAAAAAAHAAAAAgAAAA89AAAAAAAA
+xBYAAAAAAAAAwAAAAMAAAAcAAAAIAAAADz0AAAAAAADEFgAAAAAAAAiAAAAIgAAABQAAAAAAAAAP
+JQAAAAAAAMQWAAAAAAAAAAAAAAAAAAAHAAAAAQAAAA89AAAAAAAAQAAAAEAAAAAGAAAABgAAAAcA
+AAAAAAAADzUAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAPNQAAAAAAAA==</data>
+      <key>Frequencies</key>
+      <dict>
+        <key>2400</key>
+        <integer>0</integer>
+        <key>2600</key>
+        <integer>1</integer>
+        <key>2900</key>
+        <integer>2</integer>
+      </dict>
+      <key>FrequencyVectors</key>
+      <array>
+        <data>
+AgAAAA0AAAABAAAAAAAAAHgeAAAAAAAAyAAAAAAAAAAAZOgDAAAAAAAAAEvQBwAAAAAAAAAyuAsA
+AAAAAAAAGaAPAAAAAAAAAAD///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAABEAAAABAAAAAAAAAKwNAAAAAAAAyAAAAAAAAAABZOgDAAAAAAAAAUvQBwAA
+AAAAAAEyuAsAAAAAAAAAMqAPAAAAAAAAABn///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAABAAAAAAAAAKAPAAAAAAAAyAAAAAAAAAACZPQBAAAA
+AAAAAUvoAwAAAAAAAAEy0AcAAAAAAAABGbgLAAAAAAAAADKgDwAAAAAAAAAZ////////DwAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAABAAAAAAAAAJQRAAAAAAAAyAAAAAAA
+AAADZPQBAAAAAAAAAzLoAwAAAAAAAAMZ0AcAAAAAAAABMrgLAAAAAAAAADKgDwAAAAAAAAAZ////
+////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAABAAAAAAAAAJQRAAAA
+AAAAyAAAAAAAAAAEZOgDAAAAAAAABBnQBwAAAAAAAAEZuAsAAAAAAAAAMqAPAAAAAAAAABn/////
+//8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAEEAAAZABkA
+ZABkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABLRVJORUwAAAAAAAAAAAAAAARkAJYAyAAsASwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElFUjIAAAAAAAAAAmQAyADIAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVEhS
+VV9USUVSMwAAAAAAAAACZADIAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUSFJVX1RJRVI0AAAAAAAAAAHIAMgAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElF
+UjUAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaGFyZC1ydC1ucwAAAAAAAAAAAAAACT0AAAAAAAAAAAAA
+AAAAdXRpbGl0eS10bHZsAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAbm9uLWZvY2FsLXRsdmwAAAAA
+AACWAAAAAAAAAAAAAAAAAAAAdWJwYwAAAAAAAAAAAAAAAAEAAABvZmYAAAAAAAAAAAAAAAAAaW9j
+c19lbmdhZ2UAAAAAAAAAAAAAahgAAAAAAAAAAAAAAAAAaW9jc19kaXNlbmdhZ2UAAAAAAACgJSYA
+AAAAAAAAAAAAAAAAaW9jc19jc3RmbHIAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAaW9jc19ydHJp
+Z2dlcgAAAAAAAABkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+        <data>
+AgAAAA0AAAABAAAAAAAAAHgeAAAAAAAAyAAAAAAAAAAAZOgDAAAAAAAAAEvQBwAAAAAAAAAyuAsA
+AAAAAAAAGaAPAAAAAAAAAAD///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAABEAAAABAAAAAAAAAKwNAAAAAAAAyAAAAAAAAAABZOgDAAAAAAAAAUvQBwAA
+AAAAAAEyuAsAAAAAAAAAMqAPAAAAAAAAABn///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAABAAAAAAAAAKAPAAAAAAAAyAAAAAAAAAACZPQBAAAA
+AAAAAUvoAwAAAAAAAAEy0AcAAAAAAAABGbgLAAAAAAAAADKgDwAAAAAAAAAZ////////DwAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAABAAAAAAAAAJQRAAAAAAAAyAAAAAAA
+AAADZPQBAAAAAAAAAzLoAwAAAAAAAAMZ0AcAAAAAAAABMrgLAAAAAAAAADKgDwAAAAAAAAAZ////
+////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAABAAAAAAAAAJQRAAAA
+AAAAyAAAAAAAAAAEZOgDAAAAAAAABBnQBwAAAAAAAAEZuAsAAAAAAAAAMqAPAAAAAAAAABn/////
+//8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoAAAABAAAA
+AAAAAKCGAQAAAAAALAEAAAAAAAAFZPQBAAAAAAAAA0voAwAAAAAAAAMy0AcAAAAAAAADALgLAAAA
+AAAAATKgDwAAAAAAAAEA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAEFAAAZABkA
+ZABkAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABLRVJORUwAAAAAAAAAAAAAAAVkAJYAyAAsASwBLAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElFUjIAAAAAAAAAAmQAyADIAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVEhS
+VV9USUVSMwAAAAAAAAACZADIAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUSFJVX1RJRVI0AAAAAAAAAAHIAMgAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElF
+UjUAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaGFyZC1ydC1ucwAAAAAAAAAAAAAACT0AAAAAAAAAAAAA
+AAAAdXRpbGl0eS10bHZsAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAbm9uLWZvY2FsLXRsdmwAAAAA
+AACWAAAAAAAAAAAAAAAAAAAAdWJwYwAAAAAAAAAAAAAAAAEAAABvZmYAAAAAAAAAAAAAAAAAaW9j
+c19lbmdhZ2UAAAAAAAAAAAAAahgAAAAAAAAAAAAAAAAAaW9jc19kaXNlbmdhZ2UAAAAAAACgJSYA
+AAAAAAAAAAAAAAAAaW9jc19jc3RmbHIAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAaW9jc19ydHJp
+Z2dlcgAAAAAAAABkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+        <data>
+AgAAAA0AAAABAAAAAAAAAHgeAAAAAAAAyAAAAAAAAAAAZOgDAAAAAAAAAEvQBwAAAAAAAAAyuAsA
+AAAAAAAAGaAPAAAAAAAAAAD///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAABEAAAABAAAAAAAAAKwNAAAAAAAAyAAAAAAAAAABZOgDAAAAAAAAAUvQBwAA
+AAAAAAEyuAsAAAAAAAAAMqAPAAAAAAAAABn///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAABAAAAAAAAAKAPAAAAAAAAyAAAAAAAAAACZPQBAAAA
+AAAAAUvoAwAAAAAAAAEy0AcAAAAAAAABGbgLAAAAAAAAADKgDwAAAAAAAAAZ////////DwAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAABAAAAAAAAAJQRAAAAAAAAyAAAAAAA
+AAADZPQBAAAAAAAAAzLoAwAAAAAAAAMZ0AcAAAAAAAABMrgLAAAAAAAAADKgDwAAAAAAAAAZ////
+////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAABAAAAAAAAAJQRAAAA
+AAAAyAAAAAAAAAAEZOgDAAAAAAAABBnQBwAAAAAAAAEZuAsAAAAAAAAAMqAPAAAAAAAAABn/////
+//8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAABAAAA
+AAAAAKCGAQAAAAAALAEAAAAAAAAFZPQBAAAAAAAAA0voAwAAAAAAAAMy0AcAAAAAAAADALgLAAAA
+AAAAATKgDwAAAAAAAAEA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAEFAAAZABkA
+ZABkAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABLRVJORUwAAAAAAAAAAAAAAAVkAJYAyAAsASwBLAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElFUjIAAAAAAAAAAmQAyADIAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVEhS
+VV9USUVSMwAAAAAAAAACZADIAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUSFJVX1RJRVI0AAAAAAAAAAHIAMgAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElF
+UjUAAAAAAAAAAGQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaGFyZC1ydC1ucwAAAAAAAAAAAAAACT0AAAAAAAAAAAAA
+AAAAdXRpbGl0eS10bHZsAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAbm9uLWZvY2FsLXRsdmwAAAAA
+AACWAAAAAAAAAAAAAAAAAAAAdWJwYwAAAAAAAAAAAAAAAAEAAABvZmYAAAAAAAAAAAAAAAAAaW9j
+c19lbmdhZ2UAAAAAAAAAAAAAahgAAAAAAAAAAAAAAAAAaW9jc19kaXNlbmdhZ2UAAAAAAACgJSYA
+AAAAAAAAAAAAAAAAaW9jc19jc3RmbHIAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAaW9jc19ydHJp
+Z2dlcgAAAAAAAABkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+      </array>
+      <key>ThermalConfiguration</key>
+      <dict>
+        <key>Domain</key>
+        <dict>
+          <key>CPU</key>
+          <dict>
+            <key>SFIWindow</key>
+            <integer>50000</integer>
+            <key>SFIWindowHigh</key>
+            <integer>25000</integer>
+            <key>SFIWindowThreshold</key>
+            <integer>150</integer>
+            <key>SFIMaintenance</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>1=0%,10=25%,15=40%,20=75%,130=75%,150=87%</string>
+            </dict>
+            <key>SFIDarwinBG</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>1=0%,10=25%,15=40%,20=75%,130=75%,150=87%</string>
+            </dict>
+            <key>SFIAppNap</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>10=0%,20=25%,25=40%,30=75%,130=75%,150=87%</string>
+            </dict>
+            <key>SFIUtility</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>30=0%,40=20%,45=37%,50=50%,130=50%,150=75%</string>
+            </dict>
+            <key>SFIManagedFocal</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>190=0%,250=25%</string>
+            </dict>
+            <key>SFIManagedNonFocal</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>150=0%,200=50%</string>
+            </dict>
+            <key>QOSThermalThresholds</key>
+            <dict>
+              <key>Utility</key>
+              <integer>20</integer>
+              <key>NonFocal</key>
+              <integer>150</integer>
+            </dict>
+            <key>ThermalPressure</key>
+            <dict>
+              <key>Nominal</key>
+              <dict>
+                <key>LowThreshold</key>
+                <integer>0</integer>
+                <key>HighThreshold</key>
+                <integer>75</integer>
+              </dict>
+              <key>Moderate</key>
+              <dict>
+                <key>LowThreshold</key>
+                <integer>50</integer>
+                <key>HighThreshold</key>
+                <integer>125</integer>
+              </dict>
+              <key>Heavy</key>
+              <dict>
+                <key>LowThreshold</key>
+                <integer>100</integer>
+                <key>HighThreshold</key>
+                <integer>200</integer>
+              </dict>
+              <key>Trapping</key>
+              <dict>
+                <key>LowThreshold</key>
+                <integer>150</integer>
+                <key>HighThreshold</key>
+                <integer>250</integer>
+              </dict>
+              <key>Sleeping</key>
+              <dict>
+                <key>LowThreshold</key>
+                <integer>225</integer>
+                <key>HighThreshold</key>
+                <integer>252</integer>
+              </dict>
+            </dict>
+          </dict>
+          <key>GPU</key>
+          <dict>
+            <key>GPUTier1</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>0=0%</string>
+            </dict>
+            <key>GPUTier2</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>0=0%</string>
+            </dict>
+            <key>GPUTier3</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>0=0%</string>
+            </dict>
+            <key>GPUTier4</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>0=0%,150=0%,175=50%,200=75%,250=80%,251=87%</string>
+            </dict>
+          </dict>
+          <key>IO</key>
+          <dict>
+            <key>IOTier0</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>0=0%</string>
+            </dict>
+            <key>IOTier1</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>0=0%</string>
+            </dict>
+            <key>IOTier2</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>0=0%</string>
+            </dict>
+            <key>IOTier3</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>0=0%</string>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+      <key>TCPKeepAliveDuringSleep</key>
+      <true/>
+      <key>TCPKeepAliveExpirationTimeout</key>
+      <integer>43200</integer>
+      <key>NotificationWake</key>
+      <true/>
+      <key>DNDWhileDisplaySleeps</key>
+      <false/>
+      <key>DarkWakeServices</key>
+      <dict>
+        <key>DarkWakeBackgroundTasks</key>
+        <integer>1</integer>
+        <key>SleepServices</key>
+        <integer>7</integer>
+        <key>SleepServicesModes</key>
+        <dict>
+          <key>ModeA</key>
+          <dict>
+            <key>Expiration</key>
+            <integer>0</integer>
+            <key>BatteryFloor</key>
+            <integer>0</integer>
+            <key>BaseIntervals</key>
+            <dict>
+              <key>AC</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>86400</integer>
+              </dict>
+              <key>Battery</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>180</integer>
+              </dict>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+    </dict>
+  </dict>
+</plist>
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookAir6,1/Info.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookAir6,1/Info.plist
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookAir6,1/Mac-35C1E88140C3E6CF.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookAir6,1/Mac-35C1E88140C3E6CF.plist
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>pmspFile</key>
+    <integer>5</integer>
+    <key>IOPlatformPowerProfile</key>
+    <dict>
+      <key>UnifiedSleepSliderPref</key>
+      <true/>
+      <key>enabler</key>
+      <true/>
+      <key>AGPM</key>
+      <true/>
+      <key>ASPM</key>
+      <true/>
+      <key>PublishBatteryFactors</key>
+      <true/>
+      <key>NetworkTimerDelay</key>
+      <integer>900</integer>
+      <key>StandbyDelayHigh</key>
+      <integer>86400</integer>
+      <key>StandbyDelay</key>
+      <integer>10800</integer>
+      <key>StandbyBatteryThreshold</key>
+      <integer>50</integer>
+      <key>AutoPowerOff</key>
+      <true/>
+      <key>ProximityWake</key>
+      <integer>0</integer>
+      <key>IOPlatformSystemSleepPolicy</key>
+      <data>U0xQVAIAEwCEHhIABAAAAAAUAAAABAAABgAAAAAAAAAPJQAAAAAAAAAAQAAAAEAAAAAQAAAAEAAH
+AAAAAAAAAA8lAAAAAAAAhB4SAAQAAAAAGAAAAAgAAAUAAAAAAAAADyUAAAAAAACEHhIABAAAAAgQ
+AAAIAAAABQAAAAAAAAAPJQAAAAAAACAAAAAgAAAAAAAAAAAAAAAFAAAAAAAAAA8lAAAAAAAACAAA
+AAgAAAAAAAAAAAAAAAYAAAAAAAAAAAEAAAEAAAAAAAQAAAAEAAAAAAAAAAAABQAAAAAAAAAPJQAA
+AAAAAAAAAQAAAAEAAAAAAAAAAAAGAAAAAAAAAAABAAAAAAAAxBYAAAAAAAAIAAAACAAAAAUAAAAA
+AAAADyUAAAAAAADEFhAAAAAQACBAAAAgQAAABwAAAAgAAAAPOQAAAAAAAMQWAAAAAAAAIAAAACAA
+AAAFAAAAAAAAAA8lAAAAAAAA1BYAABAAAAAAAAAAAAAAAAUAAAAAAAAADyUAAAAAAADEHhIARAAA
+AAYQAAAGAAAABwAAAAIAAAAPOQAAAAAAAIQeEgAEAAAAABAAAAAAAAAHAAAAAgAAAA85AAAAAAAA
+xBYAAAAAAAAAwAAAAMAAAAcAAAAIAAAADzkAAAAAAADEFgAAAAAAAAiAAAAIgAAABQAAAAAAAAAP
+JQAAAAAAAMQWAAAAAAAAAAAAAAAAAAAHAAAAAQAAAA85AAAAAAAAQAAAAEAAAAAGAAAABgAAAAcA
+AAAAAAAADzEAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAPMQAAAAAAAA==</data>
+      <key>FanThrottledRPM</key>
+      <integer>2000</integer>
+      <key>FanMax</key>
+      <array>
+        <integer>6500</integer>
+      </array>
+      <key>InitialPLimit</key>
+      <integer>0</integer>
+      <key>FrequencyVectors</key>
+      <array>
+        <data>
+AgAAAAAAAAACAAAAAAAAAMgAAAAAAAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAGQAAAACAAAAAAAAAHgeAAAAAAAAyAAAAAAAAAABZOgDAAAAAAAAAUvQBwAA
+AAAAAAEyuAsAAAAAAAABGaAPAAAAAAAAAAD///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAADIAAAADAAAAAAAAANQXAAAAAAAAyAAAAAAAAAACZPQBAAAA
+AAAAAjLoAwAAAAAAAAIA0AcAAAAAAAABMrgLAAAAAAAAAQCgDwAAAAAAAAAA////////DwAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAADAAAAAAAAAKCGAQAAAAAALAEAAAAA
+AAADZPQBAAAAAAAAAkvoAwAAAAAAAAIy0AcAAAAAAAACALgLAAAAAAAAATKgDwAAAAAAAAAA////
+////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAWQAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAEDAAAyADIA
+ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABLRVJORUwAAAAAAAAAAAAAAAJkAJYAyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElFUjQAAAAAAAAAAmQAyADIAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVEhS
+VV9USUVSNQAAAAAAAAAByADIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdXRpbGl0eS10bHZsAAAAAAAAAABAAAAAAAAAAAAAAAAA
+AAAAbm9uLWZvY2FsLXRsdmwAAAAAAAD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+      </array>
+      <key>ThermalConfiguration</key>
+      <dict>
+        <key>Domain</key>
+        <dict>
+          <key>CPU</key>
+          <dict>
+            <key>SFIWindow</key>
+            <integer>50000</integer>
+            <key>SFIMaintenance</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,78=67%</string>
+            </dict>
+            <key>SFIDarwinBG</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,78=67%</string>
+            </dict>
+            <key>SFIAppNap</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,78=67%</string>
+            </dict>
+            <key>QOSThermalThresholds</key>
+            <dict>
+              <key>Utility</key>
+              <integer>64</integer>
+              <key>NonFocal</key>
+              <integer>251</integer>
+            </dict>
+            <key>ThermalPressure</key>
+            <dict>
+              <key>Nominal</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>64</integer>
+                <key>LowThreshold</key>
+                <integer>0</integer>
+              </dict>
+              <key>Moderate</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>120</integer>
+                <key>LowThreshold</key>
+                <integer>50</integer>
+              </dict>
+              <key>Heavy</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>200</integer>
+                <key>LowThreshold</key>
+                <integer>90</integer>
+              </dict>
+              <key>Trapping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>250</integer>
+                <key>LowThreshold</key>
+                <integer>180</integer>
+              </dict>
+              <key>Sleeping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>252</integer>
+                <key>LowThreshold</key>
+                <integer>251</integer>
+              </dict>
+            </dict>
+          </dict>
+          <key>GPU</key>
+          <dict/>
+          <key>IO</key>
+          <dict/>
+        </dict>
+      </dict>
+      <key>DarkWakeServices</key>
+      <dict>
+        <key>DarkWakeBackgroundTasks</key>
+        <integer>1</integer>
+        <key>SleepServices</key>
+        <integer>7</integer>
+        <key>SleepServicesModes</key>
+        <dict>
+          <key>ModeA</key>
+          <dict>
+            <key>Expiration</key>
+            <integer>0</integer>
+            <key>BatteryFloor</key>
+            <integer>0</integer>
+            <key>BaseIntervals</key>
+            <dict>
+              <key>AC</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>86400</integer>
+              </dict>
+              <key>Battery</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>180</integer>
+              </dict>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+    </dict>
+  </dict>
+</plist>
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookAir6,2/Info.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookAir6,2/Info.plist
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookAir6,2/Mac-7DF21CB3ED6977E5.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookAir6,2/Mac-7DF21CB3ED6977E5.plist
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>pmspFile</key>
+    <integer>5</integer>
+    <key>IOPlatformPowerProfile</key>
+    <dict>
+      <key>UnifiedSleepSliderPref</key>
+      <true/>
+      <key>enabler</key>
+      <true/>
+      <key>AGPM</key>
+      <true/>
+      <key>ASPM</key>
+      <true/>
+      <key>PublishBatteryFactors</key>
+      <true/>
+      <key>NetworkTimerDelay</key>
+      <integer>900</integer>
+      <key>StandbyDelayHigh</key>
+      <integer>86400</integer>
+      <key>StandbyDelay</key>
+      <integer>10800</integer>
+      <key>StandbyBatteryThreshold</key>
+      <integer>50</integer>
+      <key>AutoPowerOff</key>
+      <true/>
+      <key>ProximityWake</key>
+      <integer>0</integer>
+      <key>IOPlatformSystemSleepPolicy</key>
+      <data>U0xQVAIAEwCEHhIABAAAAAAUAAAABAAABgAAAAAAAAAPJQAAAAAAAAAAQAAAAEAAAAAQAAAAEAAH
+AAAAAAAAAA8lAAAAAAAAhB4SAAQAAAAAGAAAAAgAAAUAAAAAAAAADyUAAAAAAACEHhIABAAAAAgQ
+AAAIAAAABQAAAAAAAAAPJQAAAAAAACAAAAAgAAAAAAAAAAAAAAAFAAAAAAAAAA8lAAAAAAAACAAA
+AAgAAAAAAAAAAAAAAAYAAAAAAAAAAAEAAAEAAAAAAAQAAAAEAAAAAAAAAAAABQAAAAAAAAAPJQAA
+AAAAAAAAAQAAAAEAAAAAAAAAAAAGAAAAAAAAAAABAAAAAAAAxBYAAAAAAAAIAAAACAAAAAUAAAAA
+AAAADyUAAAAAAADEFhAAAAAQACBAAAAgQAAABwAAAAgAAAAPOQAAAAAAAMQWAAAAAAAAIAAAACAA
+AAAFAAAAAAAAAA8lAAAAAAAA1BYAABAAAAAAAAAAAAAAAAUAAAAAAAAADyUAAAAAAADEHhIARAAA
+AAYQAAAGAAAABwAAAAIAAAAPOQAAAAAAAIQeEgAEAAAAABAAAAAAAAAHAAAAAgAAAA85AAAAAAAA
+xBYAAAAAAAAAwAAAAMAAAAcAAAAIAAAADzkAAAAAAADEFgAAAAAAAAiAAAAIgAAABQAAAAAAAAAP
+JQAAAAAAAMQWAAAAAAAAAAAAAAAAAAAHAAAAAQAAAA85AAAAAAAAQAAAAEAAAAAGAAAABgAAAAcA
+AAAAAAAADzEAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAPMQAAAAAAAA==</data>
+      <key>FanThrottledRPM</key>
+      <integer>2000</integer>
+      <key>FanMax</key>
+      <array>
+        <integer>6500</integer>
+      </array>
+      <key>InitialPLimit</key>
+      <integer>0</integer>
+      <key>FrequencyVectors</key>
+      <array>
+        <data>
+AgAAAAAAAAACAAAAAAAAAMgAAAAAAAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAGQAAAACAAAAAAAAAHgeAAAAAAAAyAAAAAAAAAABZOgDAAAAAAAAAUvQBwAA
+AAAAAAEyuAsAAAAAAAABGaAPAAAAAAAAAAD///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAADIAAAADAAAAAAAAANQXAAAAAAAAyAAAAAAAAAACZPQBAAAA
+AAAAAjLoAwAAAAAAAAIA0AcAAAAAAAABMrgLAAAAAAAAAQCgDwAAAAAAAAAA////////DwAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAADAAAAAAAAAKCGAQAAAAAALAEAAAAA
+AAADZPQBAAAAAAAAAkvoAwAAAAAAAAIy0AcAAAAAAAACALgLAAAAAAAAATKgDwAAAAAAAAAA////
+////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAWQAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAEDAAAyADIA
+ZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABLRVJORUwAAAAAAAAAAAAAAAJkAJYAyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElFUjQAAAAAAAAAAmQAyADIAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVEhS
+VV9USUVSNQAAAAAAAAAByADIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdXRpbGl0eS10bHZsAAAAAAAAAAA9AAAAAAAAAAAAAAAA
+AAAAbm9uLWZvY2FsLXRsdmwAAAAAAAD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+      </array>
+      <key>ThermalConfiguration</key>
+      <dict>
+        <key>Domain</key>
+        <dict>
+          <key>CPU</key>
+          <dict>
+            <key>SFIWindow</key>
+            <integer>50000</integer>
+            <key>SFIMaintenance</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,74=67%</string>
+            </dict>
+            <key>SFIDarwinBG</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,74=67%</string>
+            </dict>
+            <key>SFIAppNap</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,74=67%</string>
+            </dict>
+            <key>QOSThermalThresholds</key>
+            <dict>
+              <key>Utility</key>
+              <integer>61</integer>
+              <key>NonFocal</key>
+              <integer>251</integer>
+            </dict>
+            <key>ThermalPressure</key>
+            <dict>
+              <key>Nominal</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>61</integer>
+                <key>LowThreshold</key>
+                <integer>0</integer>
+              </dict>
+              <key>Moderate</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>120</integer>
+                <key>LowThreshold</key>
+                <integer>50</integer>
+              </dict>
+              <key>Heavy</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>200</integer>
+                <key>LowThreshold</key>
+                <integer>90</integer>
+              </dict>
+              <key>Trapping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>250</integer>
+                <key>LowThreshold</key>
+                <integer>180</integer>
+              </dict>
+              <key>Sleeping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>252</integer>
+                <key>LowThreshold</key>
+                <integer>251</integer>
+              </dict>
+            </dict>
+          </dict>
+          <key>GPU</key>
+          <dict/>
+          <key>IO</key>
+          <dict/>
+        </dict>
+      </dict>
+      <key>DarkWakeServices</key>
+      <dict>
+        <key>DarkWakeBackgroundTasks</key>
+        <integer>1</integer>
+        <key>SleepServices</key>
+        <integer>7</integer>
+        <key>SleepServicesModes</key>
+        <dict>
+          <key>ModeA</key>
+          <dict>
+            <key>Expiration</key>
+            <integer>0</integer>
+            <key>BatteryFloor</key>
+            <integer>0</integer>
+            <key>BaseIntervals</key>
+            <dict>
+              <key>AC</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>86400</integer>
+              </dict>
+              <key>Battery</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>180</integer>
+              </dict>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+    </dict>
+  </dict>
+</plist>
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,1/Info.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,1/Info.plist
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,1/Mac-189A3D4F975D5FFC.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,1/Mac-189A3D4F975D5FFC.plist
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>pmspFile</key>
+    <integer>6</integer>
+    <key>IOPlatformPowerProfile</key>
+    <dict>
+      <key>UnifiedSleepSliderPref</key>
+      <true/>
+      <key>enabler</key>
+      <true/>
+      <key>AGPM</key>
+      <true/>
+      <key>ASPM</key>
+      <true/>
+      <key>PublishBatteryFactors</key>
+      <true/>
+      <key>NetworkTimerDelay</key>
+      <integer>900</integer>
+      <key>StandbyDelayHigh</key>
+      <integer>86400</integer>
+      <key>StandbyDelay</key>
+      <integer>10800</integer>
+      <key>StandbyBatteryThreshold</key>
+      <integer>50</integer>
+      <key>AutoPowerOff</key>
+      <true/>
+      <key>ProximityWake</key>
+      <integer>0</integer>
+      <key>IOPlatformSystemSleepPolicy</key>
+      <data>U0xQVAIAEwCEHhIABAAAAAAUAAAABAAABgAAAAAAAAAPJQAAAAAAAAAAQAAAAEAAAAAQAAAAEAAH
+AAAAAAAAAA8lAAAAAAAAhB4SAAQAAAAAGAAAAAgAAAUAAAAAAAAADyUAAAAAAACEHhIABAAAAAgQ
+AAAIAAAABQAAAAAAAAAPJQAAAAAAACAAAAAgAAAAAAAAAAAAAAAFAAAAAAAAAA8lAAAAAAAACAAA
+AAgAAAAAAAAAAAAAAAYAAAAAAAAAAAEAAAEAAAAAAAQAAAAEAAAAAAAAAAAABQAAAAAAAAAPJQAA
+AAAAAAAAAQAAAAEAAAAAAAAAAAAGAAAAAAAAAAABAAAAAAAAxBYAAAAAAAAIAAAACAAAAAUAAAAA
+AAAADyUAAAAAAADEFhAAAAAQACBAAAAgQAAABwAAAAgAAAAPPQAAAAAAAMQWAAAAAAAAIAAAACAA
+AAAFAAAAAAAAAA8lAAAAAAAA1BYAABAAAAAAAAAAAAAAAAUAAAAAAAAADyUAAAAAAADEHhIARAAA
+AAYQAAAGAAAABwAAAAIAAAAPPQAAAAAAAIQeEgAEAAAAABAAAAAAAAAHAAAAAgAAAA89AAAAAAAA
+xBYAAAAAAAAAwAAAAMAAAAcAAAAIAAAADz0AAAAAAADEFgAAAAAAAAiAAAAIgAAABQAAAAAAAAAP
+JQAAAAAAAMQWAAAAAAAAAAAAAAAAAAAHAAAAAQAAAA89AAAAAAAAQAAAAEAAAAAGAAAABgAAAAcA
+AAAAAAAADzUAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAPNQAAAAAAAA==</data>
+      <key>FrequencyVectors</key>
+      <array>
+        <data>
+AgAAAAAAAAACAAAAAAAAAMgAAAAAAAAAGQAAAAAAAAAAZP///////w8AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAADIAAAACAAAAAAAAADwPAAAAAAAAyAAAAAAAAAABZOgDAAAAAAAAAUvQBwAA
+AAAAAAEyuAsAAAAAAAABGaAPAAAAAAAAAQD///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAACAAAAAAAAAGQZAAAAAAAAyAAAAAAAAAACZOgDAAAA
+AAAAAkvQBwAAAAAAAAIyuAsAAAAAAAABMqAPAAAAAAAAARn///////8PAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIAAAADAAAAAAAAAKAPAAAAAAAAyAAAAAAA
+AAADZPQBAAAAAAAAAzLoAwAAAAAAAAMZ0AcAAAAAAAACMrgLAAAAAAAAATKgDwAAAAAAAAEZ////
+////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAADAAAAAAAAAKCGAQAA
+AAAALAEAAAAAAAAEZPQBAAAAAAAAA0voAwAAAAAAAAMy0AcAAAAAAAADALgLAAAAAAAAAjKgDwAA
+AAAAAAIA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAWQAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAIEAAAAABkA
+GQBkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABLRVJORUwAAAAAAAAAAAAAAARkAGQAZACWAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElFUjQAAAAAAAAAA2QAlgDIAMgAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVEhS
+VV9USUVSNQAAAAAAAAACyADIAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdXRpbGl0eS10bHZsAAAAAAAAAAA+AAAAAAAAAAAAAAAA
+AAAAbm9uLWZvY2FsLXRsdmwAAAAAAAD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+      </array>
+      <key>ThermalConfiguration</key>
+      <dict>
+        <key>Domain</key>
+        <dict>
+          <key>CPU</key>
+          <dict>
+            <key>SFIWindow</key>
+            <integer>50000</integer>
+            <key>SFIMaintenance</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>46=0%,73=67%</string>
+            </dict>
+            <key>SFIDarwinBG</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>46=0%,73=67%</string>
+            </dict>
+            <key>SFIAppNap</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>55=0%,73=67%</string>
+            </dict>
+            <key>QOSThermalThresholds</key>
+            <dict>
+              <key>Utility</key>
+              <integer>62</integer>
+              <key>NonFocal</key>
+              <integer>251</integer>
+            </dict>
+            <key>ThermalPressure</key>
+            <dict>
+              <key>Nominal</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>65</integer>
+                <key>LowThreshold</key>
+                <integer>0</integer>
+              </dict>
+              <key>Moderate</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>120</integer>
+                <key>LowThreshold</key>
+                <integer>50</integer>
+              </dict>
+              <key>Heavy</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>200</integer>
+                <key>LowThreshold</key>
+                <integer>90</integer>
+              </dict>
+              <key>Trapping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>250</integer>
+                <key>LowThreshold</key>
+                <integer>180</integer>
+              </dict>
+              <key>Sleeping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>252</integer>
+                <key>LowThreshold</key>
+                <integer>251</integer>
+              </dict>
+            </dict>
+          </dict>
+          <key>GPU</key>
+          <dict/>
+          <key>IO</key>
+          <dict/>
+        </dict>
+      </dict>
+      <key>DarkWakeServices</key>
+      <dict>
+        <key>DarkWakeBackgroundTasks</key>
+        <integer>1</integer>
+        <key>SleepServices</key>
+        <integer>7</integer>
+        <key>SleepServicesModes</key>
+        <dict>
+          <key>ModeA</key>
+          <dict>
+            <key>Expiration</key>
+            <integer>0</integer>
+            <key>BatteryFloor</key>
+            <integer>0</integer>
+            <key>BaseIntervals</key>
+            <dict>
+              <key>AC</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>86400</integer>
+              </dict>
+              <key>Battery</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>180</integer>
+              </dict>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+    </dict>
+  </dict>
+</plist>
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,2/Info.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,2/Info.plist
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,2/Mac-3CBD00234E554E41.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,2/Mac-3CBD00234E554E41.plist
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>pmspFile</key>
+    <integer>3</integer>
+    <key>IOPlatformPowerProfile</key>
+    <dict>
+      <key>UnifiedSleepSliderPref</key>
+      <true/>
+      <key>enabler</key>
+      <true/>
+      <key>AGPM</key>
+      <true/>
+      <key>ASPM</key>
+      <true/>
+      <key>PublishBatteryFactors</key>
+      <true/>
+      <key>NetworkTimerDelay</key>
+      <integer>900</integer>
+      <key>StandbyDelayHigh</key>
+      <integer>86400</integer>
+      <key>StandbyDelay</key>
+      <integer>10800</integer>
+      <key>StandbyBatteryThreshold</key>
+      <integer>50</integer>
+      <key>AutoPowerOff</key>
+      <true/>
+      <key>ProximityWake</key>
+      <integer>0</integer>
+      <key>IOPlatformSystemSleepPolicy</key>
+      <data>U0xQVAIAEgCEHhIABAAAAAAUAAAABAAABgAAAAAAAAAPJQAAAAAAAIQeEgAEAAAAABgAAAAIAAAF
+AAAAAAAAAA8lAAAAAAAAhB4SAAQAAAAIEAAACAAAAAUAAAAAAAAADyUAAAAAAAAgAAAAIAAAAAAA
+AAAAAAAABQAAAAAAAAAPJQAAAAAAAAgAAAAIAAAAAAAAAAAAAAAEAAAAAAAAAAABAAABAAAAAAAE
+AAAABAAAAAAAAAAAAAUAAAAAAAAADyUAAAAAAAAAAAEAAAABAAAAAAAAAAAABAAAAAAAAAAAAQAA
+AAAAAMQWAAAAAAAACAAAAAgAAAAFAAAAAAAAAA8lAAAAAAAAxBYQAAAAEAAgQAAAIEAAAAIAAAAI
+AAAADz0AAAAAAADEFgAAAAAAACAAAAAgAAAABQAAAAAAAAAPJQAAAAAAANQWAAAQAAAAAAAAAAAA
+AAAFAAAAAAAAAA8lAAAAAAAAxB4SAEQAAAAGEAAABgAAAAMAAAACAAAADz0AAAAAAACEHhIABAAA
+AAAQAAAAAAAAAgAAAAIAAAAPPQAAAAAAAMQWAAAAAAAAAMAAAADAAAACAAAACAAAAA89AAAAAAAA
+xBYAAAAAAAAIgAAACIAAAAUAAAAAAAAADyUAAAAAAADEFgAAAAAAAAAAAAAAAAAAAgAAAAEAAAAP
+PQAAAAAAAEAAAABAAAAABgAAAAYAAAADAAAAAAAAAA81AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA
+AAAAAAAADzUAAAAAAAA=</data>
+      <key>FrequencyVectors</key>
+      <array>
+        <data>
+AgAAAAAAAAACAAAAAAAAAMgAAAAAAAAAGQAAAAAAAAAAZP///////w8AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAABEAAAABAAAAAAAAADwPAAAAAAAAyAAAAAAAAAABZOgDAAAAAAAAAUvQBwAA
+AAAAAAEyuAsAAAAAAAABGaAPAAAAAAAAAQD///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAACAAAAAAAAAKwNAAAAAAAAyAAAAAAAAAACZOgDAAAA
+AAAAAkvQBwAAAAAAAAIyuAsAAAAAAAABMqAPAAAAAAAAARn///////8PAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkAAAADAAAAAAAAALgLAAAAAAAAyAAAAAAA
+AAADZPQBAAAAAAAAAkvoAwAAAAAAAAIy0AcAAAAAAAACGbgLAAAAAAAAATKgDwAAAAAAAAEZ////
+////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIAAAADAAAAAAAAAMQJAAAA
+AAAAyAAAAAAAAAAEZPQBAAAAAAAABDLoAwAAAAAAAAQZ0AcAAAAAAAACMrgLAAAAAAAAATKgDwAA
+AAAAAAEZ////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEsAAAADAAAA
+AAAAANwFAAAAAAAAyAAAAAAAAAAFZOgDAAAAAAAABRnQBwAAAAAAAAIZuAsAAAAAAAABMqAPAAAA
+AAAAARn///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AGQAAAADAAAAAAAAAKCGAQAAAAAALAEAAAAAAAAGZPQBAAAAAAAABEvoAwAAAAAAAAQy0AcAAAAA
+AAAEALgLAAAAAAAAAjKgDwAAAAAAAAIA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAWQAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAIGAAAAABkA
+GQBkAGQAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABLRVJORUwAAAAAAAAAAAAAAAZkAGQAZAB9AJYArwDIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElFUjQAAAAAAAAAA2QAlgDIAMgAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVEhS
+VV9USUVSNQAAAAAAAAACyADIAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaGFyZC1ydC1ucwAAAAAAAAAAAAAACT0AAAAAAAAAAAAA
+AAAAdWJwYwAAAAAAAAAAAAAAAAEAAABvZmYAAAAAAAAAAAAAAAAAcGVyZi1iaWFzAAAAAAAAAAAA
+AAAFAAAAAAAAAAAAAAAAAAAAdXRpbGl0eS10bHZsAAAAAAAAAAA1AAAAAAAAAAAAAAAAAAAAbm9u
+LWZvY2FsLXRsdmwAAAAAAAD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+      </array>
+      <key>ThermalConfiguration</key>
+      <dict>
+        <key>Domain</key>
+        <dict>
+          <key>CPU</key>
+          <dict>
+            <key>SFIWindow</key>
+            <integer>50000</integer>
+            <key>SFIMaintenance</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>38=0%,67=67%</string>
+            </dict>
+            <key>SFIDarwinBG</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>38=0%,67=67%</string>
+            </dict>
+            <key>SFIAppNap</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>47=0%,67=67%</string>
+            </dict>
+            <key>QOSThermalThresholds</key>
+            <dict>
+              <key>Utility</key>
+              <integer>53</integer>
+              <key>NonFocal</key>
+              <integer>251</integer>
+            </dict>
+            <key>ThermalPressure</key>
+            <dict>
+              <key>Nominal</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>57</integer>
+                <key>LowThreshold</key>
+                <integer>0</integer>
+              </dict>
+              <key>Moderate</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>120</integer>
+                <key>LowThreshold</key>
+                <integer>50</integer>
+              </dict>
+              <key>Heavy</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>200</integer>
+                <key>LowThreshold</key>
+                <integer>90</integer>
+              </dict>
+              <key>Trapping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>250</integer>
+                <key>LowThreshold</key>
+                <integer>180</integer>
+              </dict>
+              <key>Sleeping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>252</integer>
+                <key>LowThreshold</key>
+                <integer>251</integer>
+              </dict>
+            </dict>
+          </dict>
+          <key>GPU</key>
+          <dict/>
+          <key>IO</key>
+          <dict/>
+        </dict>
+      </dict>
+      <key>DarkWakeServices</key>
+      <dict>
+        <key>DarkWakeBackgroundTasks</key>
+        <integer>1</integer>
+        <key>SleepServices</key>
+        <integer>7</integer>
+        <key>SleepServicesModes</key>
+        <dict>
+          <key>ModeA</key>
+          <dict>
+            <key>Expiration</key>
+            <integer>0</integer>
+            <key>BatteryFloor</key>
+            <integer>0</integer>
+            <key>BaseIntervals</key>
+            <dict>
+              <key>AC</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>86400</integer>
+              </dict>
+              <key>Battery</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>180</integer>
+              </dict>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+    </dict>
+  </dict>
+</plist>
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,3/Info.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,3/Info.plist
--- a/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,3/Mac-2BD1B31983FE1663.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/MacBookPro11,3/Mac-2BD1B31983FE1663.plist
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>pmspFile</key>
+    <integer>3</integer>
+    <key>IOPlatformPowerProfile</key>
+    <dict>
+      <key>UnifiedSleepSliderPref</key>
+      <true/>
+      <key>enabler</key>
+      <true/>
+      <key>AGPM</key>
+      <true/>
+      <key>ASPM</key>
+      <true/>
+      <key>PublishBatteryFactors</key>
+      <true/>
+      <key>NetworkTimerDelay</key>
+      <integer>900</integer>
+      <key>StandbyDelayHigh</key>
+      <integer>86400</integer>
+      <key>StandbyDelay</key>
+      <integer>10800</integer>
+      <key>StandbyBatteryThreshold</key>
+      <integer>50</integer>
+      <key>AutoPowerOff</key>
+      <true/>
+      <key>ProximityWake</key>
+      <integer>0</integer>
+      <key>IOPlatformSystemSleepPolicy</key>
+      <data>U0xQVAIAEgCEHhIABAAAAAAUAAAABAAABgAAAAAAAAAPJQAAAAAAAIQeEgAEAAAAABgAAAAIAAAF
+AAAAAAAAAA8lAAAAAAAAhB4SAAQAAAAIEAAACAAAAAUAAAAAAAAADyUAAAAAAAAgAAAAIAAAAAAA
+AAAAAAAABQAAAAAAAAAPJQAAAAAAAAgAAAAIAAAAAAAAAAAAAAAEAAAAAAAAAAABAAABAAAAAAAE
+AAAABAAAAAAAAAAAAAUAAAAAAAAADyUAAAAAAAAAAAEAAAABAAAAAAAAAAAABAAAAAAAAAAAAQAA
+AAAAAMQWAAAAAAAACAAAAAgAAAAFAAAAAAAAAA8lAAAAAAAAxBYQAAAAEAAgQAAAIEAAAAIAAAAI
+AAAADz0AAAAAAADEFgAAAAAAACAAAAAgAAAABQAAAAAAAAAPJQAAAAAAANQWAAAQAAAAAAAAAAAA
+AAAFAAAAAAAAAA8lAAAAAAAAxB4SAEQAAAAGEAAABgAAAAMAAAACAAAADz0AAAAAAACEHhIABAAA
+AAAQAAAAAAAAAgAAAAIAAAAPPQAAAAAAAMQWAAAAAAAAAMAAAADAAAACAAAACAAAAA89AAAAAAAA
+xBYAAAAAAAAIgAAACIAAAAUAAAAAAAAADyUAAAAAAADEFgAAAAAAAAAAAAAAAAAAAgAAAAEAAAAP
+PQAAAAAAAEAAAABAAAAABgAAAAYAAAADAAAAAAAAAA81AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIA
+AAAAAAAADzUAAAAAAAA=</data>
+      <key>FrequencyVectors</key>
+      <array>
+        <data>
+AgAAAAAAAAACAAAAAAAAAMgAAAAAAAAAGQAAAAAAAAAAZP///////w8AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAABEAAAABAAAAAAAAADwPAAAAAAAAyAAAAAAAAAABZOgDAAAAAAAAAUvQBwAA
+AAAAAAEyuAsAAAAAAAABGaAPAAAAAAAAAQD///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAACAAAAAAAAAKwNAAAAAAAAyAAAAAAAAAACZOgDAAAA
+AAAAAkvQBwAAAAAAAAIyuAsAAAAAAAABMqAPAAAAAAAAARn///////8PAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkAAAADAAAAAAAAALgLAAAAAAAAyAAAAAAA
+AAADZPQBAAAAAAAAAkvoAwAAAAAAAAIy0AcAAAAAAAACGbgLAAAAAAAAATKgDwAAAAAAAAEZ////
+////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADIAAAADAAAAAAAAAMQJAAAA
+AAAAyAAAAAAAAAAEZPQBAAAAAAAABDLoAwAAAAAAAAQZ0AcAAAAAAAACMrgLAAAAAAAAATKgDwAA
+AAAAAAEZ////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEsAAAADAAAA
+AAAAANwFAAAAAAAAyAAAAAAAAAAFZOgDAAAAAAAABRnQBwAAAAAAAAIZuAsAAAAAAAABMqAPAAAA
+AAAAARn///////8PAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AGQAAAADAAAAAAAAAKCGAQAAAAAALAEAAAAAAAAGZPQBAAAAAAAABEvoAwAAAAAAAAQy0AcAAAAA
+AAAEALgLAAAAAAAAAjKgDwAAAAAAAAIA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////DwAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAWQAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAIGAAAAABkA
+GQBkAGQAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABLRVJORUwAAAAAAAAAAAAAAAZkAGQAZAB9AJYArwDIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFRIUlVfVElFUjQAAAAAAAAAA2QAlgDIAMgAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVEhS
+VV9USUVSNQAAAAAAAAACyADIAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaGFyZC1ydC1ucwAAAAAAAAAAAAAACT0AAAAAAAAAAAAA
+AAAAdWJwYwAAAAAAAAAAAAAAAAEAAABvZmYAAAAAAAAAAAAAAAAAcGVyZi1iaWFzAAAAAAAAAAAA
+AAAFAAAAAAAAAAAAAAAAAAAAdXRpbGl0eS10bHZsAAAAAAAAAAA1AAAAAAAAAAAAAAAAAAAAbm9u
+LWZvY2FsLXRsdmwAAAAAAAD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+      </array>
+      <key>ThermalConfiguration</key>
+      <dict>
+        <key>Domain</key>
+        <dict>
+          <key>CPU</key>
+          <dict>
+            <key>SFIWindow</key>
+            <integer>50000</integer>
+            <key>SFIMaintenance</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>38=0%,67=67%</string>
+            </dict>
+            <key>SFIDarwinBG</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>38=0%,67=67%</string>
+            </dict>
+            <key>SFIAppNap</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>47=0%,67=67%</string>
+            </dict>
+            <key>QOSThermalThresholds</key>
+            <dict>
+              <key>Utility</key>
+              <integer>53</integer>
+              <key>NonFocal</key>
+              <integer>251</integer>
+            </dict>
+            <key>ThermalPressure</key>
+            <dict>
+              <key>Nominal</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>57</integer>
+                <key>LowThreshold</key>
+                <integer>0</integer>
+              </dict>
+              <key>Moderate</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>120</integer>
+                <key>LowThreshold</key>
+                <integer>50</integer>
+              </dict>
+              <key>Heavy</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>200</integer>
+                <key>LowThreshold</key>
+                <integer>90</integer>
+              </dict>
+              <key>Trapping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>250</integer>
+                <key>LowThreshold</key>
+                <integer>180</integer>
+              </dict>
+              <key>Sleeping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>252</integer>
+                <key>LowThreshold</key>
+                <integer>251</integer>
+              </dict>
+            </dict>
+          </dict>
+          <key>GPU</key>
+          <dict/>
+          <key>IO</key>
+          <dict/>
+        </dict>
+      </dict>
+      <key>DarkWakeServices</key>
+      <dict>
+        <key>DarkWakeBackgroundTasks</key>
+        <integer>1</integer>
+        <key>SleepServices</key>
+        <integer>7</integer>
+        <key>SleepServicesModes</key>
+        <dict>
+          <key>ModeA</key>
+          <dict>
+            <key>Expiration</key>
+            <integer>0</integer>
+            <key>BatteryFloor</key>
+            <integer>0</integer>
+            <key>BaseIntervals</key>
+            <dict>
+              <key>AC</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>86400</integer>
+              </dict>
+              <key>Battery</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>180</integer>
+              </dict>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+    </dict>
+  </dict>
+</plist>
--- a/payloads/Kexts/Plists/PlatformPlugin/iMac14,4/Info.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/iMac14,4/Info.plist
--- a/payloads/Kexts/Plists/PlatformPlugin/iMac14,4/Mac-81E3E92DD6088272.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/iMac14,4/Mac-81E3E92DD6088272.plist
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>pmspFile</key>
+    <integer>1</integer>
+    <key>IOPlatformPowerProfile</key>
+    <dict>
+      <key>NetworkTimerDelay</key>
+      <integer>900</integer>
+      <key>StandbyDelayHigh</key>
+      <integer>86400</integer>
+      <key>StandbyDelay</key>
+      <integer>86400</integer>
+      <key>StandbyBatteryThreshold</key>
+      <integer>50</integer>
+      <key>AutoPowerOff</key>
+      <true/>
+      <key>ProximityWake</key>
+      <integer>0</integer>
+      <key>IOPlatformSystemSleepPolicy</key>
+      <data>U0xQVAIAFQAAHhAAAAAAAAAVAAAABQAABgAAAAAAAAAABQAAAAAAACAAAAAgAAAAAAAAAAAAAAAF
+AAAAAAAAAAABAAAAAAAAAAAEAAAABAAAAAAAAAAAAAYAAAAAAAAAAAUAAAAAAAAAAAEAAAABAAAA
+AAAAAAAABAAAAAAAAAAAAQAAAAAAAEAeEAAAAAAAGBEAABgBAAAFAAAAAgAAAAAJAAAAAAAAQAYA
+AAAAAAAYAAAAGAAAAAUAAAAAAAAAAAEAAAAAAABAHhAAAAAAACgRAAAgAQAABQAAAAIAAAAACQAA
+AAAAAEAGEAAAABAAIEAAACBAAAACAAAACAAAAAANAAAAAAAAQAYQAAAAEAAAwAAAAMAAAAIAAAAI
+AAAAAA0AAAAAAABABgAAAAAAAAiAAAAIgAAABQAAAAAAAAAAAQAAAAAAAEAGAAAAAAAAKAAAACAA
+AAAFAAAAAAAAAAABAAAAAAAAUB4QABAAAAAAEQAAAAEAAAUAAAACAAAAAAkAAAAAAABQBgAAEAAA
+AAAAAAAAAAAABQAAAAAAAAAAAQAAAAAAAAAeEAAAAAAAABkAAAAJAAAGAAAAAAAAAAAFAAAAAAAA
+AB4QAAAAAAAIEQAACAEAAAYAAAAAAAAAAAUAAAAAAAAAHhAAAAAAAEARAABAAQAABgAAAAAAAAAA
+BQAAAAAAAEAeEABAAAAABhEAAAYBAAADAAAAAgAAAAANAAAAAAAAQB4QAEAAAAAAEQAAAAEAAAIA
+AAACAAAAAA0AAAAAAABABgAAAAAAAAAAAAAAAAAAAgAAAAEAAAAADQAAAAAAAEAAAABAAAAABgAA
+AAYAAAADAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAUAAAAAAAA=</data>
+      <key>InitialPLimit</key>
+      <integer>0</integer>
+      <key>FrequencyVectors</key>
+      <array>
+        <data>
+AgAAAAAAAAACAAAAAAAAAGQAAAAAAAAAGQAAAAAAAAAAZP///////w8AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAGQAAAACAAAAAAAAAOgDAAAAAAAAoA8AAAAAAAABZP///////w8AAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAADAAAAAAAAAEBCDwAAAAAAoA8AAAAAAAACZP//////
+/w8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
+DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAcgAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAICAAAAAGQA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaGFyZC1ydC1ucwAAAAAAAAAAAAAACT0AAAAAAAAAAAAA
+AAAAdWJwYwAAAAAAAAAAAAAAAAEAAABvZmYAAAAAAAAAAAAAAAAAcGVyZi1iaWFzAAAAAAAAAAAA
+AAABAAAAAAAAAAAAAAAAAAAAdXRpbGl0eS10bHZsAAAAAAAAAABOAAAAAAAAAAAAAAAAAAAAbm9u
+LWZvY2FsLXRsdmwAAAAAAAD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+      </array>
+      <key>ThermalConfiguration</key>
+      <dict>
+        <key>Domain</key>
+        <dict>
+          <key>CPU</key>
+          <dict>
+            <key>SFIWindow</key>
+            <integer>50000</integer>
+            <key>SFIMaintenance</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,93=50%</string>
+            </dict>
+            <key>SFIDarwinBG</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,93=50%</string>
+            </dict>
+            <key>SFIAppNap</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,93=50%</string>
+            </dict>
+            <key>QOSThermalThresholds</key>
+            <dict>
+              <key>Utility</key>
+              <integer>251</integer>
+              <key>NonFocal</key>
+              <integer>251</integer>
+            </dict>
+            <key>ThermalPressure</key>
+            <dict>
+              <key>Nominal</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>88</integer>
+                <key>LowThreshold</key>
+                <integer>0</integer>
+              </dict>
+              <key>Moderate</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>120</integer>
+                <key>LowThreshold</key>
+                <integer>50</integer>
+              </dict>
+              <key>Heavy</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>200</integer>
+                <key>LowThreshold</key>
+                <integer>90</integer>
+              </dict>
+              <key>Trapping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>250</integer>
+                <key>LowThreshold</key>
+                <integer>180</integer>
+              </dict>
+              <key>Sleeping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>252</integer>
+                <key>LowThreshold</key>
+                <integer>251</integer>
+              </dict>
+            </dict>
+          </dict>
+          <key>GPU</key>
+          <dict/>
+          <key>IO</key>
+          <dict/>
+        </dict>
+      </dict>
+      <key>UnifiedSleepSliderPref</key>
+      <true/>
+      <key>DarkWakeServices</key>
+      <dict>
+        <key>DarkWakeBackgroundTasks</key>
+        <integer>1</integer>
+        <key>SleepServices</key>
+        <integer>7</integer>
+        <key>SleepServicesModes</key>
+        <dict>
+          <key>ModeA</key>
+          <dict>
+            <key>Expiration</key>
+            <integer>0</integer>
+            <key>BatteryFloor</key>
+            <integer>0</integer>
+            <key>BaseIntervals</key>
+            <dict>
+              <key>AC</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>86400</integer>
+              </dict>
+              <key>Battery</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>180</integer>
+              </dict>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+    </dict>
+  </dict>
+</plist>
--- a/payloads/Kexts/Plists/PlatformPlugin/iMac15,1/Info.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/iMac15,1/Info.plist
--- a/payloads/Kexts/Plists/PlatformPlugin/iMac15,1/Mac-42FD25EABCABB274.plist
+++ b/payloads/Kexts/Plists/PlatformPlugin/iMac15,1/Mac-42FD25EABCABB274.plist
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>pmspFile</key>
+    <integer>1</integer>
+    <key>IOPlatformPowerProfile</key>
+    <dict>
+      <key>NetworkTimerDelay</key>
+      <integer>900</integer>
+      <key>StandbyDelayHigh</key>
+      <integer>86400</integer>
+      <key>StandbyDelay</key>
+      <integer>86400</integer>
+      <key>StandbyBatteryThreshold</key>
+      <integer>50</integer>
+      <key>AutoPowerOff</key>
+      <true/>
+      <key>ProximityWake</key>
+      <integer>0</integer>
+      <key>IOPlatformSystemSleepPolicy</key>
+      <data>U0xQVAIAFQAAHhAAAAAAAAAVAAAABQAABgAAAAAAAAAABQAAAAAAACAAAAAgAAAAAAAAAAAAAAAF
+AAAAAAAAAAABAAAAAAAAAAAEAAAABAAAAAAAAAAAAAYAAAAAAAAAAAUAAAAAAAAAAAEAAAABAAAA
+AAAAAAAABAAAAAAAAAAAAQAAAAAAAEAeEAAAAAAAGBEAABgBAAAFAAAAAgAAAAAJAAAAAAAAQAYA
+AAAAAAAYAAAAGAAAAAUAAAAAAAAAAAEAAAAAAABAHhAAAAAAACgRAAAgAQAABQAAAAIAAAAACQAA
+AAAAAEAGEAAAABAAIEAAACBAAAACAAAACAAAAAANAAAAAAAAQAYQAAAAEAAAwAAAAMAAAAIAAAAI
+AAAAAA0AAAAAAABABgAAAAAAAAiAAAAIgAAABQAAAAAAAAAAAQAAAAAAAEAGAAAAAAAAKAAAACAA
+AAAFAAAAAAAAAAABAAAAAAAAUB4QABAAAAAAEQAAAAEAAAUAAAACAAAAAAkAAAAAAABQBgAAEAAA
+AAAAAAAAAAAABQAAAAAAAAAAAQAAAAAAAAAeEAAAAAAAABkAAAAJAAAGAAAAAAAAAAAFAAAAAAAA
+AB4QAAAAAAAIEQAACAEAAAYAAAAAAAAAAAUAAAAAAAAAHhAAAAAAAEARAABAAQAABgAAAAAAAAAA
+BQAAAAAAAEAeEABAAAAABhEAAAYBAAADAAAAAgAAAAANAAAAAAAAQB4QAEAAAAAAEQAAAAEAAAIA
+AAACAAAAAA0AAAAAAABABgAAAAAAAAAAAAAAAAAAAgAAAAEAAAAADQAAAAAAAEAAAABAAAAABgAA
+AAYAAAADAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAUAAAAAAAA=</data>
+      <key>InitialPLimit</key>
+      <integer>0</integer>
+      <key>FrequencyVectors</key>
+      <array>
+        <data>
+AgAAAAAAAAACAAAAAAAAAGQAAAAAAAAAGQAAAAAAAAAAZP///////w8AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAGQAAAACAAAAAAAAAOgDAAAAAAAAoA8AAAAAAAABZP///////w8AAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAAADAAAAAAAAAEBCDwAAAAAAoA8AAAAAAAACZP//////
+/w8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////
+DwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAEJBQ0tHUk9VTkQAAAAAAAAAAcgAZAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUkVBTFRJTUVfU0hPUlQAAAICAAAAAGQA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaGFyZC1ydC1ucwAAAAAAAAAAAAAACT0AAAAAAAAAAAAA
+AAAAdWJwYwAAAAAAAAAAAAAAAAEAAABvZmYAAAAAAAAAAAAAAAAAcGVyZi1iaWFzAAAAAAAAAAAA
+AAABAAAAAAAAAAAAAAAAAAAAdXRpbGl0eS10bHZsAAAAAAAAAABPAAAAAAAAAAAAAAAAAAAAbm9u
+LWZvY2FsLXRsdmwAAAAAAAD6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</data>
+      </array>
+      <key>ThermalConfiguration</key>
+      <dict>
+        <key>Domain</key>
+        <dict>
+          <key>CPU</key>
+          <dict>
+            <key>SFIWindow</key>
+            <integer>50000</integer>
+            <key>SFIMaintenance</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,82=50%</string>
+            </dict>
+            <key>SFIDarwinBG</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,82=50%</string>
+            </dict>
+            <key>SFIAppNap</key>
+            <dict>
+              <key>EffortCurve</key>
+              <string>40=0%,82=50%</string>
+            </dict>
+            <key>QOSThermalThresholds</key>
+            <dict>
+              <key>Utility</key>
+              <integer>77</integer>
+              <key>NonFocal</key>
+              <integer>251</integer>
+            </dict>
+            <key>ThermalPressure</key>
+            <dict>
+              <key>Nominal</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>79</integer>
+                <key>LowThreshold</key>
+                <integer>0</integer>
+              </dict>
+              <key>Moderate</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>120</integer>
+                <key>LowThreshold</key>
+                <integer>50</integer>
+              </dict>
+              <key>Heavy</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>200</integer>
+                <key>LowThreshold</key>
+                <integer>90</integer>
+              </dict>
+              <key>Trapping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>250</integer>
+                <key>LowThreshold</key>
+                <integer>180</integer>
+              </dict>
+              <key>Sleeping</key>
+              <dict>
+                <key>HighThreshold</key>
+                <integer>252</integer>
+                <key>LowThreshold</key>
+                <integer>251</integer>
+              </dict>
+            </dict>
+          </dict>
+          <key>GPU</key>
+          <dict/>
+          <key>IO</key>
+          <dict/>
+        </dict>
+      </dict>
+      <key>UnifiedSleepSliderPref</key>
+      <true/>
+      <key>DarkWakeServices</key>
+      <dict>
+        <key>DarkWakeBackgroundTasks</key>
+        <integer>1</integer>
+        <key>SleepServices</key>
+        <integer>7</integer>
+        <key>SleepServicesModes</key>
+        <dict>
+          <key>ModeA</key>
+          <dict>
+            <key>Expiration</key>
+            <integer>0</integer>
+            <key>BatteryFloor</key>
+            <integer>0</integer>
+            <key>BaseIntervals</key>
+            <dict>
+              <key>AC</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>86400</integer>
+              </dict>
+              <key>Battery</key>
+              <dict>
+                <key>BaseSleepInterval</key>
+                <integer>3600</integer>
+                <key>BaseWakeCapInterval</key>
+                <integer>180</integer>
+              </dict>
+            </dict>
+          </dict>
+        </dict>
+      </dict>
+    </dict>
+  </dict>
+</plist>
--- a/payloads/Kexts/SSE/AAAMouSSE-v0.93.zip
+++ b/payloads/Kexts/SSE/AAAMouSSE-v0.93.zip
--- a/payloads/Kexts/SSE/AAAMouSSE-v0.95.zip
+++ b/payloads/Kexts/SSE/AAAMouSSE-v0.95.zip
--- 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
@@ -45,6 +45,8 @@ bad_tools = [
    "OpenControl.efi",
    "ResetSystem.efi",
    "RtcRw.efi",
+    "CsrUtil.efi",
+    "TpmInfo.efi",
 ]

 for version in build_types:
@@ -66,9 +68,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/requirements.txt
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+requests
+pyobjc
Author	SHA1	Message	Date
Mykola Grymalyuk	8159761833	Fix formatting	2021-07-11 12:28:52 -06:00
Mykola Grymalyuk	87526226cd	Fix Windows scanning in OpenCore menu	2021-07-11 12:25:02 -06:00
Mykola Grymalyuk	1cf1e3491d	Merge branch 'main' of https://github.com/dortania/Opencore-Legacy-Patcher	2021-07-11 10:27:38 -06:00
Dhinak G	9cf19319c5	Attempt to fix pickle issues	2021-07-10 01:38:41 -04:00
Mykola Grymalyuk	8b47c4fe7b	Remove unnecessary sudo	2021-07-09 13:29:52 -06:00
Mykola Grymalyuk	3b3f5b3290	Enhance OS patching detection	2021-07-08 22:55:00 -06:00
Mykola Grymalyuk	637981b405	Add better Mojave/Catalina error handling	2021-07-08 15:43:59 -06:00
Mykola Grymalyuk	20b40f33ce	Renove unused libraries	2021-07-08 15:42:15 -06:00
Mykola Grymalyuk	9a388009cd	Add better SIP var detection	2021-07-08 15:39:14 -06:00
Mykola Grymalyuk	a4bcefd748	Fix AMFI dectection	2021-07-08 15:22:35 -06:00
Dhinak G	7885673363	Fix CLI when no patches are required	2021-07-08 17:20:14 -04:00
Mykola Grymalyuk	d7aa3889f9	Add FeatureUnlock Creates less confusion with new name	2021-07-08 10:14:25 -06:00
Mykola Grymalyuk	4dc76e26fc	Fix formatting	2021-07-07 18:54:55 -06:00
Mykola Grymalyuk	648bb67b73	Sync changelog	2021-07-07 10:47:39 -06:00
Mykola Grymalyuk	686698272b	Merge pull request #371 from dortania/drm-test Add DRM support for Intel HD4000	2021-07-07 09:16:37 -06:00
Mykola Grymalyuk	6349b64faf	Re-enable Safari patch	2021-07-07 09:15:25 -06:00
Mykola Grymalyuk	09b9194b91	Fix crash on Apple Silicon	2021-07-06 22:42:32 -06:00
Mykola Grymalyuk	827aa96168	Update device_probe.py	2021-07-06 22:02:17 -06:00
Mykola Grymalyuk	02ae3c8393	Update SysPatch.py Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/368	2021-07-06 20:26:22 -06:00
Mykola Grymalyuk	8f6bd87721	Fix typo	2021-07-06 14:50:30 -06:00
Mykola Grymalyuk	cef684beb9	Allow hardware decode	2021-07-06 14:39:52 -06:00
Mykola Grymalyuk	6c7c60fb62	Test HD4000 DRM	2021-07-06 14:35:19 -06:00
Mykola Grymalyuk	1b786e57c3	Add board ID check for Sandy Bridge patch	2021-07-06 14:33:51 -06:00
Mykola Grymalyuk	35e6104786	Fix Country Code	2021-07-06 09:31:32 -06:00
Mykola Grymalyuk	ed7c0c6760	Fix CLI crash	2021-07-05 19:08:50 -06:00
Mykola Grymalyuk	25522069dc	Update config.yml	2021-07-05 18:29:22 -06:00
Mykola Grymalyuk	cbbbe16031	Update config.yml	2021-07-05 18:28:49 -06:00
Mykola Grymalyuk	8ed540c7b4	Disable blank issues	2021-07-05 17:40:36 -06:00
Mykola Grymalyuk	467016521f	Update bug_report.yml	2021-07-05 12:23:02 -06:00
Mykola Grymalyuk	33d166a4f8	Add Bug Form	2021-07-05 12:12:10 -06:00
Mykola Grymalyuk	a03623e678	Merge pull request #360 from SquiDual/patch-1 Update TERMS.md	2021-07-05 11:23:06 -06:00
Mykola Grymalyuk	bb424e8ab9	Add WLAN patch Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/353	2021-07-05 11:21:40 -06:00
Mykola Grymalyuk	9e98121e45	Adjust for GUI	2021-07-05 10:09:50 -06:00
SquiDual	f7d842a7f4	Update TERMS.md Fix typo	2021-07-05 15:31:26 +08:00
Mykola Grymalyuk	a1981ab56d	Fix NightShift in Monterey	2021-07-03 15:04:02 -06:00
Mykola Grymalyuk	e820a9ecc8	Fix AirPlay to Mac patch on 2017 iMacs	2021-07-03 13:21:05 -06:00
Mykola Grymalyuk	b13d47df08	Sync CLI	2021-06-28 09:42:23 -06:00
Dhinak G	e6adcdabac	Fix typo closes #351	2021-06-28 11:23:51 -04:00
Mykola Grymalyuk	3c4795fb47	Fix typo	2021-06-28 00:21:54 -06:00
Mykola Grymalyuk	aaf74b2b6a	Fix typo	2021-06-28 00:13:55 -06:00
Mykola Grymalyuk	2c4b29400e	Enable TeraScale 2 patches by default on desktops	2021-06-27 23:09:28 -06:00
Mykola Grymalyuk	98da3a16a8	Fix Wifi build crash	2021-06-27 22:30:58 -06:00
Mykola Grymalyuk	b24ee0e38c	Fix symlinks with rsync	2021-06-27 22:16:47 -06:00
Mykola Grymalyuk	f557b10c3c	Merge pull request #339 from dortania/ioreg-rewrite Completely revamp IOReg probing	2021-06-27 10:32:58 -06:00
Mykola Grymalyuk	b876eda144	Update POST-INSTALL.md	2021-06-26 14:48:32 -06:00
Mykola Grymalyuk	4c8e256e7e	Fix SIP typo for hackintosh	2021-06-26 13:51:40 -06:00
Dhinak G	447afac6eb	Update build scripts	2021-06-25 09:13:17 -04:00
Dhinak G	657fc97f4f	Completely revamp IOReg probing	2021-06-24 19:55:22 -04:00
Mykola Grymalyuk	1d8f87fb78	Reflect new GUI	2021-06-24 16:05:14 -06:00
Mykola Grymalyuk	c6a34ddeb8	Fix build version	2021-06-24 09:52:01 -06:00
Mykola Grymalyuk	694d0397ea	Sync docs Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/146	2021-06-24 09:43:02 -06:00
Mykola Grymalyuk	9cbc243581	Merge pull request #333 from dortania/gui-ci Implement OpenCore GUI	2021-06-24 09:26:48 -06:00
Mykola Grymalyuk	04a83462c3	Add notarization to TUI TUI is deprecated, binary will be dropped in the future	2021-06-24 09:19:27 -06:00
Dhinak G	2e3152f23b	Fix more IORegistry issues	2021-06-24 09:06:31 -04:00
Mykola Grymalyuk	ba1ac0501b	Merge branch 'main' into gui-ci	2021-06-23 22:12:56 -06:00
Mykola Grymalyuk	3ce8b18ecb	Update CI	2021-06-23 22:11:45 -06:00
Mykola Grymalyuk	baaa897d10	Add disk type detection	2021-06-23 21:46:42 -06:00
Mykola Grymalyuk	86ffb83c86	Update Constants.py	2021-06-23 20:33:49 -06:00
Mykola Grymalyuk	db708022e9	Fix model issue	2021-06-23 16:20:45 -06:00
Mykola Grymalyuk	cc2eebfd42	Test	2021-06-23 14:34:37 -06:00
Mykola Grymalyuk	8490893960	Fix error	2021-06-23 14:22:34 -06:00
Mykola Grymalyuk	15a5e54cbb	Fix zip	2021-06-23 14:06:13 -06:00
Mykola Grymalyuk	1bc9f3d396	Fix	2021-06-23 13:59:24 -06:00
Mykola Grymalyuk	ca22da4ebb	Test	2021-06-23 13:58:12 -06:00
Mykola Grymalyuk	e609866c5e	Extra codesigning	2021-06-23 13:50:29 -06:00
Mykola Grymalyuk	bb5673e770	Force codesign	2021-06-23 13:15:10 -06:00
Mykola Grymalyuk	024d41c946	Fix incorrect file path	2021-06-23 13:12:12 -06:00
Mykola Grymalyuk	44c4a488f4	Add codesign to GUI	2021-06-23 13:09:42 -06:00
Mykola Grymalyuk	5c09c10301	Fix typo	2021-06-23 12:57:31 -06:00
Mykola Grymalyuk	4f74629e3f	Fix CI	2021-06-23 12:54:34 -06:00
Mykola Grymalyuk	56194be716	Fix CI	2021-06-23 12:51:47 -06:00
Mykola Grymalyuk	8cfa90f352	Update CI	2021-06-23 12:34:05 -06:00
Mykola Grymalyuk	1064be45df	Add basic GUI to CI pipeline	2021-06-23 11:55:37 -06:00
Mykola Grymalyuk	0428244e60	Update CLI	2021-06-22 22:48:16 -06:00
Mykola Grymalyuk	135125bae6	Update CLI	2021-06-22 22:35:14 -06:00
Mykola Grymalyuk	120f893d1f	Fix Root Patch Failure on Nvidia Tesla GPUs	2021-06-22 20:31:41 -06:00
Mykola Grymalyuk	a33c19448f	Avoid double sudo in CLI	2021-06-22 16:55:12 -06:00
Mykola Grymalyuk	b8e29eca28	Fix SysPatch	2021-06-22 16:47:30 -06:00
Mykola Grymalyuk	d4873f8070	Fix CLI Root Patching	2021-06-22 16:43:05 -06:00
Dhinak G	c42ec31415	Fix IORegistry issue	2021-06-22 16:25:50 -04:00
Mykola Grymalyuk	8f251c1214	Increment build	2021-06-22 10:19:48 -06:00
Mykola Grymalyuk	40aea143cf	Update build	2021-06-22 10:18:17 -06:00
Dhinak G	e6fc4f4a6e	Fix NVMe exception	2021-06-22 12:10:19 -04:00
Mykola Grymalyuk	b5ebc7ffd7	Update Recv icons	2021-06-21 20:56:39 -06:00
Mykola Grymalyuk	21482eda88	Add Flavours for macOS	2021-06-21 19:12:53 -06:00
Mykola Grymalyuk	e91148e534	Add note Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/319	2021-06-21 17:01:07 -06:00
Mykola Grymalyuk	c2c2ffc00b	Sync PatcherSupportPkg	2021-06-21 16:52:06 -06:00
Mykola Grymalyuk	100c54a82c	AirPlay to Mac support on Skylake - Coffeelake Macs	2021-06-21 15:45:27 -06:00
Dhinak G	2b81e38ea8	OCLP-CLI updates	2021-06-21 11:06:40 -04:00
Dhinak G	db2721354c	Create requirements.txt	2021-06-20 19:55:23 -04:00
Mykola Grymalyuk	f21856a65b	Convert PatcherSupportPkg downloader into function	2021-06-20 15:30:48 -06:00
Mykola Grymalyuk	c7cd22bf65	Fix codesign	2021-06-20 13:31:23 -06:00
Mykola Grymalyuk	3d8c523b7a	Work around eficheck kills Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/292	2021-06-20 13:04:08 -06:00
Mykola Grymalyuk	11df8195ce	Work around Codesigning killing binary	2021-06-20 13:01:01 -06:00
Mykola Grymalyuk	cdc80ef550	Work around MacBook8,1 bug	2021-06-20 09:32:56 -06:00
Mykola Grymalyuk	85559d4d9e	Fix typo	2021-06-20 00:31:41 -06:00
Mykola Grymalyuk	88ecd19369	Add better error handling on file presence	2021-06-20 00:28:10 -06:00
Mykola Grymalyuk	22822be944	Remove curl usage for downloading	2021-06-20 00:23:55 -06:00
Mykola Grymalyuk	55607c5437	Swap ditto for rsync	2021-06-19 23:17:59 -06:00
Mykola Grymalyuk	0459c0a5dc	Sync PatcherSupportPkg	2021-06-19 22:00:41 -06:00
Mykola Grymalyuk	2626f9733d	Fix OCLP-CLI crash	2021-06-19 21:15:09 -06:00
Mykola Grymalyuk	128e68d735	Fix file path typo	2021-06-19 20:59:12 -06:00
Mykola Grymalyuk	abc1ca5ec9	Fix Google Fonts rendering for HD4000	2021-06-19 20:47:32 -06:00
Mykola Grymalyuk	ed6fee1f94	Fix defaults write running as sudo	2021-06-19 20:16:33 -06:00
Mykola Grymalyuk	edad35e1f5	Add missing CLI args	2021-06-19 10:53:01 -06:00
Mykola Grymalyuk	f8615a8852	Fix CLI support for SysPatch.py	2021-06-19 10:33:56 -06:00
Mykola Grymalyuk	dec0873a41	Clarify SysPatch function names	2021-06-19 10:31:32 -06:00
Mykola Grymalyuk	16e29d3a1e	Fix OCLP-CLI support with device_probe	2021-06-19 10:27:23 -06:00
Mykola Grymalyuk	fa7e51252d	Fix double wifi typo	2021-06-19 09:30:36 -06:00
Mykola Grymalyuk	84abbb7c11	Add Windows detection to disk install	2021-06-18 19:23:18 -06:00
Mykola Grymalyuk	292e09a0d7	Fix Country Code detection Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/184	2021-06-18 19:08:01 -06:00
Dhinak G	c5fd4036a7	Add country code probing	2021-06-18 20:34:39 -04:00
Mykola Grymalyuk	4843ed92c9	Increment PatcherSupportPkg	2021-06-18 16:53:28 -06:00
Mykola Grymalyuk	f75fac14e6	Fix crash on missing dGPU	2021-06-18 16:46:16 -06:00
Mykola Grymalyuk	ac055a633c	Clean unused variables	2021-06-18 13:19:12 -06:00
Mykola Grymalyuk	0dc40318d0	Set CMIO_Unit_Input_ASC.DoNotUseOpenCL	2021-06-18 13:08:19 -06:00
Mykola Grymalyuk	84d0272eda	Add PatcherSupportPkg	2021-06-18 12:53:07 -06:00
Mykola Grymalyuk	4b35681b5f	Merge branch 'main' of https://github.com/dortania/Opencore-Legacy-Patcher	2021-06-18 10:14:50 -06:00
Mykola Grymalyuk	bbb5c06ddc	Merge pull request #314 from dortania/device-probe Device probe refactor	2021-06-18 10:12:56 -06:00
Mykola Grymalyuk	df0c196a94	Fix dgpu typo	2021-06-18 09:51:59 -06:00
Mykola Grymalyuk	12f9482d3d	Update SysPatch.py	2021-06-18 09:29:29 -06:00
Mykola Grymalyuk	5f7b836330	Fix set_defaults incorrectly disabling SIP	2021-06-18 07:42:21 -06:00
Dhinak G	94af2350f4	Use device_probe	2021-06-17 13:18:31 -04:00
Dhinak G	7b758fcf15	Fix High Sierra issues	2021-06-16 10:28:26 -04:00
Dhinak G	fecf9502d0	WIP device probe refactor part 2	2021-06-16 10:28:24 -04:00
Dhinak G	4747c2619f	WIP device probe refactor	2021-06-16 10:27:23 -04:00
Dhinak G	4b187a045a	Fix DisplayLevel	2021-06-16 10:25:44 -04:00
Mykola Grymalyuk	eb9a24eee7	Increment build	2021-06-15 20:08:22 -06:00
Mykola Grymalyuk	b3d2ac190c	Add better error messaging	2021-06-15 18:49:53 -06:00
Mykola Grymalyuk	ce6805507d	Fix crash on El Capitan and older	2021-06-15 18:08:22 -06:00
Mykola Grymalyuk	ad7d06d4b2	Sync changelog	2021-06-15 17:45:21 -06:00
Mykola Grymalyuk	04dee1fcff	Fix incorrect AMFI and SIP detection	2021-06-15 17:44:04 -06:00
Mykola Grymalyuk	3af65423c6	Merge branch 'main' of https://github.com/dortania/Opencore-Legacy-Patcher	2021-06-15 17:43:12 -06:00
Dhinak G	af6c98b54d	Fix crash with no boot args Fixes #304	2021-06-15 14:36:54 -04:00
Mykola Grymalyuk	eb9b137323	Increment Build	2021-06-15 09:55:10 -06:00
Mykola Grymalyuk	178c604507	Clean Detection Code	2021-06-15 09:49:16 -06:00
Mykola Grymalyuk	88b660ecf8	Merge pull request #303 from dortania/bump-binaries Update Lilu to acidanthera/Lilu@0fd1b298	2021-06-15 09:22:57 -06:00
Dhinak G	3feb5a61f6	Update Lilu to acidanthera/Lilu@0fd1b298	2021-06-15 08:26:37 -04:00
Mykola Grymalyuk	b8708ff193	Fix HD 4000 models	2021-06-14 22:42:01 -06:00
Mykola Grymalyuk	8da945833c	Clarify HD 4000 bugs	2021-06-14 22:11:38 -06:00
Mykola Grymalyuk	ee10c104b7	Add Monterey Hardware Issues	2021-06-14 22:02:20 -06:00
Mykola Grymalyuk	803a699658	Add TeraScale 2 Acceleration	2021-06-14 08:57:55 -06:00
Mykola Grymalyuk	88ee0e813e	Fix typo indentation	2021-06-13 12:49:12 -06:00
Mykola Grymalyuk	cc44024a8c	Fix typo	2021-06-13 12:02:19 -06:00
Mykola Grymalyuk	880432970b	Add DebugEnhancer	2021-06-13 10:47:10 -06:00
Mykola Grymalyuk	5d6587100e	Clean up AMFI and SIP checks	2021-06-13 09:48:21 -06:00
Dhinak G	df8d95b815	Disable SBM and SIP on HD4000 Macs	2021-06-12 23:04:58 -04:00
Mykola Grymalyuk	f1a868199e	Update Constants.py	2021-06-12 19:23:35 -06:00
Dhinak G	d0e77cca52	Update binaries, again	2021-06-12 19:37:51 -04:00
Dhinak G	eaadaa2d45	Update binaries and add AppleIntelSharedGraphics.bundle	2021-06-12 17:15:24 -04:00
Mykola Grymalyuk	4a5e3c89b6	Add AppleIntelIVBVA.bundle	2021-06-12 12:22:39 -06:00
Mykola Grymalyuk	a0eca53c58	Add Intel HD4000 Acceleration	2021-06-12 11:01:52 -06:00
Mykola Grymalyuk	8c092494a8	Fix crash	2021-06-12 08:34:42 -06:00
Mykola Grymalyuk	5f69a1c917	Fix Sidecar and CPU renaming	2021-06-11 21:54:10 -06:00
Mykola Grymalyuk	856ac19314	Fix no SMBIOS spoof option	2021-06-11 21:08:21 -06:00
Mykola Grymalyuk	6c5aa244af	Expand AGDP Override models	2021-06-11 15:08:36 -06:00
Mykola Grymalyuk	f42bdcee03	Fix incorrectly enabling kexts	2021-06-11 11:36:53 -06:00
Mykola Grymalyuk	b49db7e739	Set correct SMBIOS for MacBookPro11,2 Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/287	2021-06-11 10:56:19 -06:00
Mykola Grymalyuk	ec20d7b581	Remove duplicate boot-arg	2021-06-11 10:34:44 -06:00
Mykola Grymalyuk	1c75353f27	Avoid setting UIScale Mac firmwares will correctly set this, overriding is not needed	2021-06-11 10:13:41 -06:00
Mykola Grymalyuk	b14ca8689a	Merge pull request #285 from lulujyc/patch-1 Fix MacBook8,1 SMBIOS Spoofing	2021-06-11 10:11:45 -06:00
lulujyc	bd20cf6a1f	Update Build.py	2021-06-11 21:47:34 +08:00
lulujyc	b23e9c2eaa	Update ModelArray.py	2021-06-11 21:46:09 +08:00
Mykola Grymalyuk	e625d9803b	Add basic Ivy Bridge framebuffer support	2021-06-10 09:09:03 -06:00
Mykola Grymalyuk	ae8bba5582	Merge pull request #282 from dortania/syspatch-monterey Refactor SysPatch for wider OS support	2021-06-09 19:24:34 -06:00
Mykola Grymalyuk	f19f08fc06	Expand AddIntelGen3Accel	2021-06-09 19:21:43 -06:00
Mykola Grymalyuk	5fd17cc5e8	Fix skipping text	2021-06-09 19:21:20 -06:00
Mykola Grymalyuk	3c6d0de2e3	Clean up SysPatch	2021-06-09 18:50:32 -06:00
Mykola Grymalyuk	d3de15b594	Heavily refactor SysPatch	2021-06-09 17:27:14 -06:00
Mykola Grymalyuk	b0db4739ad	Prep for SysPatch refactor	2021-06-09 17:26:49 -06:00
Mykola Grymalyuk	2584c16d41	Fix Kext name	2021-06-09 11:59:04 -06:00
Mykola Grymalyuk	b4caffe0d4	Merge pull request #279 from lulujyc/patch-1 Support HiDPI Picker for Newly Unsupported Macs	2021-06-09 11:57:20 -06:00
Mykola Grymalyuk	46734a7c5a	Limit IO80211 Patched Kexts to Big Sur	2021-06-09 09:04:30 -06:00
lulujyc	484f434a67	Update ModelArray.py	2021-06-09 18:59:51 +08:00
Mykola Grymalyuk	033b577552	Add missing Labels	2021-06-08 17:42:44 -06:00
Mykola Grymalyuk	f1e2a320dc	Fix iMac13,x sleep	2021-06-08 16:47:32 -06:00
Mykola Grymalyuk	3885bf894a	Remove unused kext	2021-06-08 16:28:06 -06:00
Mykola Grymalyuk	04ca447eb7	Fix OpenCanopy icons	2021-06-08 15:17:22 -06:00
Mykola Grymalyuk	41486c0215	Fix SSE4,2 Emulation	2021-06-08 15:13:57 -06:00
Mykola Grymalyuk	69035db2d7	Merge pull request #272 from dortania/monterey-support Add macOS Monterey support	2021-06-08 13:20:00 -06:00
Mykola Grymalyuk	c98021b14c	Update Apple Binaries	2021-06-08 11:49:53 -06:00
Mykola Grymalyuk	b576e5a511	Increment binaries	2021-06-08 11:27:00 -06:00
Mykola Grymalyuk	9b69700733	Fix XHCI hang Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/269	2021-06-08 10:14:35 -06:00
Mykola Grymalyuk	9d731c065e	Clean up code	2021-06-08 10:07:30 -06:00
Mykola Grymalyuk	93aa69b0b0	Add inital macOS 12 support	2021-06-07 18:35:05 -06:00
Mykola Grymalyuk	3679324371	Fix Thunderbolt Ethernet support on MacBookAir4,x Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/268	2021-06-06 13:16:09 -06:00
Mykola Grymalyuk	ebc6611f5c	Revert new mount code	2021-06-06 10:11:21 -06:00
Mykola Grymalyuk	16ac5a6093	Fix Arch settings for kexts	2021-06-05 12:52:40 -06:00
Mykola Grymalyuk	b1479fbc14	Fix OpenCore start	2021-06-05 12:36:40 -06:00
Mykola Grymalyuk	375b7c2fd2	Add NVMe and FireWire support Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/267	2021-06-05 11:38:04 -06:00
Mykola Grymalyuk	95afb7d109	Implement basic CPU detection	2021-06-04 15:45:26 -06:00
Mykola Grymalyuk	3956908482	Fix DeviceProperty and Root Volume detection	2021-06-04 15:21:59 -06:00
Mykola Grymalyuk	e0eda1fa0c	Increment build	2021-06-02 12:12:21 -06:00