Fix OpenCanopy and enhance build detection

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/workflows/build_test_deploy.yml

@@ -0,0 +1,35 @@
+name: Build/Test/Deploy
+on:
+  push:
+    branches-ignore:
+      - gh-pages
+  workflow_dispatch:
+  pull_request:
+jobs:
+  build:
+    name: Build Site and Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-node@v2-beta
+        with:
+          node-version: '12'
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+          persist-credentials: false
+          submodules: 'recursive'
+      - name: Install
+        run: npm install
+        working-directory: 'docs'
+      - name: Build
+        run: npm run build
+        working-directory: 'docs'
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@3.7.1
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+        with:
+          ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: docs/.vuepress/dist/
+          CLEAN: true

.github/workflows/main.yml

@@ -2,32 +2,28 @@ name: CI
 
 on:
   push:
-  pull_request:
   workflow_dispatch:
   release:
     types: [published]
 
 jobs:
   build:
-    name: Build
-    runs-on: macos-latest
+    name: Build App
+    runs-on: self-hosted
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.x"
-      - name: Install Python Dependencies
-        run: |
-          python3 -m pip install -U pip
-          pip3 install pyinstaller
+      # - name: Install Python Dependencies
+      #   run: |
+      #     python3 -m pip install -U pip
+      #     pip3 install pyinstaller
 
       - run: pyinstaller Opencore-Patcher.spec
       - run: ./after_pyinstaller.sh
+      - run: 'codesign -s "Developer ID Application: Mykola Grymalyuk (S74BDJXQMD)" -v --deep --timestamp --entitlements entitlements.plist -o runtime "dist/OpenCore-Patcher.app"'
 
       - run: cd dist; zip ../OpenCore-Patcher.zip OpenCore-Patcher; zip -r ../OpenCore-Patcher.app.zip OpenCore-Patcher.app
-
+      - run: ./../sign-app.sh
       - name: Upload Binary to Artifacts
         uses: actions/upload-artifact@v2
         with:

.gitignore

@@ -1,4 +1,7 @@
 .DS_Store
+OCLP-GUI.command
+/payloads/Apple-Binaries-OCLP-main
+/payloads/__MACOSX
 /App
 /Build-Folder
 /build
@@ -7,3 +10,8 @@
 __pycache__/
 *.py[cod]
 *$py.class
+/docs/.vuepress/dist
+/docs/.vuepress/.config.js.swp
+/docs/yarn.lock
+/docs/yarn-error.log
+/docs/node_modules/

CHANGELOG.md

@@ -1,5 +1,74 @@
 # OpenCore Legacy Patcher changelog
 
+## 0.0.21
+- Fix botched images in OpenCanopy
+- Add support for 3rd party OpenCore usage detection during building
+  - Mainly for users transtioning 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)
+  - Lilu 3ef7ca1 (1.5.2 release - 2021-04-05)
+  - WhateverGreen afcd687 (1.4.9 release - 2021-04-05)
+- Move Apple binaries to dedicated repo and allow custom repos
+  - Reduces App size 1/5th compared to 0.0.19
+- Fix OpenCanopy support on iMac7,1 and 8,1
+- Set iGPU-less iMacs to iMacPro1,1
+  - Additionally fixes Bluetooth on older iMacs with BRCM2046 modules
+- Add MacBook4,1 support
+- Create dedicated RestrictEvents build for MacBookPro9,1
+- 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+)
+- Fix CPU Speed reporting
+- Increment binaries
+  - OpenCore 9cd61bb (0.6.8 rolling - 2021-03-27)
+- Add Mavericks and newer .app support
+- Refactor USB map building, fixes USB 3.0 displaying as USB 2.0
+- Fix blackscreen on MacBookPro9,1
+- Update RestrictEvents with custom build (1.0.1)
+  - Blocks `/usr/libexec/displaypolicyd` on MacBookPro9,1 to ensure smooth GPU switching
+- Add custom SD Card icon
+- Add automatic codesiging and notarization
+- Fix crashing when CD is present
+- Add custom SSD icon
+- 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
+- Remove `AppleInternal`(0x10) from SIP value
+- Add Mac Pro DRM patches for Metal GPUs
+- Force `Moderate` SMBIOS replacement for models without native APFS support
+- Re-enable legacy BCM94322 networking patches
+- 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
+  - Moderate: Update entire SMBIOS, keep original serials
+  - Advanced: Update entire SMBIOS, generate new serials
+- Fix crash on MacBookPro4,1
+- Fix External Display Support on MacBookPro10,1
+- Inject Patcher version into NVRAM for easier debugging
+- Add user-configurable ShowPicker
+- Add user-configurable Vaulting, enabled by default
+- Add user-configurable SIP and SecureBootModel
+- Fix USB Maps not working on "Minimal" SMBIOS
+- Fix GPU vendor user-configuration
+- Fix custom EFI Boot icon in Mac Boot Picker
+- Enable UserInterfaceTheme to ensure DefaultBackgroundColor is respected
+- 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

OpenCore-Patcher.command

@@ -1,10 +1,14 @@
 #!/usr/bin/env python3
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
 
 from __future__ import print_function
 
-import subprocess, sys, time
+import subprocess
+import sys
+import time
+import platform
 
-from Resources import build, ModelArray, Constants, utilities
+from Resources import build, ModelArray, Constants, SysPatch, utilities, CliMenu
 
 
 class OpenCoreLegacyPatcher():
@@ -18,6 +22,23 @@ class OpenCoreLegacyPatcher():
         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.detected_os = int(platform.uname().release.partition(".")[0])
+        if self.current_model in ModelArray.NoAPFSsupport:
+            self.constants.serial_settings = "Moderate"
+
+        # 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
 
     def build_opencore(self):
         build.BuildOpenCore(self.constants.custom_model or self.current_model, self.constants).build_opencore()
@@ -42,91 +63,10 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
             if print_models in {"y", "Y", "yes", "Yes"}:
                 print("\n".join(ModelArray.SupportedSMBIOS))
                 input("Press any key to continue...")
+        if self.constants.custom_model in ModelArray.NoAPFSsupport:
+            self.constants.serial_settings = "Moderate"
 
-    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"])
-        verbose_menu = input("Enable Verbose mode(y/n): ")
-        if verbose_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.verbose_debug = True
-        elif verbose_menu in {"n", "N", "no", "No"}:
-            self.constants.verbose_debug = False
-        else:
-            print("Invalid option")
 
-    def change_oc(self):
-        utilities.cls()
-        utilities.header(["Set OpenCore DEBUG mode"])
-        change_oc_menu = input("Enable OpenCore DEBUG mode(y/n): ")
-        if change_oc_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.opencore_debug = True
-            self.constants.opencore_build = "DEBUG"
-        elif change_oc_menu in {"n", "N", "no", "No"}:
-            self.constants.opencore_debug = False
-            self.constants.opencore_build = "RELEASE"
-        else:
-            print("Invalid option")
-    def change_kext(self):
-        utilities.cls()
-        utilities.header(["Set Kext DEBUG mode"])
-        change_kext_menu = input("Enable Kext DEBUG mode(y/n): ")
-        if change_kext_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.kext_debug = True
-        elif change_kext_menu in {"n", "N", "no", "No"}:
-            self.constants.kext_debug = False
-        else:
-            print("Invalid option")
-    
-    def change_metal(self):
-        utilities.cls()
-        utilities.header(["Assume Metal GPU Always in iMac"])
-        print("""This is for iMacs that have upgraded Metal GPUs, otherwise
-Patcher assumes based on stock configuration (ie. iMac10,x-12,x)
-
-Note: Patcher will detect whether hardware has been upgraded regardless, this
-option is for those patching on a different machine.
-        """)
-        change_kext_menu = input("Enable Metal GPU build algorithm?(y/n): ")
-        if change_kext_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.metal_build = True
-        elif change_kext_menu in {"n", "N", "no", "No"}:
-            self.constants.metal_build = False
-        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.
-        """)
-        change_kext_menu = input("Enable Upgraded Wifi build algorithm?(y/n): ")
-        if change_kext_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.wifi_build = True
-        elif change_kext_menu in {"n", "N", "no", "No"}:
-            self.constants.wifi_build = False
-        else:
-            print("Invalid option")
 
     def patcher_settings(self):
         response = None
@@ -138,21 +78,23 @@ option is for those patching on a different machine.
             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}", self.change_verbose],
-                [f"Enable OpenCore DEBUG:\t\tCurrently {self.constants.opencore_debug}", self.change_oc],
-                [f"Enable Kext DEBUG:\t\t\tCurrently {self.constants.kext_debug}", self.change_kext],
-                [f"Assume Metal GPU Always:\t\tCurrently {self.constants.kext_debug}", self.change_metal],
-                [f"Assume Upgraded Wifi Always:\tCurrently {self.constants.kext_debug}", self.change_wifi],
+                [f"Enable Verbose Mode:\t\tCurrently {self.constants.verbose_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_verbose],
+                [f"Enable OpenCore DEBUG:\t\tCurrently {self.constants.opencore_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_oc],
+                [f"Enable Kext DEBUG:\t\t\tCurrently {self.constants.kext_debug}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_kext],
+                [f"Force iMac Metal Patch:\t\tCurrently {self.constants.imac_vendor}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_metal],
+                [f"Assume Upgraded Wifi Always:\tCurrently {self.constants.wifi_build}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_wifi],
+                [f"Set ShowPicker Mode:\t\tCurrently {self.constants.showpicker}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_showpicker],
+                [f"Set Vault Mode:\t\t\tCurrently {self.constants.vault}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_vault],
+                [f"Set SIP and SecureBootModel:\tSIP: {self.constants.sip_status} SBM: {self.constants.secure_status}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_sip],
+                [f"Set SMBIOS Mode:\t\t\tCurrently {self.constants.serial_settings}", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).change_serial],
+                [f"Set Custom Patch Repo", CliMenu.MenuOptions(self.constants.custom_model or self.current_model, self.constants).custom_repo],
             ]
 
             for option in options:
                 menu.add_menu_option(option[0], function=option[1])
-        
+
             response = menu.start()
 
-
-            input("Press any key to continue...")
-
     def credits(self):
         utilities.TUIOnlyPrint(["Credits"], "Press [Enter] to go back.\n",
                                ["""Many thanks to the following:
@@ -161,9 +103,35 @@ option is for those patching on a different machine.
   - Khronokernel:\tWriting and maintaining this patcher
   - DhinakG:\t\tWriting and maintaining this patcher
   - Syncretic:\t\tAAAMouSSE and telemetrap
-  - Slice:\t\tVoodooHDA
   - cdf:\t\tNightShiftEnabler"""]).start()
 
+    def PatchVolume(self):
+        utilities.cls()
+        utilities.header(["Patching System Volume"])
+        print("""Patches Root volume to fix misc issues such as:
+
+- Audio (AppleHDA) Patch for 2011 and older (Excluding MacPro4,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
+        """)
+        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()
+        else:
+            print("Returning to main menu")
+
+
     def main_menu(self):
         response = None
         ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS11
@@ -171,7 +139,7 @@ option is for those patching on a different machine.
             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"Target OS: macOS {self.constants.os_support}",
             ]
 
             if (self.constants.custom_model or self.current_model) not in ModelArray.SupportedSMBIOS:
@@ -180,14 +148,14 @@ option is for those patching on a different machine.
                     '',
                     '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 in ("MacPro3,1", "iMac7,1") and \
+            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():
                 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.'
                 ]
-            elif self.constants.custom_model in ("MacPro3,1", "iMac7,1"):
+            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+"
                               ]
@@ -196,8 +164,10 @@ option is for those patching on a different machine.
 
             menu = utilities.TUIMenu(title, "Please select an option: ", in_between=in_between, auto_number=True, top_level=True)
 
-            options = ([["Build OpenCore", self.build_opencore]] if ((self.constants.custom_model or self.current_model) in ModelArray.SupportedSMBIOS) else []) + [
+            options = (
+                [["Build OpenCore", self.build_opencore]] if ((self.constants.custom_model or self.current_model) in ModelArray.SupportedSMBIOS) 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]

README.md

@@ -2,75 +2,59 @@
 
 <img src="images/OC-Patcher.png" width="256">
 
-A python script for building and booting OpenCore on legacy Macs, see [Supported SMBIOS](/docs/MODELS.md) on whether your model is supported.
+A python program for building and booting [OpenCore](https://github.com/acidanthera/OpenCorePkg) on legacy Macs, see [Supported SMBIOS](https://dortania.github.io/OpenCore-Legacy-Patcher/MODELS.html) on whether your model is supported. Designed around Big Sur support, however can be used on older OSes.
+  
+| Support Entry | Supported OSes | Description | Comment |
+| :--- | :--- | :--- | :--- |
+| HostOS | macOS 10.7-11 | Refers to OSes where running OpenCore-Patcher.app are supported | Supports 10.7+ if [python 3.6 or higher](https://www.python.org/downloads/) is manually installed, simply run the `OpenCore-Patcher.command` located in the repo |
+| TargetOS | macOS 11 | Refers to OSes that can be patched to run with OpenCore | Unofficially supports 10.4 and newer, no support provided via this patcher |
 
 Supported features:
 
-* System Integrity Protection, FileVault 2 and .im4m Secure Boot
-* Native OTA OS updates
+* System Integrity Protection, FileVault 2, .im4m Secure Boot and Vaulting
+* Native OTA OS DELTA updates on all Macs
 * Recovery OS, Safe Mode and Single-user Mode booting
-* Zero firmware patching required(ie. APFS ROM patching)
-* GPU Switching on MacBook Pro models(2012 and newer)
+* Zero firmware patching required (ie. APFS ROM patching)
+* GPU Switching on MacBook Pro models (2012 and newer)
 
 Note: Only clean-installs and upgrades are supported, installs already patched with [Patched-Sur](https://github.com/BenSova/Patched-Sur) or [bigmac](https://github.com/StarPlayrX/bigmac) cannot be used due to broken file integrity with APFS snapshots and SIP.
 
 * You can however reinstall macOS with this patcher and retain your original data
 
-Note 2: Currently OpenCore Legacy Patcher only supports macOS 11, Big Sur installs. For older OSes, please use [Dosdude1's patchers](http://dosdude1.com)
+Note 2: Currently OpenCore Legacy Patcher officially supports patching to run macOS 11, Big Sur installs. For older OSes, OpenCore may function however support is currently not provided from Dortania.
+
+For Mojave and Catalina support, we recommend the use of [dosdude1's patchers](http://dosdude1.com)
 
 ## How to use
 
-To use, simply:
+See the online guide on how:
 
-1. Ensure your hardware is compatible(See [Supported SMBIOS](/docs/MODELS.md))
-2. Download and build macOS Installer
-3. Download the latest release: [OpenCore Legacy Patcher Releases](https://github.com/dortania/Opencore-Legacy-Patcher/releases)
-4. Run the `OpenCore-Patcher.app`
-5. Run `Build OpenCore`(if building for another machine, please select `Change Model`)
-
-| First Run | Build EFI |
-| :--- | :--- |
-| ![](images/first-run.png) | ![](images/build-efi.png) |
-
-  * Note: When the patcher ask you to if you want to use original serials, we recommend doing so. To determine yourself if you want:
-    * Original: Mac is nearly identical to pre-patcher, with only minor changes in SMBIOS. Ideal configuration for iServices to work correctly
-	* Custom: Rebuilds SMBIOS table to Mac you're spoofing, generally recommended when troubleshooting such as APFS support missing in the installer
-
-6. Run `Install OpenCore to USB/internal drive`
-
-| Select Drive | Select EFI/FAT32 Partition |
-| :--- | :--- |
-| ![](images/disk-start.png) | ![](images/disk-efi.png) |
-
-  * Ensure you install OpenCore onto a FAT32 partition to ensure your Mac is able to boot it, you may need to format your drive as GUID/GPT in Disk Utility
-  
-7. Reboot machine while holding `Option` to select OpenCore, then boot the macOS Installer
-
-| Mac Boot Picker | OpenCore Picker |
-| :--- | :--- |
-| ![](images/efi-boot.png) | ![](images/oc-boot.png) |
-
-For nightly builds, you can either run `OpenCore-Patcher.command` from [main](https://github.com/dortania/Opencore-Legacy-Patcher/archive/main.zip) or grab the binary from  [Github Actions](https://github.com/dortania/Opencore-Legacy-Patcher/actions). Note the latter does not require a py3 install.
-
-## How to uninstall OpenCore?
-
-To remove OpenCore is actually quite simply:
-
-1. Remove OpenCore either from the USB or internal drive
-  * You'll need to mount the drive's EFI partition, and delete the EFI folder
-  * [See here for example how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
-2. Reset NVRAM
-  * [Reset NVRAM or PRAM on your Mac](https://support.apple.com/HT204063)
-  
-Know that if you are on Big Sur when you remove the EFI folder, your Mac will no longer boot and show the prohibited symbol. Be ready to install an older version of macOS before you uninstall OpenCore.
+* [OpenCore Legacy Patcher Guide](https://dortania.github.io/OpenCore-Legacy-Patcher/)
 
 ## Patcher Warnings
 
 Since this patcher tricks macOS into thinking you're running a newer Mac, certain functionality may be broken:
 
 * Boot Camp Assistant.app
-  * We recommend running the assistant on a natively supported OS
+  * We recommend running the assistant on a natively supported OS, running via the patcher may result in unforeseen issues
 * Legacy Windows Booting
-  * Currently OpenCore cannot boot MBR-based installs, so Ivy Bridge and older Machines may not be able to see Windows in OpenCore's Boot Picker
+  * Currently OpenCore cannot boot MBR-based installs, so Ivy Bridge and older Machines may [not be able to see Windows in OpenCore's Boot Picker](https://github.com/acidanthera/bugtracker/issues/912)
+  * [Solution is to convert install to UEFI](https://docs.microsoft.com/en-us/mem/configmgr/osd/deploy-use/task-sequence-steps-to-manage-bios-to-uefi-conversion)
+* Boot Buddy support
+  * Due to how OpenCore overwrites NVRAM, the usage of Boot Buddy and such tools are **highly** in-advised
 
-## [Troubleshooting](/docs/TROUBLESHOOTING.md)
+## Support
+
+To get aid with the patcher, we recommend joining the [Unsupported Mac Discord Server](https://discord.gg/XbbWAsE) and heading over to our `#opencore-patcher` channel. We're actively there and is the quickest way to receive help. For bigger issues such as patcher crashing on build and such, we recommend opening an issue right here on GitHub:
+
+* [OpenCore Legacy Patcher's Issue's tab](https://github.com/dortania/OpenCore-Legacy-Patcher/issues)
+
+Regarding how to debug OpenCore Patcher, we recommend seeing the below:
+
+* [How to debug with OpenCore](https://dortania.github.io/OpenCore-Legacy-Patcher/DEBUG.html)
+
+## Supporting us!
+
+To help support this patcher, we recommend chancking this page:
+
+* [Supporting the patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/DONATE.html)

Resources/CliMenu.py

@@ -0,0 +1,239 @@
+# Handle misc CLI menu options
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
+from __future__ import print_function
+
+import subprocess, sys, time, platform
+
+from Resources import build, ModelArray, Constants, SysPatch, utilities
+
+class MenuOptions:
+    def __init__(self, model, versions):
+        self.model = model
+        self.constants: Constants.Constants = versions
+
+    def change_os(self):
+        utilities.cls()
+        utilities.header(["Select Patcher's Target OS"])
+        print(f"""
+Minimum Target:\t{self.constants.min_os_support}
+Maximum Target:\t{self.constants.max_os_support}
+Current target:\t{self.constants.os_support}
+        """)
+        temp_os_support = float(input("Please enter OS target: "))
+        if (self.constants.max_os_support < temp_os_support) or (temp_os_support < self.constants.min_os_support):
+            print("Unsupported entry")
+        else:
+            self.constants.os_support = temp_os_support
+        if temp_os_support == 11.0:
+            ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS11
+        elif temp_os_support == 12.0:
+            ModelArray.SupportedSMBIOS = ModelArray.SupportedSMBIOS12
+
+    def change_verbose(self):
+        utilities.cls()
+        utilities.header(["Set Verbose mode"])
+        change_menu = input("Enable Verbose mode(y/n): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.verbose_debug = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.verbose_debug = False
+        else:
+            print("Invalid option")
+
+    def change_oc(self):
+        utilities.cls()
+        utilities.header(["Set OpenCore DEBUG mode"])
+        change_menu = input("Enable OpenCore DEBUG mode(y/n): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.opencore_debug = True
+            self.constants.opencore_build = "DEBUG"
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.opencore_debug = False
+            self.constants.opencore_build = "RELEASE"
+        else:
+            print("Invalid option")
+    def change_kext(self):
+        utilities.cls()
+        utilities.header(["Set Kext DEBUG mode"])
+        change_menu = input("Enable Kext DEBUG mode(y/n): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.kext_debug = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.kext_debug = False
+        else:
+            print("Invalid option")
+
+    def change_metal(self):
+        utilities.cls()
+        utilities.header(["Assume Metal GPU Always in iMac"])
+        print("""This is for iMacs that have upgraded Metal GPUs, otherwise
+Patcher assumes based on stock configuration (ie. iMac10,x-12,x)
+
+Valid Options:
+
+1. None(stock GPU)
+2. Nvidia GPU
+3. AMD GPU
+
+Note: Patcher will detect whether hardware has been upgraded regardless, this
+option is for those patching on a different machine or OCLP cannot detect.
+        """)
+        change_menu = input("Set GPU Patch type(ie. 1): ")
+        if change_menu == "1":
+            self.constants.metal_build = False
+            self.constants.imac_vendor = "None"
+        elif change_menu == "2":
+            self.constants.metal_build = True
+            self.constants.imac_vendor = "Nvidia"
+        elif change_menu == "3":
+            self.constants.metal_build = True
+            self.constants.imac_vendor = "AMD"
+        else:
+            print("Invalid option")
+
+    def change_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
+Recommended for adanced users who want control how serials are handled
+
+Valid options:
+
+1. Minimal:\tUse original serials and minimally update SMBIOS
+2. Moderate:\tReplace entire SMBIOS but keep original serials
+3. Advanced:\tReplace entire SMBIOS and generate new serials
+
+Note: For new users we recommend leaving as default(1. Minimal)
+        """)
+        change_menu = input("Set SMBIOS Mode(ie. 1): ")
+        if change_menu == "1":
+            self.constants.serial_settings = "Minimal"
+        elif change_menu == "2":
+            self.constants.serial_settings = "Moderate"
+        elif change_menu == "3":
+            self.constants.serial_settings = "Advanced"
+        else:
+            print("Invalid option")
+    def change_showpicker(self):
+        utilities.cls()
+        utilities.header(["Set OpenCore Picker mode"])
+        print("""By default, OpenCore will show its boot picker each time on boot up,
+however this can be disabled by default and be shown on command by repeatedly
+pressing the "Esc" key
+        """)
+        change_menu = input("Show OpenCore Picker by default(y/n): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.showpicker = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.showpicker = False
+        else:
+            print("Invalid option")
+
+    def change_vault(self):
+        utilities.cls()
+        utilities.header(["Set OpenCore Vaulting"])
+        print("""By default, this patcher will sign all your files and ensure none of the
+contents can be tampered with. However for more advanced users, you may
+want to be able to freely edit the config.plist and files.
+
+Note: For secuirty reasons, OpenShell will be disabled when Vault is set.
+
+        """)
+        change_menu = input("Enable Vault(y/n): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.vault = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.vault = False
+        else:
+            print("Invalid option")
+
+    def change_sip(self):
+        utilities.cls()
+        utilities.header(["Set SIP and SecureBootModel"])
+        print("""SIP and SecureBootModel are used to ensure proper OTA functionality,
+however to patch the root volume both of these must be disabled.
+Only disable is absolutely necessary. SIP value = 0xFEF
+
+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
+2. Disable SIP only
+3. Disable SecureBootModel Only
+4. Disable Both
+
+        """)
+        change_menu = input("Set SIP and SecureBootModel(ie. 1): ")
+        if change_menu == "1":
+            self.constants.sip_status = True
+            self.constants.secure_status = True
+        elif change_menu == "2":
+            self.constants.sip_status = False
+            self.constants.secure_status = True
+        elif change_menu == "3":
+            self.constants.sip_status = True
+            self.constants.secure_status = False
+        elif change_menu == "4":
+            self.constants.sip_status = False
+            self.constants.secure_status = False
+        else:
+            print("Invalid option")
+
+    def change_imac_nvidia(self):
+        utilities.cls()
+        utilities.header(["Force iMac Nvidia Patches"])
+        print("""Specifically for iMac10,x-12,x with Metal Nvidia GPU upgrades
+By default the patcher will try to detect what hardware is
+running, however this will enforce iMac Nvidia Build Patches.
+        """)
+        change_menu = input("Assume iMac Nvidia patches(y/n): ")
+        if change_menu in {"y", "Y", "yes", "Yes"}:
+            self.constants.imac_nvidia_build = True
+        elif change_menu in {"n", "N", "no", "No"}:
+            self.constants.imac_nvidia_build = False
+        else:
+            print("Invalid option")
+
+    def custom_repo(self):
+        utilities.cls()
+        utilities.header(["Swet custom patch repo"])
+        print(f"""For users participating in OpenCore Patcher betas, this is
+where you can add custom repos such as Google Drive links.
+
+Valid options:
+
+1. Set custom location
+2. Reset repo location
+3. Exit
+
+Current repo:
+{self.constants.url_apple_binaries}
+        """)
+        change_menu = input("Set custom location?: ")
+        if change_menu == "1":
+            self.constants.url_backup = self.constants.url_apple_binaries
+            self.constants.url_apple_binaries = input("Enter new URL: ")
+        elif change_menu == "2":
+            if self.constants.url_backup != "":
+                self.constants.url_apple_binaries = self.constants.url_backup
+        else:
+            print("Invalid option")

Resources/Constants.py

@@ -1,5 +1,6 @@
 # pylint: disable=multiple-statements
 # Define Files
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
 
 from __future__ import print_function
 
@@ -8,13 +9,13 @@ from pathlib import Path
 
 class Constants:
     def __init__(self):
-        self.patcher_version = "0.0.15"
-        self.opencore_commit = "7bb41aa - 2021-03-06"
+        self.patcher_version = "0.0.21"
+        self.opencore_commit = "c528597 - 2021-04-05"
         self.opencore_version = "0.6.8"
-        self.lilu_version = "1.5.1"
-        self.whatevergreen_version = "1.4.8"
+        self.lilu_version = "1.5.2"
+        self.whatevergreen_version = "1.4.9"
         self.airportbcrmfixup_version = "2.1.2"
-        self.bcm570_version = "1.0.0"
+        self.bcm570_version = "1.0.1"
         self.marvel_version = "1.0.0"
         self.nforce_version = "1.0.0"
         self.mce_version = "1.0.0"
@@ -24,10 +25,14 @@ class Constants:
         self.io80211mojave_version = "1.0.0"
         self.voodoohda_version = "296"
         self.restrictevents_version = "1.0.0"
+        self.restrictevents_mbp_version = "1.0.1"
         self.piixata_version = "1.0.0"
         self.backlight_version = "1.0.0"
         self.cpufriend_version = "1.2.3"
         self.nightshift_version = "1.1.0"
+        self.smcspoof_version = "1.0.0"
+        self.cputscsync = "1.0.3"
+        self.hibernationfixup = "1.3.9"
 
         # Get resource path
         self.current_path = Path(__file__).parent.parent.resolve()
@@ -42,12 +47,39 @@ class Constants:
         self.opencore_debug = False
         self.opencore_build = "RELEASE"
         self.kext_debug = False
-        self.verbose_debug = True
+        self.verbose_debug = False
         self.os_support = 11.0
         self.min_os_support = 11.0
         self.max_os_support = 11.0
         self.metal_build = False
+        self.imac_vendor = "None"
         self.wifi_build = False
+        self.gui_mode = False
+        self.serial_settings = "Minimal"
+        self.showpicker = True
+        self.vault = False
+        self.sip_status = True
+        self.secure_status = True
+        self.detected_os = 0
+
+        # OS Versions
+        self.tiger = 8
+        self.leopard = 9
+        self.snow_leopard = 10
+        self.lion = 11
+        self.mountain_lion = 12
+        self.mavericks = 13
+        self.yosemite = 14
+        self.el_capitan = 15
+        self.sierra = 16
+        self.high_sierra = 17
+        self.mojave = 18
+        self.catalina = 19
+        self.big_sur = 20
+
+        # External Files
+        self.url_backup = ""
+        self.url_apple_binaries = "https://github.com/dortania/Apple-Binaries-OCLP/archive/refs/heads/main.zip"
 
     # Payload Location
     # OpenCore
@@ -76,6 +108,8 @@ class Constants:
     @property
     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")
+    @property
     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")
@@ -101,6 +135,12 @@ class Constants:
     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")
+    @property
+    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")
+    @property
+    def hibernationfixup_path(self): return self.payload_kexts_path / Path(f"Acidanthera/HibernationFixup-v{self.hibernationfixup}.zip")
 
     # Build Location
     @property
@@ -130,15 +170,131 @@ class Constants:
     def pp_kext_folder(self): return self.kexts_path / Path("CPUFriendDataProvider.kext")
     @property
     def pp_contents_folder(self): return self.pp_kext_folder / Path("Contents")
+    @property
+    def agdp_kext_folder(self): return self.kexts_path / Path("AGDP-Override.kext")
+    @property
+    def agdp_contents_folder(self): return self.agdp_kext_folder / Path("Contents")
+    @property
+    def agpm_kext_folder(self): return self.kexts_path / Path("AGPM-Override.kext")
+    @property
+    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")
+    @property
+    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")
     @property
-    def icon_path(self): return self.payload_path / Path("Icon/.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")
+    @property
+    def icon_path_sd(self): return self.payload_path / Path("Icon/SD-Card/.VolumeIcon.icns")
+    @property
+    def icon_path_ssd(self): return self.payload_path / Path("Icon/SSD/.VolumeIcon.icns")
     @property
     def gui_path(self): return self.payload_path / Path("Icon/Resources.zip")
+
+    # Apple Paylods Paths
+    @property
+    def payload_apple_root_path_unzip(self): return self.payload_path / Path("Apple-Binaries-OCLP-main")
+    @property
+    def payload_apple_root_path_zip(self): return self.payload_path / Path("Apple.zip")
+    @property
+    def payload_apple_root_path(self): return self.payload_path / Path("Apple")
+    @property
+    def payload_apple_kexts_path(self): return self.payload_apple_root_path / Path("Extensions")
+    @property
+    def payload_apple_frameworks_path(self): return self.payload_apple_root_path / Path("Frameworks")
+    @property
+    def payload_apple_frameworks_path_accel(self): return self.payload_apple_frameworks_path / Path("Graphics-Acceleration")
+    @property
+    def payload_apple_lauchd_path(self): return self.payload_apple_root_path / Path("LaunchDaemons")
+    @property
+    def payload_apple_lauchd_path_accel(self): return self.payload_apple_lauchd_path / Path("Graphics-Acceleration")
+    @property
+    def payload_apple_private_frameworks_path(self): return self.payload_apple_root_path / Path("PrivateFrameworks")
+    @property
+    def payload_apple_private_frameworks_path_accel(self): return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration")
+    @property
+    def payload_apple_private_frameworks_path_brightness(self): return self.payload_apple_private_frameworks_path / Path("Brightness-Control")
+
+    # Apple Extensions
+    @property
+    def applehda_path(self): return self.payload_apple_kexts_path / Path("Audio/AppleHDA.kext")
+
+
+    # GPU Kexts and Bundles
+    @property
+    def legacy_graphics(self): return self.payload_apple_kexts_path / Path("Graphics-Acceleration")
+    @property
+    def legacy_nvidia_path(self): return self.legacy_graphics / Path("Nvidia-Tesla-Fermi")
+    @property
+    def legacy_amd_path(self): return self.legacy_graphics / Path("AMD-ATI")
+    @property
+    def legacy_intel_gen1_path(self): return self.legacy_graphics / Path("Intel-Gen5-Ironlake")
+    @property
+    def legacy_intel_gen2_path(self): return self.legacy_graphics / Path("Intel-Gen6-SandyBridge")
+
+    @property
+    def legacy_brightness(self): return self.payload_apple_kexts_path / Path("Brightness-Control")
+
+    # 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")
+
+    # Apple LaunchDaemons
+    @property
+    def hiddhack_path(self): return self.payload_apple_lauchd_path_accel / Path("HiddHack.plist")
+
+    # Apple PrivateFrameworks
+    @property
+    def gpusupport_path(self): return self.payload_apple_private_frameworks_path_accel / Path("GPUSupport.framework")
+    @property
+    def skylight_path(self): return self.payload_apple_private_frameworks_path_accel / Path("SkyLight.framework")
+
+    csr_values = {
+        "CSR_ALLOW_UNTRUSTED_KEXTS           ": False, # 0x1   - Introduced in El Capitan
+        "CSR_ALLOW_UNRESTRICTED_FS           ": False, # 0x2   - Introduced in El Capitan
+        "CSR_ALLOW_TASK_FOR_PID              ": False, # 0x4   - Introduced in El Capitan
+        "CSR_ALLOW_KERNEL_DEBUGGER           ": False, # 0x8   - Introduced in El Capitan
+        "CSR_ALLOW_APPLE_INTERNAL            ": False, # 0x10  - Introduced in El Capitan
+        "CSR_ALLOW_UNRESTRICTED_DTRACE       ": False, # 0x20  - Introduced in El Capitan
+        "CSR_ALLOW_UNRESTRICTED_NVRAM        ": False, # 0x40  - Introduced in El Capitan
+        "CSR_ALLOW_DEVICE_CONFIGURATION      ": False, # 0x80  - Introduced in El Capitan
+        "CSR_ALLOW_ANY_RECOVERY_OS           ": False, # 0x100 - Introduced in Sierra
+        "CSR_ALLOW_UNAPPROVED_KEXTS          ": False, # 0x200 - Introduced in High Sierra
+        "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE": False, # 0x400 - Introduced in Mojave
+        "CSR_ALLOW_UNAUTHENTICATED_ROOT      ": False, # 0x800 - Introduced in Big Sur
+    }
+
+    sbm_values = [
+        "j137",
+        "j680",
+        "j132",
+        "j174",
+        "j140k",
+        "j780",
+        "j213",
+        "j140a",
+        "j152f",
+        "j160",
+        "j230k",
+        "j214k",
+        "j223",
+        "j215",
+        "j185",
+        "j185f",
+    ]

Resources/ModelArray.py

@@ -1,7 +1,12 @@
 # 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",
@@ -51,6 +56,7 @@ SupportedSMBIOS11 = [
     "iMac12,2",
     "iMac13,1",
     "iMac13,2",
+    "iMac13,3",
     "iMac14,1",
     "iMac14,2",
     "iMac14,3",
@@ -70,6 +76,7 @@ SupportedSMBIOS12 = [
 ## CPU patches
 
 MissingSSE42 = [
+    "MacBook4,1",
     "MacBook5,1",
     "MacBook5,2",
     "MacBook6,1",
@@ -128,7 +135,6 @@ EthernetNvidia = [
     "MacBookPro5,3",
     "MacBookPro5,4",
     "MacBookPro5,5",
-    "MacBookPro7,1",
     "Macmini3,1",
     "Macmini4,1",
     "iMac9,1",
@@ -136,6 +142,7 @@ EthernetNvidia = [
     "Dortania1,1"
 ]
 EthernetMarvell = [
+    "MacBook4,1",
     "MacBookPro4,1",
     "iMac7,1",
     "iMac8,1",
@@ -144,6 +151,7 @@ EthernetMarvell = [
 EthernetBroadcom = [
     "MacBookPro6,1",
     "MacBookPro6,2",
+    "MacBookPro7,1",
     "MacBookPro8,1",
     "MacBookPro8,2",
     "MacBookPro8,3",
@@ -173,6 +181,7 @@ WifiAtheros = [
 ]
 
 WifiBCM94328 = [
+    "MacBook4,1",
     "MacBookAir2,1",
     "MacBookPro4,1",
     "iMac7,1",
@@ -185,48 +194,27 @@ WifiBCM94322 = [
     "MacBook5,2",
     "MacBookAir3,1",
     "MacBookAir3,2",
-    "MacBookAir4,1",
-    "MacBookAir4,2",
-    "MacBookAir5,1",
-    "MacBookAir5,2",
     "MacBookPro5,1",
     "MacBookPro5,2",
     "MacBookPro5,3",
     "MacBookPro5,4",
     "MacBookPro5,5",
     "MacBookPro7,1",
-    "Dortania1,1"
-]
-
-WifiBCM943224 = [
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookPro6,1",
-    "MacBookPro6,2",
     "Macmini3,1",
-    "Macmini4,1",
+    "iMac9,1",
+    "MacPro5,1",
     "Dortania1,1"
 ]
 
 WifiBCM94331 = [
-    "MacBook5,1",    # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBook5,2",    # 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)
-    "MacBookAir3,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBookAir3,2", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
     "MacBookAir4,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
     "MacBookAir4,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
     "MacBookAir5,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
     "MacBookAir5,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro5,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBookPro5,2", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBookPro5,3", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBookPro5,4", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
-    "MacBookPro5,5", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
     "MacBookPro6,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
     "MacBookPro6,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
-    "MacBookPro7,1", # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
     "MacBookPro8,1", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
     "MacBookPro8,2", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
     "MacBookPro8,3", # PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)
@@ -234,23 +222,22 @@ 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)
-    "Macmini3,1",    # PciRoot(0x0)/Pci(0x15,0x0)/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)
-    "iMac9,1",       # PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)
     "iMac13,1",      # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
     "iMac13,2",      # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
-    "MacPro5,1",     # PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)
+    "iMac13,3",      # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)
     "Dortania1,1"
 ]
 
 ## Audio
 
 LegacyAudio = [
+    "MacBook4,1",
     "MacBook5,1",
     "MacBook5,2",
     "MacBook6,1",
@@ -293,45 +280,106 @@ LegacyAudio = [
 ## GPU
 
 LegacyGPU = [
-    "MacBook5,1",
+    "MacBook4,1", # GMA X3100
+    "MacBook5,1", # Nvidia 9000
+    "MacBook5,2", # Nvidia 9000
+    "MacBook6,1", # Nvidia 9000
+    "MacBook7,1", # Nvidia 300
+    "MacBookAir2,1", # Nvidia 9000
+    "MacBookAir3,1", # Nvidia 300
+    "MacBookAir3,2", # Nvidia 300
+    "MacBookAir4,1", # Intel 3000
+    "MacBookAir4,2", # Intel 3000
+    "MacBookPro4,1", # Nvidia 8000
+    "MacBookPro5,1", # Nvidia 9000
+    "MacBookPro5,2", # Nvidia 9000
+    "MacBookPro5,3", # Nvidia 9000
+    "MacBookPro5,4", # Nvidia 9000
+    "MacBookPro5,5", # Nvidia 9000
+    "MacBookPro6,1", # Intel 100 + Nvidia 300
+    "MacBookPro6,2", # Intel 100 + Nvidia 300
+    "MacBookPro7,1", # Nvidia 300
+    "MacBookPro8,1", # Intel 3000
+    "MacBookPro8,2", # Intel 3000 + AMD 6000
+    "MacBookPro8,3", # Intel 3000 + AMD 6000
+    "Macmini3,1", # Nvidia 9000
+    "Macmini4,1", # Nvidia 300
+    "Macmini5,1", # Intel 3000
+    "Macmini5,2", # AMD 6000
+    "Macmini5,3", # Intel 3000
+    "iMac7,1", # AMD 2000
+    "iMac8,1", # AMD 2000
+    "iMac9,1", # Nvidia 9000
+    #"iMac10,1", # Nvidia 9000 and AMD 4000
+    "iMac11,1", # AMD 4000
+    "iMac11,2", # AMD 4000 and 5000
+    "iMac11,3", # AMD 5000
+    "iMac12,1", # AMD 6000
+    "iMac12,2", # AMD 6000
+    "Dortania1,1" # RTX 3080
+]
+
+LegacyGPUNvidia = [
+    "MacBook5,1", # Nvidia 9000
+    "MacBook5,2", # Nvidia 9000
+    "MacBook6,1", # Nvidia 9000
+    "MacBook7,1", # Nvidia 300
+    "MacBookAir2,1", # Nvidia 9000
+    "MacBookAir3,1", # Nvidia 300
+    "MacBookAir3,2", # Nvidia 300
+    "MacBookPro4,1", # Nvidia 8000
+    "MacBookPro5,1", # Nvidia 9000
+    "MacBookPro5,2", # Nvidia 9000
+    "MacBookPro5,3", # Nvidia 9000
+    "MacBookPro5,4", # Nvidia 9000
+    "MacBookPro5,5", # Nvidia 9000
+    "MacBookPro6,1", # Intel 100 + Nvidia 300
+    "MacBookPro6,2", # Intel 100 + Nvidia 300
+    "MacBookPro7,1", # Nvidia 300
+    "Macmini3,1", # Nvidia 9000
+    "Macmini4,1", # Nvidia 300
+    "iMac9,1", # Nvidia 9000
+    #"iMac10,1", # Nvidia 9000 and AMD 4000
+]
+
+LegacyGPUAMD = [
+    "MacBookPro8,2", # Intel 3000 + AMD 6000
+    "MacBookPro8,3", # Intel 3000 + AMD 6000
+    "Macmini5,2", # AMD 6000
+    "iMac7,1", # AMD 2000
+    "iMac8,1", # AMD 2000
+    #"iMac10,1", # Nvidia 9000 and AMD 4000
+    "iMac11,1", # AMD 4000
+    "iMac11,2", # AMD 4000 and 5000
+    "iMac11,3", # AMD 5000
+    "iMac12,1", # AMD 6000
+    "iMac12,2", # AMD 6000
+]
+
+LegacyGPUIntelGen1 = [
+    "MacBookPro6,1", # Intel 100 + Nvidia 300
+    "MacBookPro6,2", # Intel 100 + Nvidia 300
+]
+
+LegacyGPUIntelGen2 = [
+    "MacBookAir4,1", # Intel 3000
+    "MacBookAir4,2", # Intel 3000
+    "MacBookPro8,1", # Intel 3000
+    "MacBookPro8,2", # Intel 3000 + AMD 6000
+    "MacBookPro8,3", # Intel 3000 + AMD 6000
+    "Macmini5,1", # Intel 3000
+    "Macmini5,3", # Intel 3000
+]
+
+LegacyBrightness = [
     "MacBook5,2",
-    "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",
-    "Dortania1,1"
 ]
 
 LegacyHID = [
+    "MacBook4,1",
     "MacBook5,1",
     "MacBook5,2",
     "MacBook6,1",
@@ -373,6 +421,7 @@ SidecarPatch = [
     "Macmini6,2",
     "iMac13,1",
     "iMac13,2",
+    "iMac13,3",
     "iMac14,1",
     "iMac14,2",
     "iMac14,3",
@@ -389,8 +438,6 @@ DualGPUPatch = [
     "MacBookPro6,2",
     "MacBookPro8,2",
     "MacBookPro8,3",
-    "MacBookPro9,1",
-    "MacBookPro10,1",
     "Macmini5,2",
     "iMac12,1",
     "iMac12,2",
@@ -400,6 +447,10 @@ DualGPUPatch = [
     "Dortania1,1"
 ]
 
+DualGPUPatchRetina = [
+    "MacBookPro10,1",
+]
+
 HiDPIpicker = [
     "MacBookPro10,1",
     "MacBookPro10,2",
@@ -420,6 +471,7 @@ MacBookAir61 = [
 
 # MacBook and 13" Air
 MacBookAir62 = [
+    "MacBook4,1",
     "MacBook5,1",
     "MacBook5,2",
     "MacBook6,1",
@@ -467,9 +519,8 @@ Macmini71 = [
     "Macmini6,1",
     "Macmini6,2"
 ]
-
-# iMac = AMD and Nvidia GPU
-iMac151 = [
+# iMacPro = dGPU only iMacs
+iMacPro11 = [
     "iMac7,1",
     "iMac8,1",
     "iMac9,1",
@@ -477,6 +528,10 @@ iMac151 = [
     "iMac11,1",
     "iMac11,2",
     "iMac11,3",
+]
+
+# iMac = AMD and Nvidia GPU with iGPU
+iMac151 = [
     "iMac12,1",
     "iMac12,2",
     "iMac13,2",
@@ -498,8 +553,6 @@ MacPro71 = [
     "Dortania1,1"
 ]
 
-# Maps
-
 XXerve = [
     "Xserve3,1",
 ]
@@ -516,12 +569,14 @@ iXac = [
     "iMac12,2",
     "iMac13,1",
     "iMac13,2",
+    "iMac13,3",
     "iMac14,1",
     "iMac14,2",
     "iMac14,3",
 ]
 
 XacBookNormal = [
+    "MacBook4,1",
     "MacBook5,1",
     "MacBook5,2",
     "MacBook6,1",
@@ -573,151 +628,18 @@ Xacmini = [
     "Macmini6,2",
 ]
 
-EHCI = [
-    "MacPro3,1"
-]
-
-EHC1 = [
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookAir4,1",
-    "MacBookAir4,2",
-    "MacBookAir5,1",
-    "MacBookAir5,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",
-    "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",
-    "iMac14,1",
-    "iMac14,2",
-    "iMac14,3",
-    "MacPro4,1",
-    "MacPro5,1",
-]
-
-EHC2 = [
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookAir4,1",
-    "MacBookAir4,2",
-    "MacBookAir5,1",
-    "MacBookAir5,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",
-    "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",
-    "iMac14,1",
-    "iMac14,2",
-    "iMac14,3",
-    "MacPro4,1",
-    "MacPro5,1",
-]
-
-OHC1 = [
-    "MacBook5,1",
-    "MacBook5,2",
-    "MacBook6,1",
-    "MacBook7,1",
-    "MacBookAir2,1",
-    "MacBookAir3,1",
-    "MacBookAir3,2",
-    "MacBookPro4,1",
-    "MacBookPro5,1",
-    "MacBookPro5,2",
-    "MacBookPro5,3",
-    "MacBookPro5,4",
-    "MacBookPro5,5",
-    "MacBookPro7,1",
-    "Macmini3,1",
-    "Macmini4,1",
-    "iMac7,1",
-    "iMac8,1",
-    "iMac9,1",
-    "iMac10,1",
-]
-
-IHEHC1 = [
-    "iMac13,1",
-    "iMac13,2",
-    "iMac13,3"
-]
-
-IHEHC2 = [
-    "MacBookPro9,1"
-]
-
-IH = [
-    "MacPro6,1"
+ControllerTypes = [
+    "",
+    "-EHCI",
+    "-EHC1",
+    "-EHC2",
+    "-XHC1",
+    "-OHC1",
+    "-OHC2",
+    "-InternalHub-EHC1",
+    "-InternalHub-EHC1-InternalHub",
+    "-InternalHub-EHC2",
+    "-InternalHub",
 ]
 
 upgradableMXMGPUs = [
@@ -735,15 +657,15 @@ upgradableMXMGPUs = [
 NVIDIAMXMGPUs = [
     "0x12b9",#Quadro K610M
     "0x0ff6",#Quadro K1100M
-    "0x11fc",#Quadro K2100M 
-    "0x0ffc",#Quadro K1000M 
-    "0x0ffb",#Quadro K2000M 
-    "0x11b6",#Quadro K3100M 
-    "0x11b7",#Quadro K4100M 
-    "0x11bc",#Quadro K5000M 
-    "0x11b8",#Quadro K5100M 
+    "0x11fc",#Quadro K2100M
+    "0x0ffc",#Quadro K1000M
+    "0x0ffb",#Quadro K2000M
+    "0x11b6",#Quadro K3100M
+    "0x11b7",#Quadro K4100M
+    "0x11bc",#Quadro K5000M
+    "0x11b8",#Quadro K5100M
     "0x11e1",#GTX 765M
-    "0x11e2",#GTX 765M 
+    "0x11e2",#GTX 765M
     "0x11e0",#GTX 770M
     "0x119e",#GTX 780M Mac Edition
     "0x119e",#GTX 780M
@@ -756,8 +678,8 @@ NVIDIAMXMGPUs = [
 
 AMDMXMGPUs = [
     "0x67EF",#AMD RX 460
-    "0x67e8",#AMD WX 4130/WX 4150 
-    "0x67e0",#AMD WX 4170 
+    "0x67e8",#AMD WX 4130/WX 4150
+    "0x67e0",#AMD WX 4170
     "0x67c0",#AMD WX 7100
 ]
 
@@ -778,6 +700,7 @@ X86PP = [
     "Macmini6,2",
     "iMac13,1",
     "iMac13,2",
+    "iMac13,3",
     "iMac14,1",
     "iMac14,2",
     "iMac14,3",
@@ -794,12 +717,17 @@ NightShiftExclude = [
     "Macmini6,2",
     "iMac13,1",
     "iMac13,2",
+    "iMac13,3",
     "iMac14,1",
     "iMac14,2",
     "iMac14,3",
 ]
 
 UGAtoGOP = [
+    "MacBook4,1",
+    "MacBookPro4,1",
+    "iMac7,1",
+    "iMac8,1",
     "MacPro3,1"
 ]
 
@@ -810,7 +738,172 @@ NoSATAPatch = [
     "MacBookPro10,2",
     "iMac13,1",
     "iMac13,2",
+    "iMac13,3",
     "iMac14,1",
     "iMac14,2",
     "iMac14,3",
+]
+
+NoAPFSsupport = [
+    "MacBook4,1",
+    "MacBook5,1",
+    "MacBook5,2",
+    "MacBookAir2,1",
+    "MacBookPro4,1",
+    "MacBookPro5,1",
+    "MacBookPro5,2",
+    "MacBookPro5,3",
+    "MacBookPro5,4",
+    "MacBookPro5,5",
+    "Macmini3,1",
+    "iMac7,1",
+    "iMac8,1",
+    "iMac9,1",
+    "MacPro3,1",
+    "MacPro4,1",
+    "Xserve3,1",
+    "Dortania1,1"
+]
+
+NoRootPatch11 = [
+    "MacBookAir5,1",
+    "MacBookAir5,2",
+    "MacBookPro9,1",
+    "MacBookPro9,2",
+    "MacBookPro10,1",
+    "MacBookPro10,2",
+    "Macmini6,1",
+    "Macmini6,2",
+    "iMac13,1",
+    "iMac13,2",
+    "iMac13,3",
+    "iMac14,1",
+    "iMac14,2",
+    "iMac14,3",
+    "MacPro4,1",
+    "MacPro5,1",
+    "Xserve3,1",
+]
+
+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 Dependancy
+    "AMD8000Controller.kext", # AMDSupport Dependancy
+    "AMD9000Controller.kext", # AMDSupport Dependancy
+    "AMD9500Controller.kext", # AMDSupport Dependancy
+    "AMD10000Controller.kext", # AMDSupport Dependancy
+    "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",
+]
+
+AddNvidiaAccel11 = [
+    "GeForceGA.bundle",
+	"GeForceTesla.kext",
+	"GeForceTeslaGLDriver.bundle",
+	"GeForceTeslaVADriver.bundle",
+	"NVDANV50HalTesla.kext",
+	"NVDAResmanTesla.kext",
+    "IOSurface.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", # __ZN22IOAccelDisplayMachine210gMetaClassE link issues
+	#"AMDRadeonX3000GLDriver.bundle",
+	"AMDShared.bundle",
+	"AMDSupport.kext",
+	"ATIRadeonX2000.kext",
+	"ATIRadeonX2000GA.plugin",
+	"ATIRadeonX2000GLDriver.bundle",
+	"ATIRadeonX2000VADriver.bundle",
+    "IOSurface.kext",
+]
+
+AddIntelGen1Accel = [
+    "AppleIntelFramebufferAzul.kext",
+	"AppleIntelFramebufferCapri.kext",
+	"AppleIntelHDGraphics.kext",
+	"AppleIntelHDGraphicsFB.kext",
+	"AppleIntelHDGraphicsGA.plugin",
+	"AppleIntelHDGraphicsGLDriver.bundle",
+	"AppleIntelHDGraphicsVADriver.bundle",
+    "IOSurface.kext",
+]
+
+AddIntelGen2Accel = [
+    "AppleIntelHD3000Graphics.kext",
+	"AppleIntelHD3000GraphicsGA.plugin",
+	"AppleIntelHD3000GraphicsGLDriver.bundle",
+	"AppleIntelHD3000GraphicsVADriver.bundle",
+	"AppleIntelSNBGraphicsFB.kext",
+	"AppleIntelSNBVA.bundle",
+    "IOSurface.kext",
+]
+
+DeleteBrightness = [
+    "AppleGraphicsControl.kext/Contents/PlugIns/AGDCBacklightControl.kext"
+]
+
+AddBrightness = [
+	"AppleBacklight.kext",
+	"AppleBacklightExpert.kext",
 ]

Resources/SysPatch.py

@@ -0,0 +1,344 @@
+# Framework for mounting and patching macOS root volume
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
+# Missing Features:
+# - Full System/Library Snapshotting (need to research how Apple achieves this)
+#   - Temorary Work-around: sudo bless --mount /System/Volumes/Update/mnt1 --bootefi --last-sealed-snapshot
+# - Work-around battery throttling on laptops with no battery (IOPlatformPluginFamily.kext/Contents/PlugIns/ACPI_SMC_PlatformPlugin.kext/Contents/Resources/)
+# - Add kmutil error checking
+from __future__ import print_function
+
+import binascii
+import plistlib
+import shutil
+import signal
+import subprocess
+import sys
+import uuid
+import zipfile
+import os
+from pathlib import Path
+from datetime import date
+
+from Resources import Constants, ModelArray, utilities
+
+
+class PatchSysVolume:
+    def __init__(self, model, versions):
+        self.model = model
+        self.constants: Constants.Constants = versions
+
+    def csr_decode(self, sip_raw, print_status):
+        sip_int = int.from_bytes(sip_raw, 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
+        # TODO: Fix this garbage when I have more sanity
+        if ((self.constants.csr_values["CSR_ALLOW_UNTRUSTED_KEXTS           "] is True) and (self.constants.csr_values["CSR_ALLOW_UNRESTRICTED_FS           "] is True) and (self.constants.csr_values["CSR_ALLOW_UNRESTRICTED_DTRACE       "] is True) and (self.constants.csr_values["CSR_ALLOW_UNRESTRICTED_NVRAM        "] is True) and (self.constants.csr_values["CSR_ALLOW_DEVICE_CONFIGURATION      "] is True) and (self.constants.csr_values["CSR_ALLOW_UNAPPROVED_KEXTS          "] is True) and (self.constants.csr_values["CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE"] is True) and (self.constants.csr_values["CSR_ALLOW_UNAUTHENTICATED_ROOT      "] is True)):
+            self.sip_patch_status = False
+        else:
+            self.sip_patch_status = True
+
+    def find_mount_root_vol(self, patch):
+        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.mount_location = "/System/Volumes/Update/mnt1"
+        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"
+
+        if self.root_mount_path.startswith("disk"):
+            self.root_mount_path = self.root_mount_path[:-2] if self.root_mount_path.endswith('s1') else self.root_mount_path
+            print(f"- Found Root Volume at: {self.root_mount_path}")
+            if Path(self.mount_extensions).exists():
+                print("- Root Volume is already mounted")
+                if patch is True:
+                    self.patch_root_vol()
+                else:
+                    self.unpatch_root_vol()
+            else:
+                print("- Mounting drive as writable")
+                subprocess.run(f"sudo mount -o nobrowse -t apfs /dev/{self.root_mount_path} {self.mount_location}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                if Path(self.mount_extensions).exists():
+                    print("- Sucessfully mounted the Root Volume")
+                    if patch is True:
+                        self.patch_root_vol()
+                    else:
+                        self.unpatch_root_vol()
+                else:
+                    print("- Failed to mount the Root Volume")
+        else:
+            print("- Could not find root volume")
+
+    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}")
+                subprocess.run(f"sudo rm -R {delete_path}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            else:
+                print(f"- Couldn't find {delete_current_kext}, skipping")
+
+    def add_new_binaries(self, vendor_patch, vendor_location):
+        for add_current_kext in vendor_patch:
+            existing_path = Path(self.mount_extensions) / Path(add_current_kext)
+            if Path(existing_path).exists():
+                print(f"- Found conflicting kext, Deleting Root Volume's {add_current_kext}")
+                subprocess.run(f"sudo rm -R {existing_path}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                print(f"- Adding {add_current_kext}")
+                subprocess.run(f"sudo cp -R {vendor_location}/{add_current_kext} {self.mount_extensions}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                subprocess.run(f"sudo chmod -Rf 755 {self.mount_extensions}/{add_current_kext}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                subprocess.run(f"sudo chown -Rf root:wheel {self.mount_extensions}/{add_current_kext}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            else:
+                print(f"- Adding {add_current_kext}")
+                subprocess.run(f"sudo cp -R {vendor_location}/{add_current_kext} {self.mount_extensions}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                subprocess.run(f"sudo chmod -Rf 755 {self.mount_extensions}/{add_current_kext}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+                subprocess.run(f"sudo chown -Rf root:wheel {self.mount_extensions}/{add_current_kext}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+    def gpu_accel_patches_11(self):
+        # TODO: Add proper hardware checks
+        # Due to MUX-based laptops and headless iGPUs, it's difficult to determine what GPU is present
+        # Fix would be to parse IOReg for both IGPU and GFX0
+        if self.model in ModelArray.LegacyGPUNvidia:
+            print("- Merging legacy Nvidia Kexts and Bundles")
+            self.delete_old_binaries(ModelArray.DeleteNvidiaAccel11)
+            self.add_new_binaries(ModelArray.AddNvidiaAccel11, self.constants.legacy_nvidia_path)
+        elif self.model in ModelArray.LegacyGPUAMD:
+            print("- Merging legacy AMD Kexts and Bundles")
+            self.delete_old_binaries(ModelArray.DeleteAMDAccel11)
+            self.add_new_binaries(ModelArray.AddAMDAccel11, self.constants.legacy_amd_path)
+        if self.model in ModelArray.LegacyGPUIntelGen1:
+            print("- Merging legacy Intel 1st Gen Kexts and Bundles")
+            self.delete_old_binaries(ModelArray.DeleteNvidiaAccel11)
+            self.add_new_binaries(ModelArray.AddIntelGen1Accel, self.constants.legacy_intel_gen1_path)
+        elif self.model in ModelArray.LegacyGPUIntelGen2:
+            print("- Merging legacy Intel 2nd Gen Kexts and Bundles")
+            self.delete_old_binaries(ModelArray.DeleteNvidiaAccel11)
+            self.add_new_binaries(ModelArray.AddIntelGen2Accel, self.constants.legacy_intel_gen2_path)
+        # iMac10,1 came in both AMD and Nvidia GPU models, so we must do hardware detection
+        if self.model == "iMac10,1":
+            if self.constants.current_gpuv == "AMD (0x1002)":
+                print("- Merging legacy AMD Kexts and Bundles")
+                self.delete_old_binaries(ModelArray.DeleteAMDAccel11)
+                self.add_new_binaries(ModelArray.AddAMDAccel11, self.constants.legacy_amd_path)
+            else:
+                print("- Merging legacy Nvidia Kexts and Bundles")
+                self.delete_old_binaries(ModelArray.DeleteNvidiaAccel11)
+                self.add_new_binaries(ModelArray.AddNvidiaAccel11, self.constants.legacy_nvidia_path)
+
+        # Frameworks
+        print("- Merging legacy Frameworks")
+        subprocess.run(f"sudo ditto {self.constants.payload_apple_frameworks_path_accel} {self.mount_frameworks}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+        if self.model in ModelArray.LegacyBrightness:
+            print("- Merging legacy Brightness Control Patches")
+            self.delete_old_binaries(ModelArray.DeleteBrightness)
+            self.add_new_binaries(ModelArray.AddBrightness, self.constants.legacy_brightness)
+            subprocess.run(f"sudo ditto {self.constants.payload_apple_private_frameworks_path_brightness} {self.mount_private_frameworks}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            subprocess.run(f"sudo chmod -R 755 {self.mount_private_frameworks}/DisplayServices.framework".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            subprocess.run(f"sudo chown -R root:wheel {self.mount_private_frameworks}/DisplayServices.framework".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+        # LaunchDaemons
+        print("- Adding HiddHack.plist")
+        subprocess.run(f"sudo ditto {self.constants.payload_apple_lauchd_path_accel} {self.mount_lauchd}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+        subprocess.run(f"sudo chmod 755 {self.mount_lauchd}/HiddHack.plist".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+        subprocess.run(f"sudo chown root:wheel {self.mount_lauchd}/HiddHack.plist".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+        # PrivateFrameworks
+        print("- Merging legacy PrivateFrameworks")
+        subprocess.run(f"sudo ditto {self.constants.payload_apple_private_frameworks_path_accel} {self.mount_private_frameworks}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+        # Sets AppKit to Catalina Window Drawing codepath
+        print("- Disabling NSDefenestratorModeEnabled")
+        subprocess.run("defaults write -g NSDefenestratorModeEnabled -bool false".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+
+    def patch_root_vol(self):
+        print(f"- Detecting patches for {self.model}")
+        # TODO: Create Backup of S*/L*/Extensions, Frameworks and PrivateFramework to easily revert changes
+        # APFS snapshotting seems to ignore System Volume changes inconcistently, would like a backup to avoid total brick
+        # Perhaps a basic py2 script to run in recovery to restore
+        print("- Creating backup snapshot of user data (This may take some time)")
+        subprocess.run("tmutil snapshot".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+        # Ensures no .DS_Stores got in
+        print("- Preparing Files")
+        subprocess.run(f"sudo find {self.constants.payload_apple_root_path} -name '.DS_Store' -delete".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+        current_gpu: str = subprocess.run("system_profiler SPDisplaysDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
+        self.constants.current_gpuv = [line.strip().split(": ", 1)[1] for line in current_gpu.split("\n") if line.strip().startswith(("Vendor"))][0]
+        self.constants.current_gpud = [line.strip().split(": ", 1)[1] for line in current_gpu.split("\n") if line.strip().startswith(("Device ID"))][0]
+
+        # Start Patch engine
+        if self.model in ModelArray.LegacyAudio:
+            print("- Attempting AppleHDA Patch")
+            subprocess.run(f"sudo rm -R {self.mount_extensions}/AppleHDA.kext".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            subprocess.run(f"sudo cp -R {self.constants.applehda_path} {self.mount_extensions}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            subprocess.run(f"sudo chmod -Rf 755 {self.mount_extensions}/AppleHDA.kext".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            subprocess.run(f"sudo chown -Rf root:wheel {self.mount_extensions}/AppleHDA.kext".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+            rebuild_required = True
+
+        if (self.model in ModelArray.LegacyGPU) and (Path(self.constants.hiddhack_path).exists()):
+            print(f"- Detected GPU: {self.constants.current_gpuv} {self.constants.current_gpud}")
+            if (self.constants.current_gpuv == "AMD (0x1002)") & (self.constants.current_gpud in ModelArray.AMDMXMGPUs):
+                print("- Detected Metal-based AMD GPU, skipping legacy patches")
+            elif (self.constants.current_gpuv == "NVIDIA (0x10de)") & (self.constants.current_gpud in ModelArray.NVIDIAMXMGPUs):
+                print("- Detected Metal-based Nvidia GPU, skipping legacy patches")
+            else:
+                print("- Detected legacy GPU, attempting legacy acceleration patches")
+                self.gpu_accel_patches_11()
+                rebuild_required = True
+
+        if rebuild_required is True:
+            self.rebuild_snapshot()
+
+    def unpatch_root_vol(self):
+        print("- Creating backup snapshot of user data (This may take some time)")
+        subprocess.run("tmutil snapshot".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+        print("- Reverting to last signed APFS snapshot")
+        subprocess.run(f"sudo bless --mount {self.mount_location} --bootefi --last-sealed-snapshot".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+    def rebuild_snapshot(self):
+        input("Press [ENTER] to continue with cache rebuild")
+        print("- Rebuilding Kernel Cache (This may take some time)")
+        subprocess.run(f"sudo kmutil install --volume-root {self.mount_location} --update-all".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+        input("Press [ENTER] to continue with snapshotting")
+        print("- Creating new APFS snapshot")
+        subprocess.run(f"sudo bless --folder {self.mount_location}/System/Library/CoreServices --bootefi --create-snapshot".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode()
+
+    def unmount_drive(self):
+        print("- Unmounting Root Volume (Don't worry if this fails)")
+        subprocess.run(f"sudo diskutil unmount {self.root_mount_path}".split(), 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
+        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:
+            self.fv_status = True
+        self.sip_patch_status = True
+        self.csr_decode(self.sip_status, False)
+
+    def check_files(self):
+        if Path(self.constants.payload_apple_root_path).exists():
+            print("- Found Apple Binaries")
+            patch_input = input("Would you like to redownload?(y/n): ")
+            if patch_input in {"y", "Y", "yes", "Yes"}:
+                shutil.rmtree(Path(self.constants.payload_apple_root_path))
+                self.download_files()
+        else:
+            print("- Apple binaries missing")
+            self.download_files()
+
+    def download_files(self):
+        utilities.cls()
+        print("- Downloading Apple binaries")
+        popen_oclp = subprocess.Popen(f"curl -S -L {self.constants.url_apple_binaries} --output {self.constants.payload_apple_root_path_zip}".split(), 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.payload_apple_root_path_zip.exists():
+            print("- Download completed")
+            print("- Unzipping download...")
+            try:
+                subprocess.run(f"unzip {self.constants.payload_apple_root_path_zip}".split(), 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)
+                print("- Binaries downloaded to:")
+                print(self.constants.payload_path)
+                input("Press [ENTER] to continue")
+            except zipfile.BadZipFile:
+                print("- Couldn't unzip")
+            os.remove(self.constants.payload_apple_root_path_zip)
+        else:
+            print("- Download failed, please verify the below link works:")
+            print(self.constants.url_apple_binaries)
+
+    def start_patch(self):
+        # Check SIP
+        if self.constants.custom_model is not None:
+            print("Root Patching must be done on target machine!")
+        elif self.model in ModelArray.NoRootPatch11:
+            print("Root Patching not required for this machine!")
+        elif self.model not in ModelArray.SupportedSMBIOS:
+            print("Cannot run on this machine, model is unsupported!")
+        elif self.constants.detected_os < self.constants.big_sur:
+            print(f"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")
+                input("\nPress [ENTER] to continue")
+                self.check_files()
+                if self.constants.payload_apple_root_path.exists():
+                    self.find_mount_root_vol(True)
+                    self.unmount_drive()
+                    print("- Patching complete")
+                    print("\nPlease reboot the machine for patches to take effect")
+            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(self.sip_status, 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("")
+        input("Press [Enter] to go exit.")
+    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(f"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")
+                input("\nPress [ENTER] to continue")
+                self.find_mount_root_vol(False)
+                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(self.sip_status, 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("")
+        input("Press [Enter] to go exit.")
+

Resources/build.py

@@ -1,5 +1,5 @@
 # Commands for building the EFI and SMBIOS
-
+# Copyright (C) 2020-2021, Dhinak G, Mykola Grymalyuk
 from __future__ import print_function
 
 import binascii
@@ -69,13 +69,16 @@ class BuildOpenCore:
         self.config["#Revision"]["Build-Version"] = f"{self.constants.patcher_version} - {date.today()}"
         self.config["#Revision"]["OpenCore-Version"] = f"{self.constants.opencore_version} - {self.constants.opencore_build} - {self.constants.opencore_commit}"
         self.config["#Revision"]["Original-Model"] = self.model
+        self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Version"] = f"{self.constants.patcher_version}"
 
         for name, version, path, check in [
             # Essential kexts
             ("Lilu.kext", self.constants.lilu_version, self.constants.lilu_path, lambda: True),
             ("WhateverGreen.kext", self.constants.whatevergreen_version, self.constants.whatevergreen_path, lambda: True),
             ("RestrictEvents.kext", self.constants.restrictevents_version, self.constants.restrictevents_path, lambda: self.model in ModelArray.MacPro71),
+            ("RestrictEvents.kext", self.constants.restrictevents_mbp_version, self.constants.restrictevents_mbp_path, lambda: self.model == "MacBookPro9,1"),
             ("NightShiftEnabler.kext", self.constants.nightshift_version, self.constants.nightshift_path, lambda: self.model not in ModelArray.NightShiftExclude),
+            ("SMC-Spoof.kext", self.constants.smcspoof_version, self.constants.smcspoof_path, lambda: True),
             # CPU patches
             ("AppleMCEReporterDisabler.kext", self.constants.mce_version, self.constants.mce_path, lambda: self.model in ModelArray.DualSocket),
             ("AAAMouSSE.kext", self.constants.mousse_version, self.constants.mousse_path, lambda: self.model in ModelArray.SSEEmulator),
@@ -86,16 +89,24 @@ class BuildOpenCore:
             ("MarvelYukonEthernet.kext", self.constants.marvel_version, self.constants.marvel_path, lambda: self.model in ModelArray.EthernetMarvell),
             ("CatalinaBCM5701Ethernet.kext", self.constants.bcm570_version, self.constants.bcm570_path, lambda: self.model in ModelArray.EthernetBroadcom),
             # Legacy audio
-            ("VoodooHDA.kext", self.constants.voodoohda_version, self.constants.voodoohda_path, lambda: self.model in ModelArray.LegacyAudio),
+            #("VoodooHDA.kext", self.constants.voodoohda_version, self.constants.voodoohda_path, lambda: self.model in ModelArray.LegacyAudio),
             # IDE patch
             ("AppleIntelPIIXATA.kext", self.constants.piixata_version, self.constants.piixata_path, lambda: self.model in ModelArray.IDEPatch),
+            # Hibernation Tests
+            #("CpuTscSync.kext", self.constants.cputscsync, self.constants.cputscsync_path, lambda: True),
+            #("HibernationFixup.kext", self.constants.hibernationfixup, self.constants.hibernationfixup_path, lambda: True),
         ]:
             self.enable_kext(name, version, path, check)
 
         # WiFi patches
-        wifi_devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-        wifi_devices = [i for i in wifi_devices if i["vendor-id"] == binascii.unhexlify("E4140000") and i["class-code"] == binascii.unhexlify("00800200")]
-        if self.constants.wifi_build == True:
+        # TODO: -a is not supported in Lion and older, need to add proper fix
+        if self.constants.detected_os > self.constants.lion:
+            wifi_devices = plistlib.loads(subprocess.run("ioreg -c IOPCIDevice -r -d2 -a".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+            wifi_devices = [i for i in wifi_devices if i["vendor-id"] == binascii.unhexlify("E4140000") and i["class-code"] == binascii.unhexlify("00800200")]
+        else:
+            wifi_devices = ""
+            print("- Can't run Wifi hardware detection on Snow Leopard and older")
+        if self.constants.wifi_build is True:
             print("- Skipping Wifi patches on request")
         elif not self.constants.custom_model and wifi_devices and self.hexswap(binascii.hexlify(wifi_devices[0]["device-id"]).decode()[:4]) in ModelArray.nativeWifi:
             print("- Found supported WiFi card, skipping wifi patches")
@@ -124,9 +135,12 @@ class BuildOpenCore:
                     property_path = "PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)"
                 print("- Applying fake ID for WiFi")
                 self.config["DeviceProperties"]["Add"][property_path] = {"device-id": binascii.unhexlify("ba430000"), "compatible": "pci14e4,43ba"}
-        
+            if self.model in ModelArray.WifiBCM94322:
+                self.enable_kext("IO80211Mojave.kext", self.constants.io80211mojave_version, self.constants.io80211mojave_path)
+                self.get_kext_by_bundle_path("IO80211Mojave.kext/Contents/PlugIns/AirPortBrcm4331.kext")["Enabled"] = True
+
         # CPUFriend
-        pp_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/PlatformPlugin/{self.model}/Info.plist")
+        pp_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/PlatformPlugin/{self.model}/Info.plist")
         if self.model in ModelArray.X86PP:
             Path(self.constants.pp_kext_folder).mkdir()
             Path(self.constants.pp_contents_folder).mkdir()
@@ -142,16 +156,38 @@ class BuildOpenCore:
         if self.model in ModelArray.pciSSDT:
             print("- Adding SSDT-CPBG.aml")
             self.get_item_by_kv(self.config["ACPI"]["Add"], "Path", "SSDT-CPBG.aml")["Enabled"] = True
+            shutil.copy(self.constants.pci_ssdt_path, self.constants.acpi_path)
 
         # USB Map
-        usb_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Maps/Universal/Info.plist")
+        usb_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/AppleUSBMaps/Info.plist")
         if usb_map_path.exists():
             print(f"- Adding USB-Map.kext")
             Path(self.constants.map_kext_folder).mkdir()
             Path(self.constants.map_contents_folder).mkdir()
             shutil.copy(usb_map_path, self.constants.map_contents_folder)
             self.get_kext_by_bundle_path("USB-Map.kext")["Enabled"] = True
-        
+
+        agdp_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/AppleGraphicsDevicePolicy/Info.plist")
+        agpm_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/AppleGraphicsPowerManagement/Info.plist")
+        amc_map_path = Path(self.constants.current_path) / Path(f"payloads/Kexts/Plists/AppleMuxControl/Info.plist")
+
+        if self.model == "MacBookPro9,1":
+            print(f"- Adding Display Map Overrides")
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " agdpmod=vit9696"
+            Path(self.constants.agdp_kext_folder).mkdir()
+            Path(self.constants.agdp_contents_folder).mkdir()
+            Path(self.constants.agpm_kext_folder).mkdir()
+            Path(self.constants.agpm_contents_folder).mkdir()
+            Path(self.constants.amc_kext_folder).mkdir()
+            Path(self.constants.amc_contents_folder).mkdir()
+
+            shutil.copy(agdp_map_path, self.constants.agdp_contents_folder)
+            shutil.copy(agpm_map_path, self.constants.agpm_contents_folder)
+            shutil.copy(amc_map_path, self.constants.amc_contents_folder)
+            self.get_kext_by_bundle_path("AGDP-Override.kext")["Enabled"] = True
+            self.get_kext_by_bundle_path("AGPM-Override.kext")["Enabled"] = True
+            self.get_kext_by_bundle_path("AMC-Override.kext")["Enabled"] = True
+
         # AGPM Patch
         if self.model in ModelArray.DualGPUPatch:
             print("- Adding dual GPU patch")
@@ -161,35 +197,57 @@ class BuildOpenCore:
         if self.model in ModelArray.HiDPIpicker:
             print("- Setting HiDPI picker")
             self.config["NVRAM"]["Add"]["4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14"]["UIScale"] = binascii.unhexlify("02")
-        
+
+
+        def nvidia_patch(self):
+            self.constants.custom_mxm_gpu = True
+            print("- Adding Nvidia Brightness Control patches")
+            if self.model in ["iMac11,1", "iMac11,2", "iMac11,3"]:
+                backlight_path = "PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"
+                self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
+                shutil.copy(self.constants.backlight_path, self.constants.kexts_path)
+                self.get_kext_by_bundle_path("AppleBacklightFixup.kext")["Enabled"] = True
+            elif self.model in ["iMac12,1", "iMac12,2"]:
+                backlight_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
+                self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
+                print("- Disabling unsupported iGPU")
+                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+                shutil.copy(self.constants.backlight_path, self.constants.kexts_path)
+                self.get_kext_by_bundle_path("AppleBacklightFixup.kext")["Enabled"] = True
+            else:
+                print("- Failed to determine model")
+
+        def amd_patch(self):
+            self.constants.custom_mxm_gpu = True
+            print("- Adding AMD DRM patches")
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=80 unfairgva=1"
+            if self.model in ["iMac12,1", "iMac12,2"]:
+                print("- Disabling unsupported iGPU")
+                self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+
+
         # Check GPU Vendor
-        if self.constants.metal_build == True:
+        if self.constants.metal_build is True:
             print("- Adding Metal GPU patches on request")
+            if self.constants.imac_vendor == "AMD":
+                amd_patch(self)
+            elif self.constants.imac_vendor == "Nvidia":
+                nvidia_patch(self)
+            else:
+                print("- Failed to find vendor")
         elif self.constants.custom_model == "None":
             current_gpu: str = subprocess.run("system_profiler SPDisplaysDataType".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.decode()
             self.constants.current_gpuv = [line.strip().split(": ", 1)[1] for line in current_gpu.split("\n") if line.strip().startswith(("Vendor"))][0]
             self.constants.current_gpud = [line.strip().split(": ", 1)[1] for line in current_gpu.split("\n") if line.strip().startswith(("Device ID"))][0]
             print(f"- Detected GPU: {self.constants.current_gpuv} {self.constants.current_gpud}")
             if (self.constants.current_gpuv == "AMD (0x1002)") & (self.constants.current_gpud in ModelArray.AMDMXMGPUs):
-                self.constants.custom_mxm_gpu = True
-                print("- Adding AMD DRM patches")
-                self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=80 unfairgva=1"
-                if self.model in ["iMac12,1", "iMac12,2"]:
-                    print("- Disabling unsupported iGPU")
-                    self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+                amd_patch(self)
             elif (self.constants.current_gpuv == "NVIDIA (0x10de)") & (self.constants.current_gpud in ModelArray.NVIDIAMXMGPUs):
-                self.constants.custom_mxm_gpu = True
-                print("- Adding Brightness Control patches")
-                if self.model in ["iMac11,1", "iMac11,2", "iMac11,3"]:
-                    backlight_path = "PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"
-                    self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
-                    shutil.copy(self.constants.backlight_path, self.constants.kexts_path)
-                    self.get_kext_by_bundle_path("AppleBacklightFixup.kext")["Enabled"] = True
-                elif self.model in ["iMac12,1", "iMac12,2"]:
-                    backlight_path = "PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"
-                    self.config["DeviceProperties"]["Add"][backlight_path] = {"@0,backlight-control": binascii.unhexlify("01000000"), "@0,built-in": binascii.unhexlify("01000000")}
-                    print("- Disabling unsupported iGPU")
-                    self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x2,0x0)"] = {"name": binascii.unhexlify("23646973706C6179"), "IOName": "#display", "class-code": binascii.unhexlify("FFFFFFFF")}
+                nvidia_patch(self)
+        elif self.model in ModelArray.MacPro71:
+            print("- Adding Mac Pro, Xserve DRM patches")
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " shikigva=128 unfairgva=1 -wegtree"
+
 
         # Add OpenCanopy
         print("- Adding OpenCanopy GUI")
@@ -200,7 +258,7 @@ class BuildOpenCore:
         # Add UGA to GOP layer
         if self.model in ModelArray.UGAtoGOP:
             print("- Adding UGA to GOP Patch")
-            self.config["UEFI"]["ProtocolOverrides"]["GopPassThrough"] = True
+            self.config["UEFI"]["Output"]["GopPassThrough"] = True
 
         # ThridPartDrives Check
         if self.model not in ModelArray.NoSATAPatch:
@@ -208,17 +266,36 @@ class BuildOpenCore:
             self.config["Kernel"]["Quirks"]["ThirdPartyDrives"] = True
 
         #DEBUG Settings
-        if self.constants.verbose_debug == True:
+        if self.constants.verbose_debug is True:
             print("- Enabling Verbose boot")
             self.config["Kernel"]["Quirks"]["PanicNoKextDump"] = True
-            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -v"
-        if self.constants.kext_debug == True:
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -v debug=0x100"
+        if self.constants.kext_debug is True:
             print("- Enabling DEBUG Kexts")
             self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " -liludbgall"
             self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " msgbuf=1048576"
-        if self.constants.opencore_debug == True:
+        if self.constants.opencore_debug is True:
             print("- Enabling DEBUG OpenCore")
             self.config["Misc"]["Debug"]["Target"] = 67
+            self.config["Misc"]["Debug"]["DisplayLevel"] = 672151678018
+        if self.constants.showpicker is True:
+            print("- Enabling ShowPicker")
+            self.config["Misc"]["Boot"]["ShowPicker"] = True
+        else:
+            print("- Hiding picker and enabling PollAppleHotKeys")
+            self.config["Misc"]["Boot"]["ShowPicker"] = False
+        if self.constants.vault is True:
+            print("- Setting Vault configuration")
+            self.config["Misc"]["Security"]["Vault"] = "Secure"
+            self.get_tool_by__path("OpenShell.efi")["Enabled"] = False
+        if self.constants.sip_status is False:
+            print("- Disabling SIP")
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["csr-active-config"] = binascii.unhexlify("EF0F0000")
+            self.config["NVRAM"]["Delete"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"] += ["csr-active-config"]
+            self.config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] += " amfi_get_out_of_my_way=1"
+        if self.constants.secure_status is False:
+            print("- Disabling SecureBootModel")
+            self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled"
 
     def set_smbios(self):
         spoofed_model = self.model
@@ -243,9 +320,13 @@ class BuildOpenCore:
             print("- Spoofing to Macmini7,1")
             spoofed_model = "Macmini7,1"
             spoofed_board = "Mac-35C5E08120C7EEAF"
+        elif self.model in ModelArray.iMacPro11:
+            print("- Spoofing to iMacPro1,1")
+            spoofed_model = "iMacPro1,1"
+            spoofed_board = "Mac-7BA5B2D9E42DDD94"
         elif self.model in ModelArray.iMac151:
             # Check for upgraded GPUs on iMacs
-            if self.constants.metal_build == True:
+            if self.constants.metal_build is True:
                 print("- Spoofing to iMacPro1,1")
                 spoofed_model = "iMacPro1,1"
                 spoofed_board = "Mac-7BA5B2D9E42DDD94"
@@ -269,65 +350,75 @@ class BuildOpenCore:
             print("- Spoofing to MacPro7,1")
             spoofed_model = "MacPro7,1"
             spoofed_board = "Mac-27AD2F918AE68F61"
-        self.config["#Revision"]["Spoofed-Model"] = spoofed_model
-        macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {spoofed_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-        macserial_output = macserial_output.stdout.decode().strip().split(" | ")
+        self.spoofed_model = spoofed_model
+        self.spoofed_board = spoofed_board
+        self.config["#Revision"]["Spoofed-Model"] = self.spoofed_model
 
         # Setup menu
-        smbios_mod = True
-        while smbios_mod == True:
-            print("Use original or generate new serials")
-            print("For new users, we recommend use originals(ie. y)")
-            smbios_mod = input("Use original serials?(y, n): ")
+        def minimal_serial_patch(self):
+            self.config["PlatformInfo"]["PlatformNVRAM"]["BID"] = self.spoofed_board
+            self.config["PlatformInfo"]["SMBIOS"]["BoardProduct"] = self.spoofed_board
+            self.config["PlatformInfo"]["UpdateNVRAM"] = True
+        def moderate_serial_patch(self):
+            self.config["PlatformInfo"]["Automatic"] = True
+            self.config["PlatformInfo"]["UpdateDataHub"] = True
+            self.config["PlatformInfo"]["UpdateNVRAM"] = True
+            self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
+            self.config["PlatformInfo"]["Generic"]["SystemProductName"] = self.spoofed_model
+        def adanced_serial_patch(self):
+            macserial_output = subprocess.run([self.constants.macserial_path] + f"-g -m {self.spoofed_model} -n 1".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            macserial_output = macserial_output.stdout.decode().strip().split(" | ")
+            self.config["PlatformInfo"]["Automatic"] = True
+            self.config["PlatformInfo"]["UpdateDataHub"] = True
+            self.config["PlatformInfo"]["UpdateNVRAM"] = True
+            self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
+            self.config["PlatformInfo"]["Generic"]["ROM"] = binascii.unhexlify("0016CB445566")
+            self.config["PlatformInfo"]["Generic"]["SystemProductName"] = self.spoofed_model
+            self.config["PlatformInfo"]["Generic"]["SystemSerialNumber"] = macserial_output[0]
+            self.config["PlatformInfo"]["Generic"]["MLB"] = macserial_output[1]
+            self.config["PlatformInfo"]["Generic"]["SystemUUID"] = str(uuid.uuid4()).upper()
 
-            if smbios_mod in {"y", "Y", "yes", "Yes"}:
-                spoofed_model = self.model
-                self.config["PlatformInfo"]["PlatformNVRAM"]["BID"] = spoofed_board
-                self.config["PlatformInfo"]["SMBIOS"]["BoardProduct"] = spoofed_board
-                self.config["PlatformInfo"]["UpdateNVRAM"] = True
-            elif smbios_mod in {"n", "N", "no", "No"}:
-                self.config["PlatformInfo"]["Automatic"] = True
-                self.config["PlatformInfo"]["UpdateDataHub"] = True
-                self.config["PlatformInfo"]["UpdateNVRAM"] = True
-                self.config["UEFI"]["ProtocolOverrides"]["DataHub"] = True
-                self.config["PlatformInfo"]["Generic"]["SystemProductName"] = spoofed_model
-                self.config["PlatformInfo"]["Generic"]["SystemSerialNumber"] = macserial_output[0]
-                self.config["PlatformInfo"]["Generic"]["MLB"] = macserial_output[1]
-                self.config["PlatformInfo"]["Generic"]["SystemUUID"] = str(uuid.uuid4()).upper()
-            else:
-                smbios_mod = True
+        if self.constants.serial_settings == "Moderate":
+            print("- Using Moderate SMBIOS patching")
+            moderate_serial_patch(self)
+        elif self.constants.serial_settings == "Advanced":
+            print("- Using Advanced SMBIOS patching")
+            adanced_serial_patch(self)
+        else:
+            print("- Using Minimal SMBIOS patching")
+            self.spoofed_model = self.model
+            minimal_serial_patch(self)
 
         # USB Map Patching
-        self.new_map_ls = Path(self.constants.map_contents_folder) / Path(f"Info.plist")
-        self.map_config = plistlib.load(Path(self.new_map_ls).open("rb"))
+        new_map_ls = Path(self.constants.map_contents_folder) / Path("Info.plist")
+        map_config = plistlib.load(Path(new_map_ls).open("rb"))
 
-        self.map_config["IOKitPersonalities_x86_64"][self.model]["model"] = spoofed_model
-        if self.model in ModelArray.EHCI:
-            model_EHCI = f"{self.model}-EHCI"
-            self.map_config["IOKitPersonalities_x86_64"][model_EHCI]["model"] = spoofed_model
-        if self.model in ModelArray.EHC1:
-            model_EHC1 = f"{self.model}-EHC1"
-            self.map_config["IOKitPersonalities_x86_64"][model_EHC1]["model"] = spoofed_model
-        if self.model in ModelArray.EHC2:
-            model_EHC2 = f"{self.model}-EHC2"
-            self.map_config["IOKitPersonalities_x86_64"][model_EHC2]["model"] = spoofed_model
-        if self.model in ModelArray.OHC1:
-            model_OHC1 = f"{self.model}-OHC1"
-            model_OHC2 = f"{self.model}-OHC2"
-            self.map_config["IOKitPersonalities_x86_64"][model_OHC1]["model"] = spoofed_model
-            self.map_config["IOKitPersonalities_x86_64"][model_OHC2]["model"] = spoofed_model
-        if self.model in ModelArray.IHEHC1:
-            model_IHEHC1 = f"{self.model}-InternalHub-EHC1"
-            model_IHEHC1IH = f"{self.model}-InternalHub-EHC1-InternalHub"
-            self.map_config["IOKitPersonalities_x86_64"][model_IHEHC1]["model"] = spoofed_model
-            self.map_config["IOKitPersonalities_x86_64"][model_IHEHC1IH]["model"] = spoofed_model
-        if self.model in ModelArray.IHEHC2:
-            model_IHEHC2 = f"{self.model}-InternalHub-EHC2"
-            self.map_config["IOKitPersonalities_x86_64"][model_IHEHC2]["model"] = spoofed_model
-        if self.model in ModelArray.IH:
-            model_IH = f"{self.model}-InternalHub"
-            self.map_config["IOKitPersonalities_x86_64"][model_IH]["model"] = spoofed_model
-        plistlib.dump(self.map_config, Path(self.new_map_ls).open("wb"), sort_keys=True)
+        for model_controller in ModelArray.ControllerTypes:
+            model_patch = f"{self.model}{model_controller}"
+            try:
+                # Avoid erroring out when specific identity not found
+                map_config["IOKitPersonalities_x86_64"][model_patch]["model"] = self.spoofed_model
+            except KeyError:
+                continue
+
+        plistlib.dump(map_config, Path(new_map_ls).open("wb"), sort_keys=True)
+
+        if self.model == "MacBookPro9,1":
+            new_agdp_ls = Path(self.constants.agdp_contents_folder) / Path("Info.plist")
+            new_agpm_ls = Path(self.constants.agpm_contents_folder) / Path("Info.plist")
+            new_amc_ls = Path(self.constants.amc_contents_folder) / Path("Info.plist")
+
+            agdp_config = plistlib.load(Path(new_agdp_ls).open("rb"))
+            agpm_config = plistlib.load(Path(new_agpm_ls).open("rb"))
+            amc_config = plistlib.load(Path(new_amc_ls).open("rb"))
+
+            agdp_config["IOKitPersonalities"]["AppleGraphicsDevicePolicy"]["ConfigMap"][self.spoofed_board] = agdp_config["IOKitPersonalities"]["AppleGraphicsDevicePolicy"]["ConfigMap"].pop(self.model)
+            agpm_config["IOKitPersonalities"]["AGPM"]["Machines"][self.spoofed_board] = agpm_config["IOKitPersonalities"]["AGPM"]["Machines"].pop(self.model)
+            amc_config["IOKitPersonalities"]["AppleMuxControl"]["ConfigMap"][self.spoofed_board] = amc_config["IOKitPersonalities"]["AppleMuxControl"]["ConfigMap"].pop(self.model)
+
+            plistlib.dump(agdp_config, Path(new_agdp_ls).open("wb"), sort_keys=True)
+            plistlib.dump(agpm_config, Path(new_agpm_ls).open("wb"), sort_keys=True)
+            plistlib.dump(amc_config, Path(new_amc_ls).open("wb"), sort_keys=True)
 
     @staticmethod
     def get_item_by_kv(iterable, key, value):
@@ -345,6 +436,13 @@ class BuildOpenCore:
             raise IndexError
         return kext
 
+    def get_tool_by__path(self, bundle_path):
+        tool = self.get_item_by_kv(self.config["Misc"]["Tools"], "Path", bundle_path)
+        if not tool:
+            print(f"- Could not find Tool {bundle_path}!")
+            raise IndexError
+        return tool
+
     def enable_kext(self, kext_name, kext_version, kext_path, check=False):
         kext = self.get_kext_by_bundle_path(kext_name)
 
@@ -374,15 +472,22 @@ class BuildOpenCore:
 
         Path(self.constants.opencore_zip_copied).unlink()
 
+    def sign_files(self):
+        if self.constants.vault is True:
+            print("- Vaulting EFI")
+            subprocess.run([self.constants.vault_path] + f"{self.constants.oc_folder}/".split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
     def build_opencore(self):
         self.build_efi()
         self.set_smbios()
         self.cleanup()
+        self.sign_files()
         print("")
         print("Your OpenCore EFI has been built at:")
         print(f"    {self.constants.opencore_release_folder}")
         print("")
-        input("Press [Enter] to go back.\n")
+        if self.constants.gui_mode is False:
+            input("Press [Enter] to go back.\n")
 
     def copy_efi(self):
         utilities.cls()
@@ -402,20 +507,28 @@ Please build OpenCore first!"""
         print("\nDisk picker is loading...")
 
         all_disks = {}
-        disks = plistlib.loads(subprocess.run("diskutil list -plist physical".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+        # TODO: AllDisksAndPartitions is not supported in Snow Leopard and older
+        try:
+            # High Sierra and newer
+            disks = plistlib.loads(subprocess.run("diskutil list -plist physical".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+        except ValueError:
+            # Sierra and older
+            disks = plistlib.loads(subprocess.run("diskutil list -plist".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
         for disk in disks["AllDisksAndPartitions"]:
             disk_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-
-            all_disks[disk["DeviceIdentifier"]] = {"identifier": disk_info["DeviceNode"], "name": disk_info["MediaName"], "size": disk_info["Size"], "partitions": {}}
-
-            for partition in disk["Partitions"]:
-                partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {partition['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
-                all_disks[disk["DeviceIdentifier"]]["partitions"][partition["DeviceIdentifier"]] = {
-                    "fs": partition_info.get("FilesystemType", partition_info["Content"]),
-                    "type": partition_info["Content"],
-                    "name": partition_info.get("VolumeName", ""),
-                    "size": partition_info["Size"],
-                }
+            try:
+                all_disks[disk["DeviceIdentifier"]] = {"identifier": disk_info["DeviceNode"], "name": disk_info["MediaName"], "size": disk_info["TotalSize"], "partitions": {}}
+                for partition in disk["Partitions"]:
+                    partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {partition['DeviceIdentifier']}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+                    all_disks[disk["DeviceIdentifier"]]["partitions"][partition["DeviceIdentifier"]] = {
+                        "fs": partition_info.get("FilesystemType", partition_info["Content"]),
+                        "type": partition_info["Content"],
+                        "name": partition_info.get("VolumeName", ""),
+                        "size": partition_info["TotalSize"],
+                    }
+            except KeyError:
+                # Avoid crashing with CDs installed
+                continue
         # TODO: Advanced mode
         menu = utilities.TUIMenu(
             ["Select Disk"],
@@ -425,7 +538,7 @@ Please build OpenCore first!"""
             loop=True,
         )
         for disk in all_disks:
-            if not any(all_disks[disk]["partitions"][partition]["fs"] == "msdos" for partition in all_disks[disk]["partitions"]):
+            if not any(all_disks[disk]["partitions"][partition]["fs"] in ("msdos", "EFI") for partition in all_disks[disk]["partitions"]):
                 continue
             menu.add_menu_option(f"{disk}: {all_disks[disk]['name']} ({human_fmt(all_disks[disk]['size'])})", key=disk[4:])
 
@@ -445,7 +558,7 @@ Please build OpenCore first!"""
             in_between=["Missing partitions? Ensure they are formatted as an EFI or FAT32.", "", "* denotes likely candidate."],
         )
         for partition in selected_disk["partitions"]:
-            if selected_disk["partitions"][partition]["fs"] != "msdos":
+            if selected_disk["partitions"][partition]["fs"] not in ("msdos", "EFI"):
                 continue
             text = f"{partition}: {selected_disk['partitions'][partition]['name']} ({human_fmt(selected_disk['partitions'][partition]['size'])})"
             if selected_disk["partitions"][partition]["type"] == "EFI" or (
@@ -459,6 +572,7 @@ Please build OpenCore first!"""
         if response == -1:
             return
 
+        # TODO: Apple Script fails in Yosemite(?) and older
         args = [
             "osascript",
             "-e",
@@ -468,10 +582,13 @@ Please build OpenCore first!"""
             " without altering line endings",
         ]
 
-        result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        if self.constants.detected_os > self.constants.yosemite:
+            result = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        else:
+            result = subprocess.run(f"diskutil mount {disk_identifier}s{response}".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
         if result.returncode != 0:
-            if "execution error" in result.stderr.decode() and result.stderr.decode()[-5:-1] == "-128":
+            if "execution error" in result.stderr.decode() and result.stderr.decode().strip()[-5:-1] == "-128":
                 # cancelled prompt
                 return
             else:
@@ -481,21 +598,45 @@ Please build OpenCore first!"""
                 return
 
         # TODO: Remount if readonly
+        drive_host_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk_identifier}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
         partition_info = plistlib.loads(subprocess.run(f"diskutil info -plist {disk_identifier}s{response}".split(), stdout=subprocess.PIPE).stdout.decode().strip().encode())
+        sd_type = drive_host_info["MediaName"]
+        try:
+            ssd_type = drive_host_info["SolidState"]
+        except KeyError:
+            ssd_type = False
         mount_path = Path(partition_info["MountPoint"])
-
+        disk_type = partition_info["BusProtocol"]
         utilities.cls()
         utilities.header(["Copying OpenCore"])
 
         if mount_path.exists():
+            if (mount_path / Path("EFI/OC")).exists():
+                print("- Removing preexisting EFI/OC folder")
+                shutil.rmtree(mount_path / Path("EFI/OC"), onerror=rmtree_handler)
+            if (mount_path / Path("System")).exists():
+                print("- Removing preexisting System folder")
+                shutil.rmtree(mount_path / Path("System"), onerror=rmtree_handler)
             print("- Coping OpenCore onto EFI partition")
-            if (mount_path / Path("EFI")).exists():
-                print("Removing preexisting EFI folder")
-                shutil.rmtree(mount_path / Path("EFI"), onerror=rmtree_handler)
-
-            shutil.copytree(self.constants.opencore_release_folder / Path("EFI"), mount_path / Path("EFI"))
-            shutil.copy(self.constants.icon_path, mount_path)
-            print("OpenCore transfer complete")
+            shutil.copytree(self.constants.opencore_release_folder / Path("EFI/OC"), mount_path / Path("EFI/OC"))
+            shutil.copytree(self.constants.opencore_release_folder / Path("System"), mount_path / Path("System"))
+            # Array filled with common SD Card names
+            # Note most USB-based SD Card readers generally report as "Storage Device", and no reliable way to detect further
+            if sd_type in ["SD Card Reader", "SD/MMC"]:
+                print("- Adding SD Card icon")
+                shutil.copy(self.constants.icon_path_sd, mount_path)
+            elif ssd_type is True:
+                print("- Adding SSD icon")
+                shutil.copy(self.constants.icon_path_ssd, mount_path)
+            elif disk_type == "USB":
+                print("- Adding External USB Drive icon")
+                shutil.copy(self.constants.icon_path_external, mount_path)
+            else:
+                print("- Adding Internal Drive icon")
+                shutil.copy(self.constants.icon_path_internal, mount_path)
+            print("- Cleaning install location")
+            subprocess.run(f"dot_clean '{mount_path}'".split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            print("- OpenCore transfer complete")
             print("\nPress [Enter] to continue.\n")
             input()
         else:

Resources/utilities.py

@@ -1,3 +1,4 @@
+# Copyright (C) 2020-2021, Dhinak G
 from __future__ import print_function
 
 import os

docs/.markdownlint.json

@@ -0,0 +1,14 @@
+{
+	"default": true,
+	"line_length": false,
+	"no-alt-text": false,
+	"no-inline-html": false,
+	"header-increment": false,
+	"no-duplicate-header": false,
+	"fenced-code-language": false,
+	"no-emphasis-as-heading": false,
+	"single-title": false,
+	"ul-style": {
+		"style": "asterisk"
+	}
+}

docs/.markdownlintignore

@@ -0,0 +1,10 @@
+/node_modules/
+/_book/
+*.json
+/extra-files/
+/.git/
+/icons/
+/images/
+/styles/
+/.github/
+/.vuepress/

docs/.vuepress/config.js

@@ -0,0 +1,141 @@
+const {
+    description
+} = require('../package')
+
+module.exports = {
+    title: 'OpenCore Legacy Patcher',
+    head: [
+        ['meta', {
+            name: 'theme-color',
+            content: '#3eaf7c'
+        }],
+        ['meta', {
+            name: 'apple-mobile-web-app-capable',
+            content: 'yes'
+        }],
+        ['meta', {
+            name: 'apple-mobile-web-app-status-bar-style',
+            content: 'black'
+        }],
+        ["link", {
+            rel: "'stylesheet",
+            href: "/styles/website.css"
+        },]
+    ],
+    base: '/OpenCore-Legacy-Patcher/',
+
+	watch: {
+	    $page(newPage, oldPage) {
+	      if (newPage.key !== oldPage.key) {
+	        requestAnimationFrame(() => {
+	          if (this.$route.hash) {
+	            const element = document.getElementById(this.$route.hash.slice(1));
+
+	            if (element && element.scrollIntoView) {
+	              element.scrollIntoView();
+	            }
+	          }
+	        });
+	      }
+	    }
+	  },
+
+	markdown: {
+		extendMarkdown: md => {
+			md.use(require('markdown-it-multimd-table'), {
+				rowspan: true,
+			});
+		}
+	},
+
+    theme: 'vuepress-theme-succinct',
+    globalUIComponents: [
+        'ThemeManager'
+    ],
+
+    themeConfig: {
+        lastUpdated: true,
+        repo: 'https://github.com/dortania/OpenCore-Legacy-Patcher/',
+		docsDir: 'docs',
+		docsBranch: 'main',
+		editLinks: true,
+		editLinkText: 'Help us improve this page!',
+        logo: 'homepage.png',
+
+        sidebar: [{
+            title: 'Introduction',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'START',
+				'MODELS',
+				['BENIFITS', 'Benefits and drawbacks'],
+            ]
+
+        },
+        {
+            title: 'Setting up',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+                'INSTALLER',
+				'BUILD',
+            ]
+
+        },
+        {
+            title: 'Installation',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'BOOT',
+				'POST-INSTALL',
+            ]
+
+        },
+        {
+            title: 'Misc',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'TROUBLESHOOTING',
+				'DEBUG',
+				'UNINSTALL',
+				'ICNS',
+            ]
+        },
+        {
+            title: 'Credit',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'DONATE',
+				'LICENSE',
+            ]
+
+        },
+        {
+            title: 'Documentation',
+            collapsable: false,
+            sidebarDepth: 1,
+            children: [
+				'TERMS',
+				'HOW',
+				'PATCHEXPLAIN',
+            ]
+
+        },
+        ],
+    },
+    plugins: [
+        '@vuepress/plugin-back-to-top',
+        'vuepress-plugin-smooth-scroll',
+        ['vuepress-plugin-medium-zoom',
+            {
+                selector: "img",
+                options: {
+                    background: 'var(--bodyBgColor)'
+                }
+            }],
+    ]
+}

docs/.vuepress/styles/index.styl

@@ -0,0 +1,49 @@
+/**
+ * Custom Styles here.
+ *
+ * ref：https://v1.vuepress.vuejs.org/config/#index-styl
+ */
+
+[data-theme='light']
+ --sideBgColor $sideBgColor
+
+[data-theme='dark']
+ --sideBgColor $sideBgColorDark
+ --dropShadowColor $dropShadowColor
+
+.home .hero img
+  max-width 450px!important
+  
+.navbar
+  filter drop-shadow(0px 1px 1px var(--dropShadowColor))
+
+.sidebar
+  background-color var(--sideBgColor)
+
+div[class*="language-"]
+  pre, pre[class*="language-"]
+    margin-top 0
+
+html {
+  overflow-y: scroll;
+  overflow-x: hidden;
+  background-color: unset;
+}
+::-webkit-scrollbar {
+    width 0px
+    background transparent /* make scrollbar transparent */
+}
+
+tr
+   &:nth-child(1n)
+     background-color var(--bodyBgColor)
+   &:nth-child(2n)
+     background-color var(--sideBgColor)
+
+	 
+
+.dropdown-wrapper .nav-dropdown
+  border 1px solid var(--sideBgColor)!important
+  background-color var(--sideBgColor)!important
+  box-shadow 0px 0px 2px var(--bodyBgColor)
+  right -12%!important

docs/.vuepress/styles/palette.styl

@@ -0,0 +1,23 @@
+/**
+ * Custom palette here.
+ *
+ * ref：https://v1.vuepress.vuejs.org/zh/config/#palette-styl
+ */
+
+$bodyFontSize = 16px
+$fallbackTheme = 'dark'
+$dropShadowColor = #111112
+
+// Light Theme
+$accentColor = #19b3e7
+$textColor = #2c3e50
+$bodyBgColor = #fff
+$sideBgColor = #fff
+$badgeTipColor = #caf2ff
+
+// Dark Theme
+$accentColorDark = #30BCD5
+$textColorDark = #ccc
+$bodyBgColorDark = #2d3033
+$sideBgColorDark = #363b40
+$badgeTipColorDark = #023e52

docs/BENIFITS.md

@@ -0,0 +1,21 @@
+# Benefits and Drawbacks between OpenCore Legacy Patcher and other patchers
+
+With OpenCore Legacy Patcher we recommend users go through the below table to understand what the benefits and drawbacks are compared to other patchers. There are positive and negatives to each and we feel transparency is most important when patching another users machine. There should be no grey areas where users may be mislead.
+
+| Features | [OpenCore Legacy Patcher](https://github.com/dortania/OpenCore-Legacy-Patcher/) | [Patched Sur](https://github.com/BenSova/Patched-Sur) |
+| :--- | :--- | :--- |
+| Over The Air Updates | <span style="color:#30BCD5">Native System Preferences, additionally supports Deltas (~2GB) for Metal GPUs</span> | <span style="color:red">Inside Patcher Sur app (~12GB), only available when InstallAssistants release</span> |
+| FileVault | <span style="color:#30BCD5">Supported on Metal GPUs</span> | <span style="color:red">Not supported</span> | 
+| System Integrity Protection | <span style="color:#30BCD5">Fully enabled on Metal GPUs</span> | <span style="color:red">Disabled for early 2013 and older</span> |
+| APFS Snapshots | <span style="color:#30BCD5">Fully enabled</span> | <span style="color:red">Disabled</span> |
+| User facing | <span style="color:red">TUI interface</span> | <span style="color:#30BCD5">SwiftUI interface, more user friendly</span> | 
+| Supported OSes | <span style="color:#30BCD5">10.7-11</span> | <span style="color:red">10.15-11</span> |
+| Firmware Patching | <span style="color:#30BCD5">None required</span> | <span style="color:red">Required for models without native APFS support</span> |
+| BootCamp Switching | <span style="color:red">Requires EFI Conversion for Start Disk support, otherwise still supported</span> | <span style="color:#30BCD5">Native</span> |
+| Brightness Control on Legacy GPUs | <span style="color:red">Not supported</span> | <span style="color:#30BCD5">Supported</span> |
+| WPA Wifi Support | <span style="color:#30BCD5">Native, stable</span> | <span style="color:red">Unstable</span> |
+| Legacy GPU Acceleration | <span style="color:red">Coming soon</span> | <span style="color:red">Coming soon</span> |
+| Brightness Control on Legacy GPUs | <span style="color:red">Coming soon</span> | <span style="color:#30BCD5">Supported</span> |
+| HEVC/H.265 Support for Mac Pros and iMacs with Polaris+ GPUs | <span style="color:#30BCD5">Supported</span> | <span style="color:red">Not supported</span> |
+| Big Sur-styled Boot Picker |  <span style="color:#30BCD5">Available</span> | <span style="color:red">Not available</span> |
+| Hibernation Support | <span style="color:red">Not available</span> (Partially broken for some) | <span style="color:#30BCD5">Supported</span> |

docs/BOOT.md

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

docs/BUILD.md

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

docs/DEBUG.md

@@ -0,0 +1,49 @@
+# How to debug with OpenCore
+
+For those who've hit an odd bug and unsure if it's user error or patcher, the below will tell you how to get more verbose debug information as well as logs to help [file issues with us](https://github.com/dortania/OpenCore-Legacy-Patcher/issues)
+
+* For users who are less experienced, we recommend asking on the [Unsupported Mac Discord Server](https://discord.gg/XbbWAsE) for help.
+
+## Debugging yourself
+
+The easiest way to debug yourself is via Patcher Settings. Here there are many different settings however the 3 main options that will help are:
+
+* "Enable Verbose Mode"
+* "Enable OpenCore DEBUG"
+* "Enable Kext DEBUG"
+
+
+When you've enabled these 3 options, rebuild OpenCore and install to your drive. This will provide much greater debug information as well as write logs to the EFI Partition.
+
+## Obtaining OpenCore logs from disk
+
+With "Enable OpenCore DEBUG" set, every boot there will be a .txt file generated in your disk. To grab these logs, [download and run MountEFI](https://github.com/corpnewt/MountEFI):
+
+![](../images/mountefi.png)
+
+Once you've mounted the EFI Partition of the drive you have macOS on, you should see some nice logs:
+
+![](../images/logs-efi.png)
+
+## Obtaining Kernel logs from macOS
+
+With "Enable Kext DEBUG" set, every boot will now have much more detailed logs stored in the OS. To get these logs, simply run the below command:
+
+```sh
+sudo dmesg > ~/Desktop/DMESG.txt
+```
+
+From there, you'll have a log on your desktop.
+
+## Filing an issue with us
+
+Now that you have proper logs, you can now [file issues with us](https://github.com/dortania/OpenCore-Legacy-Patcher/issues). Reminder we want the following info:
+
+* Model patching for (ie. MacBookPro10,1)
+* Target OS (ie. macOS 11.2.3)
+* Host OS (ie. macOS 10.15.7)
+* Upload of your OpenCore Build Folder
+* Upload of your OpenCore log (if applicable)
+* Upload of your Kernel log (if applicable)
+
+Additionally, please search whether the issue has been reported before. This avoids having duplicate issues.

docs/DONATE.md

@@ -0,0 +1,30 @@
+# Supporting the patcher
+
+OpenCore Legacy Patcher is a hobby project for us developers, and while we love helping out the community it's very difficult for us to troubleshoot issues remotely. The best way for us to get to work on the patcher, fix issues and add enhancements is having the hardware in-hand. As a hobby project, neither of the main developers can afford to buy every legacy Mac to test on.
+
+The best way to support us in all honesty is to donate any old hardware you no longer need, as this allows us to have machines to test locally and push fixes much faster. While we appreciate cash donations, this makes it much more difficult for us to handle as an organization.
+
+Main hardware we'd appreciate:
+
+* Any Mac you own
+  * Does require SSE4,1 CPU to test on Sierra and newer however
+* Any legacy GPU supporting macOS
+  * Does not require to be Mac flashed
+  * Following generations would would be beneficial:
+    * Nvidia 8000 series through 500
+	* AMD/ATI 2000 series through 6000
+
+If you have any legacy hardware you're willing to donate, please contact us at the following email:
+
+* khronokernel@icloud.com
+
+Current hardware we own:
+
+| Model | CPU | GPU | Owner | Notes |
+| :--- | :--- | :--- | :--- | :--- |
+| MacBook7,1 | Penryn | GT320M | Mykola | N/A |
+| iMac11,2 | Clarksdale | HD4670 | Mykola | N/A |
+
+
+<!-- | MacBookPro5,3 | Penryn | 9400M + 9600M | Dhinak | Display's partially broken | -->
+<!-- | Macmini4,1 | Penryn | GT320M | Dhinak | N/A | -->

docs/HOW.md

@@ -0,0 +1,9 @@
+# Boot Process with OpenCore Legacy Patcher
+
+OpenCore Legacy Patcher itself is actually quite a "dumb" program, and essentially edits a config.plist file and moves files around, it actually has little logic regarding the boot process.  The real magic of OCLP is [OpenCorePkg](https://github.com/acidanthera/OpenCorePkg), our back-end and what makes this patcher so powerful.
+
+## Boot Process with OpenCore
+
+To understand a bit more of how OpenCore is able revive older Macs in such a native-like way, we need to go over *how* OpenCore works with your Mac:
+
+![](../images/oc-explained.png)

docs/ICNS.md

@@ -0,0 +1,105 @@
+# Creating custom icons for OpenCore and Mac Boot Picker
+
+For users who want to customize your setup to be more personal, OpenCore does allow for custom icons and images in the boot picker.
+
+
+* [Custom OpenCore icons](#custom-opencore-icons)
+* [Custom Mac Boot Picker icons](#custom-mac-boot-picker-icons)
+* [Installing updated icons](#installing-updated-icons)
+
+
+# Custom OpenCore icons
+
+To generate custom OpenCore icons, you'll need the following:
+
+* Images in PNG format
+* Each image, with the following res:
+  * Cursor — Mouse cursor (mandatory, up to 144x144).
+  * Selected — Selected item (mandatory, 144x144).
+  * Selector — Selecting item (mandatory, up to 144x40).
+  * Left — Scrolling left (mandatory, 40x40).
+  * Right — Scrolling right (mandatory, 40x40).
+  * HardDrive — Generic OS (mandatory, 128x128).
+  * Background — Centred background image. (Recommended max size 1920x1080)
+  * Apple — Apple OS (128x128).
+  * AppleRecv — Apple Recovery OS (128x128).
+  * AppleTM — Apple Time Machine (128x128).
+  * Windows — Windows (128x128).
+  * Other — Custom entry (see [Entries](https://dortania.github.io/docs/latest/Configuration.html), 128x128).
+  * ResetNVRAM — Reset NVRAM system action or tool (128x128).
+  * Shell — Entry with UEFI Shell name for e.g. OpenShell (128x128).
+  * Tool — Any other tool (128x128).
+  
+Note, for each image we recommend having one of double the size. This ensures that icons are scaled correctly since .icns support dedicated images depending on HiDPI or not.
+
+
+Once you have a custom image you want to use(for example, as a background), download the [latest release of OpenCorePkg](https://github.com/acidanthera/OpenCorePkg/releases) and enter the `Utilities/icnspack/` folder:
+
+![](../images/icnspack-folder.png)
+
+Now `cd` this folder in terminal and run the following:
+
+```sh
+./icnspack Background.icns <insert_x1_image> <insert_x2_image>
+```
+Once done, you'll see your custom icon generated in `icnspack`'s folder:
+
+![](../images/icnspack-done.png)
+
+# Custom Mac Boot Picker icons
+
+Custom boot picker icons is much more complicated on Legacy Macs, on late 2013+ Macs the [Custom OpenCore icons](#custom-opencore-icons) method will work just fine. However on many 2012 and older Macs, the icons generated will be incompatible with the firmware.
+
+To generate legacy icons, you'll need the following:
+
+* A machine running macOS 10.4 through 10.11
+* Icon Composer.app (Requires Apple Developer Account for official download)
+  * Users without the developer account can find a mirrors here: 
+    * [Icon Composer 10.6](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/main/docs/Icon-Composer-10.6.zip)
+    * [Icon Composer 10.11](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/main/docs/Icon-Composer-10.11.zip)
+* PNG Image you wish to convert
+
+Head to [developer.apple's More Downloads page](https://developer.apple.com/download/more/) and search for `Graphics Tools` that is supported by your OS(note for 10.6 and older, the app is hidden inside `Developer Tools`):
+
+![](../images/graphics-download.png)
+
+Once downloaded, open the disk image and you'll find Icon Composer.app:
+
+![Graphics Open](../images/graphics-open.png)
+
+Now run the app and simply drag the images to each section as so:
+
+![](../images/icon-SL.png)
+
+Now save and export the new icns
+
+# Installing updated icons
+
+To install, please ensure that Vault is disabled when you built OpenCore. If you're unsure, simply rebuild OpenCore with the Patcher setting "Vault" set to false.
+
+* <span style="color:red"> Warning</span>: Editing your OpenCore EFI incorrectly can result in a bricked install. Please ensure you have a natively supported version of macOS installed to boot into in case of issues.
+
+Now that you've verified you can edit OpenCore safely, you'll need to mount the drive that OpenCore is stored on. To do this, download [MountEFI](https://github.com/corpnewt/MountEFI) and run it:
+
+![](../images/mountefi.png)
+
+Select the drive you installed OpenCore to and mount it.
+
+* [Updating OpenCore icons](#updating-opencore-icons)
+* [Updating Mac Boot Picker icons](#updating-mac-boot-picker-icons)
+
+### Updating OpenCore icons
+
+Head to `EFI/OC/Resources/Image/` on your drive and you'll see all the custom icons. For Background.icns, we need to ensure the file matches the theme OpenCore has set so we add the prefix `Modern` to it:
+
+![](../images/background-moved.png)
+
+Now reboot and you should see your updated icon(s)!
+
+### Updating Mac Boot Picker icons
+
+To update the Mac Boot Picker icons is actually quite simple, on the root of your drive simply drop the icon onto the root of the drive with the name `.VolumeIcon.icns`
+
+![](../images/mac-icns-drive.png)
+
+Now reboot and you'll see the new icon!

docs/INSTALLER.md

@@ -0,0 +1,53 @@
+# Download and build macOS Installers
+
+* [Downloading](#downloading)
+* [Building](#building)
+
+This doc is centered around downloading and writing the macOS installer to a USB. If you're already familiar with how to do this, you can skip.
+
+* Note: 16GB+ USB will be required for the installer
+
+## Downloading
+
+The simplest way to download macOS installs would be to use installinstallmacos:
+
+```sh
+mkdir ~/macOS-installer && cd ~/macOS-installer && curl -O https://raw.githubusercontent.com/munki/macadmin-scripts/main/installinstallmacos.py && sudo python installinstallmacos.py
+```
+
+![](../images/munki.png)
+
+As you can see, we get a nice list of macOS installers. If you need a particular versions of macOS, you can select it by typing the number next to it. For this example we'll choose 10:
+
+![](../images/munki-process.png)
+
+This is going to take a while as we're downloading the entire 12GB+ macOS installer.
+
+Once finished, you'll find in your `~/macOS-Installer/` folder a DMG containing the macOS Installer, called `Install_macOS_11.1-20C69.dmg` for example. Mount it and you'll find the installer application.
+
+* Note: We recommend to move the Install macOS.app into the `/Applications` folder, as we'll be executing commands from there.
+* Note 2: Running Cmd+Shift+G in Finder will allow you to easily jump to `~/macOS-installer`
+
+![](../images/munki-done-2.png)
+
+![](../images/munki-dmg.png)
+
+## Building
+
+Now we'll be formatting the USB to prep for both the macOS installer and OpenCore. We'll want to use macOS Extended (HFS+) with a GUID partition map(Using GUID is important for the patcher). This will create two partitions: the main `MyVolume` and a second called `EFI` which is used as a boot partition where your Mac's firmware will check for boot files. `EFI` partitions will be hidden by default, so don't worry if you don't immediately see them.
+
+* Note: By default, Disk Utility only shows partitions – press Cmd/Win+2 to show all devices (alternatively you can press the View button)
+
+![Formatting the USB](../images/format-usb.png)
+
+Next run the `createinstallmedia` command provided by [Apple](https://support.apple.com/en-us/HT201372). Note that the command is made for USB's formatted with the name `MyVolume`:
+
+```sh
+sudo /Applications/Install\ macOS\ Big\ Sur.app/Contents/Resources/createinstallmedia --volume /Volumes/MyVolume
+```
+
+* Note: You can also replace the `createinstallmedia` path with that of where your installer's located (same idea with the drive name).
+
+![](../images/createinstallmedia.png)
+
+# Once finished, head to [Building and installing OpenCore](./BUILD.md)

docs/LICENSE.md

@@ -0,0 +1,18 @@
+# OpenCore Legacy Patcher Licence
+
+This patcher is made of multiple external applications from different people and organizations. See each program for their licensing:
+
+* BSD 3-Clause "New" or "Revised" License
+  * [OpenCorePkg](https://github.com/acidanthera/OpenCorePkg/blob/master/LICENSE.txt)
+  * [Lilu](https://github.com/acidanthera/Lilu/blob/master/LICENSE.txt)
+  * [WhateverGreen](https://github.com/acidanthera/WhateverGreen/blob/master/LICENSE.txt)
+  * [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)
+* All rights reserved to respective authors
+  * [AAAMouSSE](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/) - Syncretic
+  * [telemetrap](https://forums.macrumors.com/threads/mp3-1-others-sse-4-2-emulation-to-enable-amd-metal-driver.2206682/post-28447707) - Syncretic
+  * Apple Binaries - Apple Inc.
+
+Remaining files within OpenCore Legacy Patcher are copyrighted to their respective author.

docs/MODELS.md

@@ -16,6 +16,17 @@ The below table will list all supported and unsupported functions of the patcher
 * [Mac Pro](#mac-pro)
 * [Xserve](#xserve)
 
+Note: In this patcher, Brightness Control is tied to GPU acceleration
+
+Note 2: For setups that require AppleHDA patching, we highly advise users instead opt of a USB Audio adapter to avoid root patching. This ensures that [DELTA](./TERMS.md) updates, FileVault, SIP and other security features can stay in-tact.
+
+Regarding OS support, see below:
+
+| Support Entry | Supported OSes | Description | Comment |
+| :--- | :--- | :--- | :--- |
+| HostOS | macOS 10.7-11 | Refers to OSes where running OpenCore-Patcher.app are supported | Supports 10.7+ if [python 3.6 or higher](https://www.python.org/downloads/) is manually installed, simply run the `OpenCore-Patcher.command` located in the repo |
+| TargetOS | macOS 11 | Refers to OSes that can be patched to run with OpenCore | Unofficially supports 10.4 and newer, no support provided via this patcher |
+
 ### MacBook
 
 | SMBIOS | Year | Supported | Comment |
@@ -23,10 +34,10 @@ The below table will list all supported and unsupported functions of the patcher
 | MacBook1,1 | Mid-2006 | <span style="color:red"> NO </span>  | 32-Bit CPU limitation |
 | MacBook2,1 | Late 2006 | ^^ | 32-Bit Firmware limitation |
 | MacBook3,1 | Late 2007 | ^^ | ^^ |
-| MacBook4,1 | Early 2008 | ^^ | ^^ |
-| MacBook5,1 | Late 2008 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet) |
+| MacBook4,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Mavericks and newer<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- No Keyboard and Trackpad<br/>- No USB<br/>- No Ethernet<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
+| MacBook5,1 | Late 2008 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- Trackpad Issues |
 | MacBook5,2 | Early 2009 | ^^ | ^^ |
-| MacBook6,1 | Late 2009 | ^^ | ^^ |
+| MacBook6,1 | Late 2009 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/> |
 | MacBook7,1 | Mid-2010 | ^^ | ^^ |
 
 ### MacBook Air
@@ -34,8 +45,8 @@ The below table will list all supported and unsupported functions of the patcher
 | SMBIOS | Year | Supported | Comment |
 | :--- | :--- | :--- | :--- |
 | MacBookAir1,1 | Early 2008 | <span style="color:red"> NO </span> | Requires SSE4.1 CPU |
-| MacBookAir2,1 | Late 2008 |<span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet)<br/>- No Wifi Patches implemented(yet) |
-| MacBookAir3,1 | Late 2010 | ^^ | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet) |
+| MacBookAir2,1 | Late 2008 |<span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
+| MacBookAir3,1 | Late 2010 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76)) |
 | MacBookAir3,2 | ^^ | ^^ | ^^ |
 | MacBookAir4,1 | Mid-2011 | ^^ | ^^ |
 | MacBookAir4,2 | ^^ | ^^ | ^^ |
@@ -51,8 +62,8 @@ The below table will list all supported and unsupported functions of the patcher
 | MacBookPro2,1 | Late 2006 | ^^ | 32-Bit Firmware limitation |
 | MacBookPro2,2 | Late 2006 | ^^ | ^^ |
 | MacBookPro3,1 | Mid-2007 | ^^ | - Requires SSE4.1 CPU |
-| MacBookPro4,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet)<br/>- No Wifi Patches implemented(yet) |
-| MacBookPro5,1 | Late 2008 | ^^ | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet) |
+| MacBookPro4,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
+| MacBookPro5,1 | Late 2008 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76)) |
 | MacBookPro5,2 | Early 2009 | ^^ | ^^ |
 | MacBookPro5,3 | Mid-2009 | ^^ | ^^ |
 | MacBookPro5,4 | ^^ | ^^ | ^^ |
@@ -60,13 +71,13 @@ The below table will list all supported and unsupported functions of the patcher
 | MacBookPro6,1 | Mid-2010 | ^^ | ^^ |
 | MacBookPro6,2 | ^^ | ^^ | ^^ |
 | MacBookPro7,1 | ^^ | ^^ | ^^ |
-| MacBookPro8,1 | Early 2011 | ^^ | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet)<br/>- Ethernet Connection Issues |
+| MacBookPro8,1 | Early 2011 | ^^ | ^^ |
 | MacBookPro8,2 | ^^ | ^^ | ^^ |
 | MacBookPro8,3 | ^^ | ^^ | ^^ |
 | MacBookPro9,1 | Mid-2012 | ^^ | <span style="color:green"> Everything is supported</span> |
-| MacBookPro9,2 | ^^ | ^^ | ^^ |  
-| MacBookPro10,1 | ^^ | ^^ | ^^ |
-| MacBookPro10,2 | Late 2012 | ^^ | ^^ |
+| MacBookPro9,2 | ^^ | ^^ | ^^ |
+| MacBookPro10,1 | Mid-2012, Early 2013 | ^^ | ^^ |
+| MacBookPro10,2 | Late 2012, Early 2013 | ^^ | ^^ |
 
 ### Mac mini
 
@@ -74,9 +85,9 @@ The below table will list all supported and unsupported functions of the patcher
 | :--- | :--- | :--- | :--- |
 | Macmini1,1 | Early 2006 | <span style="color:red"> NO </span> | 32-Bit CPU limitation |
 | Macmini2,1 | Mid-2007 | ^^ | 32-Bit Firmware limitation |
-| Macmini3,1 | Early 2009 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet) |
+| Macmini3,1 | Early 2009 | <span style="color:#30BCD5"> YES </span> | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76)) |
 | Macmini4,1 | Mid-2010 | ^^ | ^^ |
-| Macmini5,1 | Mid-2011 | ^^ | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet)<br/>- Ethernet Connection Issues |
+| Macmini5,1 | Mid-2011 | ^^ | ^^ |
 | Macmini5,2 | ^^ | ^^ | ^^ |
 | Macmini5,3 | ^^ | ^^ | ^^ |
 | Macmini6,1 | Late 2012 | ^^ | <span style="color:green"> Everything is supported</span> |
@@ -91,30 +102,36 @@ The below table will list all supported and unsupported functions of the patcher
 | iMac5,1 | Late 2006 | ^^ | 32-Bit Firmware limitation |
 | iMac5,2 | ^^ | ^^ | ^^ |
 | iMac6,1 | ^^ | ^^ | ^^ |
-| iMac7,1 | Mid-2007 | <span style="color:#30BCD5"> YES </span> | - Requires an SSE4.1 CPU Upgrade<br/>- No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet)<br/>- No Wifi Patches implemented (yet) |
-| iMac8,1 | Early 2008 | ^^ | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet)<br/>- No Wifi Patches implemented (yet) |
-| iMac9,1 | Early 2009 | ^^ | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet) |
+| iMac7,1 | Mid-2007 | <span style="color:#30BCD5"> YES </span> | - Requires an SSE4.1 CPU Upgrade<br/>- No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>  |
+| iMac8,1 | Early 2008 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/>- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) |
+| iMac9,1 | Early 2009 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))<br/> |
 | iMac10,1 | Late 2009 | ^^ | ^^ |
-| iMac11,1 | ^^ | ^^ | - No GPU Acceleration in Big Sur<br/>- No AppleHDA(Audio) Patching implemented(yet)<br/>- Ethernet Connection Issues |
+| iMac11,1 | ^^ | ^^ | ^^ |
 | iMac11,2 | Mid-2010 | ^^ | ^^ |
 | iMac11,3 | ^^ | ^^ | ^^ |
 | iMac12,1 | Mid-2011 | ^^ | ^^ |
 | iMac12,2 | ^^ | ^^ | ^^ |
 | iMac13,1 | Late 2012 | ^^ | <span style="color:green"> Everything is supported</span> |
 | iMac13,2 | ^^ | ^^ | ^^ |
+| iMac13,2 | ^^ | ^^ | ^^ |
 | iMac14,1 | Late 2013 | ^^ | ^^ |
 | iMac14,2 | ^^ | ^^ | ^^ |
 | iMac14,3 | ^^ | ^^ | ^^ |
 
+* For iMac10,1 through iMac12,x, we highly recommend users upgrade the GPU to a Metal supported model. See here for more information: [iMac late 2009 to mid-2012 Graphics Card Upgrade Guide](https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/?post=17425857#post-17425857)
+
 ### Mac Pro
 
 | SMBIOS | Year | Supported | Comment |
 | :--- | :--- | :--- | :--- |
 | MacPro1,1 | Mid-2006 | <span style="color:red"> NO </span> | 32-Bit Firmware limitation |
 | MacPro2,1 | Mid-2007 | ^^ | ^^ |
-| MacPro3,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - Requires an SSE4.1 CPU Upgrade<br/>- No AppleHDA(Audio) Patching implemented(yet) |
+| MacPro3,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - Pottential instability with built-in USB 1.1 ports (recommend using a USB 2.0 hub)<br/>- No [DELTA](./TERMS.md) updates or FileVault when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76)) |
 | MacPro4,1 | Early 2009 | ^^ | <span style="color:green"> Everything is supported as long as GPU is Metal capable </span> |
-| MacPro5,1 | Mid-2010 | ^^ | ^^ |
+| MacPro5,1 | Mid-2010, Mid-2012 | ^^ | ^^ |
+
+* For MacPro3,1, we **highly** advise users instead opt for a USB Audio Adapter instead of running any Root Volume Patches. This will ensure your machine is as stable and security rich as possible
+
 
 ### Xserve
 
@@ -122,4 +139,6 @@ The below table will list all supported and unsupported functions of the patcher
 | :--- | :--- | :--- | :--- |
 | Xserve1,1 | Mid-2006 | <span style="color:red"> NO </span> | 32-Bit Firmware limitation |
 | Xserve2,1 | Early 2008 | ^^ | ^^ |
-| Xserve3,1 | Early 2009 | <span style="color:#30BCD5"> YES </span> | <span style="color:green"> Everything is supported as long as GPU is Metal capable </span> |
+| Xserve3,1 | Early 2009 | <span style="color:#30BCD5"> YES </span> | <span style="color:green"> Everything is supported as long as GPU is Metal capable </span> |
+
+# Once you've verified your hardware is supported, head to [Download and build macOS Installers](./INSTALLER.md)

docs/PATCHEXPLAIN.md

@@ -0,0 +1,293 @@
+# Explaining the patches in OpenCore Legacy Patcher
+
+In our patcher, there are numerous patches used to ensure a stable system. Here we're going to go over what patches are used and why we recommend or even require them.
+
+* [OpenCore Settings](#opencore-settings)
+* [Injected Kexts](#injected-kexts)
+* [On-Disk Patches](#on-disk-patches)
+
+## OpenCore Settings
+
+Below is a run down of the main logic OpenCore Legacy Patcher uses to gain native support in macOS. Note OpenCore's configuration is documented within [OpenCorePkg](https://github.com/acidanthera/OpenCorePkg) as well as an online version provided by us:
+
+* [OpenCorePkg Online Docs](https://dortania.github.io/docs/latest/Configuration.html)
+
+::: details Configuration Explanation
+
+### ACPI -> Patch
+
+* EHCx and XHC1 Patches
+  * Reason: Required for proper USB operation
+  * Logic: Avoids USB maps of newer models attaching and breaking USB port functionality
+  * Models: All models require
+
+### Booter -> Quirks
+
+* ForceBooterSignature
+  * Reason: Required to ensure Hibernation support
+  * Logic: Tricks boot.efi into thinking OpenCore is Apple's firmware
+  * Models: All models require
+
+### DeviceProperties -> Add
+
+* `PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)`
+* `PciRoot(0x0)/Pci(0x1C,0x4)/Pci(0x0,0x0)`
+* `PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)`
+* `PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)`
+* `PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)`
+  * Reason: Required to ensure Wifi works with full, native support
+  * Logic: Tricks AirPortBrcmNIC.kext into thinking our device is a BCM94360 (`14e4,43ba`)
+  * Models: Machines with BCM943224 and BCM94331 chipsets
+* `PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)`
+* `PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)`
+  * Reason: Required to ensure Brightness Control works on upgraded iMacs
+  * Logic: Sets AppleBackLight properties
+  * Models: iMac11,x and iMac12,x with upgraded Nvidia Metal GPUs
+* `PciRoot(0x0)/Pci(0x2,0x0)`
+  * Reason: Disables internal GPU to fix sleep issues on upgrades iMacs
+  * Logic: Tricks macOS into thinking iGPU is a generic PCI device
+  * Models: iMac12,x with upgraded Metal GPUs
+
+### Kernel -> Patch
+
+* SMC Patch
+  * Reason: Required to avoid SMC Firmware updates
+  * Logic: Patches out `smc-version` in AppleSMC.kext, requires SMC-Spoof.kext for full functionality
+  * Models: All models require
+* IOHIDFamily Patch
+  * Reason: Required for HID peripheral support in macOS on older hardware
+  * Logic: Tricks IOHIDFamily into thinking it's always booting recovery
+  * Models: [2010 and older](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/79ab028b0a039e97a528e0b99c876d95d9c2d41d/Resources/ModelArray.py#L310-L332)
+
+### Kernel -> Quirks
+
+* ThridPartyDrives
+  * Reason: Required to avoid Hibernation wake issues on 3rd party drives
+  * Logic: Patches AppleAHCIPort.kext into support
+  * Models: All models with standard SATA ports
+* PanicNoKextDump
+  * Reason: Avoids kext dump on kernel panics, easier kernel debugging
+  * Logic: Patches Kernel to not dump dump unnecessary info
+  * Models: Only set when Verbose Boot is enabled by the user
+
+### Misc -> Security
+
+* SecureBootModel
+  * Reason: Required to ensure seamless OS updates with Big Sur
+  * Logic: Sets iMacPro1,1's Secure Enclave Identifier (j137)
+  * Models: All models require
+
+### NVRAM -> Add
+
+* `-v debug=0x100`
+  * Reason: Used to see debug info of macOS's kernel and kexts, and avoids reboots on panic
+  * Logic: Adds args to NVRAM
+  * Models: Only set when Verbose Boot is enabled by the user
+* `-liludbgall`
+  * Reason: Enables Lilu and plugin debug logging
+  * Logic: Adds args to NVRAM
+  * Models: Only set when Kext DEBUG is enabled by the user
+* `msgbuf=1048576`
+  * Reason: Sets message buffer size to 1MB, ensures boot logs are retained
+  * Logic: Adds args to NVRAM
+  * Models: Only set when Kext DEBUG is enabled by the user
+* `agdpmod=pikera`
+  * Reason: Fixes GPU switching on MacBookPro9,x
+  * Logic: Adds args to NVRAM
+  * Models: MacBookPro9,x
+* `shikigva=80 unfairgva=1`
+* `shikigva=128 unfairgva=1 -wegtree`
+  * Reason: Fixes DRM support on models with upgraded AMD Metal GPUs
+  * Logic: Adds args to NVRAM
+  * Models: Models with upgraded AMD Metal GPUs
+### UEFI -> ProtocolOverrides
+
+* GopPassThrough
+  * Reason: Used for proper output on machines with UGA firmware but GOP GPU
+  * Logic: Provide GOP protocol instances on top of UGA protocol instances 
+  * Models: MacPro3,1, MacBook4,1 iMac7,1-8,1
+  
+:::
+
+## Injected Kext
+
+Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into memory on boot-up.
+
+::: details Injected Kext Explanation
+
+### Acidanthera
+
+* Lilu
+  * Reason: Patching engine for other kexts
+  * Models: All models require
+* WhateverGreen
+  * Reason: Patches GPU Frameworks and kext to ensure proper support
+  * Models: All models require
+* CPUFriend
+  * Reason: Patches IOx86PlatformPlugin to restore previous CPU profiles
+  * Models: 2012 and newer models
+* AirportBrcmFixup
+  * Reason: Patches IO80211 and co to fix networking support for unsupported cards
+  * Models: BCM943224 and BCM94331
+* RestrictEvents
+  * Reason: Disables memory errors on MacPro7,1
+  * Models: Mac Pros and Xserves
+
+### Ethernet
+
+* nForceEthernet
+  * Reason: Inject old Nvidia Ethernet kext to resolve networking in Catalina and newer
+  * Models: 2010 and older Nvidia Ethernet require
+* MarvelYukonEthernet
+  * Reason: Inject old Marvel Ethernet kext to resolve networking in Catalina and newer
+  * Models: 2008 and older Marvel Ethernet require
+* CatalinaBCM5701Ethernet
+  * Reason: Inject old Broadcom Ethernet kext to resolve networking in Big Sur
+  * Logic: Patch out conflicting symbols to not colide existing BCM5701Ethernet
+  * Models: 2011 and older Broadcom Ethernet require
+
+### Maps
+
+* USBMap
+  * Reason: Inject old USB map profiles to fix USB
+  * Models: All models require
+
+### SSE
+
+* AAMouSSE
+  * Reason: Translates SSE4.2 instructions to compatible code for SSE4,1 CPUs, required for AMD Metal drives
+  * Models: MacPro3,1
+* telemetrap
+  * Reason: Ensures temelemtry.plugin doesn't run, required for SSE4,1 CPUs
+  * Models: Penryn CPUs
+
+### Wifi
+
+* IO80211HighSierra
+  * Reason: Re-inject Atheros wifi drivers from High Sierra
+  * Logic: Patch out conflicting symbols to not colide existing IO80211Family
+  * Models: Atheros cards
+* IO80211Mojave
+  * Reason: Re-inject Broadcom wifi drivers from Mojave
+  * Logic: Patch out conflicting symbols to not colide existing IO80211Family
+  * Models: BCM94322
+
+### Misc
+
+* AppleBackLightFixup
+  * Reason: Patch AppleBacklight for iMacs with Nvidia Metal GPU upgrades
+  * Models: iMac11,x, iMac12,x with upgraded Nvidia Metal GPUs
+* AppleIntelPIIXATA
+  * Reason: Fix IDE support on MacPro3,1
+  * Models: MacPro3,1
+* AppleIntelMCEDisabler
+  * Reason: Fix dual socket support in Catalina and newer
+  * Models: Mac Pros and Xserves
+* NightShiftEnabler
+  * Reason: Enables NightShift support on unsupported models
+  * Models: 2011 and older, MacBookPro9,x included
+* SMC-Spoof
+  * Reason: Spoofs SMC version to 9.9999
+  * Models: All models require
+:::
+
+
+## On-Disk Patches
+
+Unfortunately certain on-disk patches are required to achieve full functionality. Below is a breakdown of patches supported
+
+Note, GPU Acceleration Patches are not public yet, the below section is simply documentation for easier research with new aids.
+
+::: details Audio Patches
+
+### Extensions
+
+* AppleHDA
+  * Reason: Re-add High Sierra's AppleHDA to achieve audio support
+  * Models: 2011 and older Macs (excluding MacPro4,1+)
+
+:::
+
+::: details Acceleration Patches
+
+### Extensions
+
+#### General Patches
+
+* IOSurface.kext
+  * Reason: Fixes immediate logout on login
+  * Logic: Downgrade to Catalina IOSurface
+  * Note: For AMD and Intel, additional `addMemoryRegion/removeMemoryRegion` patch added changing the first conditional jump to non conditional jump
+    * At Offset `0xdb52` and `0xdbc6`, replace following bytes with `0xeb`
+
+#### Dropped Acceleration Binaries
+
+* Nvidia Binaries
+  * GeForceGA.bundle
+  * GeForceTesla.kext
+  * GeForceTeslaGLDriver.bundle
+  * GeForceTeslaVADriver.bundle
+  * NVDANV50HalTesla.kext
+  * NVDAResmanTesla.kext
+
+* AMD/ATI Binaries
+  * 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
+
+* Intel 5th Gen Binaries
+  * AppleIntelFramebufferAzul.kext
+  * AppleIntelFramebufferCapri.kext
+  * AppleIntelHDGraphics.kext
+  * AppleIntelHDGraphicsFB.kext
+  * AppleIntelHDGraphicsGA.plugin
+  * AppleIntelHDGraphicsGLDriver.bundle
+  * AppleIntelHDGraphicsVADriver.bundle
+
+* Intel 6th Gen Binaries
+  * AppleIntelHD3000Graphics.kext
+  * AppleIntelHD3000GraphicsGA.plugin
+  * AppleIntelHD3000GraphicsGLDriver.bundle
+  * AppleIntelHD3000GraphicsVADriver.bundle
+  * AppleIntelSNBGraphicsFB.kext
+  * AppleIntelSNBVA.bundle
+
+### Frameworks
+
+* CoreDisplay.framework
+  * Logic: Copied from Mojave, heavy modifications/shims
+* IOSurface.framework
+* OpenGL.framework
+  * Logic: Copied from Mojave
+
+### PrivateFrameworks
+
+* GPUSupport.framework
+  * Logic: Copied from Mojave
+* SkyLight.framework
+  * Logic: Copied from Mojave, heavy modifications/shims
+
+### LaunchDaemons
+
+* HiddHack.plist
+  * Reason: Fixes unresponsive input when patching Skylight
+  * Logic: Forces `hidd` to register events, as Skylight handles them by default in Big Sur
+
+:::

docs/POST-INSTALL.md

@@ -0,0 +1,35 @@
+# Post-Installation
+
+* [Booting without USB drive](#booting-without-usb-drive)
+* [Booting seamlessly without Verbose or OpenCore Picker](#booting-seamlessly-without-verbose-or-opencore-picker)
+
+## Booting without USB drive
+
+Once you've installed macOS through OpenCore, you can boot up and go through the regular install process. To boot without the USB drive plugged in is quite simple:
+
+* Download OpenCore Legacy Patcher
+* Change Patcher settings as you'd like
+* Build OpenCore again
+* Install OpenCore to internal drive
+* Reboot holding Option, and select the internal EFI
+
+And voila! No more USB drive required
+
+## Booting seamlessly without Verbose or OpenCore Picker
+
+To do this, run the OpenCore Patcher and head to Patcher Settings:
+
+![](../images/settings.png)
+
+Here you can change different patcher settings, however the main interest is:
+
+* Set ShowPicker Mode
+
+Once you've toggled them both off, build your OpenCore EFI once again and install to your desired drive. Now to show the OpenCore selector, you can simply hold down the "ESC" key while clicking on EFI boot, then you can release the "ESC" key when you see the cursor arrow at the top left.
+
+**Note**: For users who need Post-Install Volume patches for Audio support, you **must** disable the following settings in "Patcher Settings" when building and installing your new OpenCore:
+
+* SIP: Disabled
+* SecureBootModel: Disabled
+
+Once set, rebuild OpenCore, install to drive and reboot. Then, Post-Install Volume patches will run just fine

docs/README.md

@@ -0,0 +1,20 @@
+---
+home: true
+heroImage: /homepage.png
+heroText: OpenCore Legacy Patcher
+actionText: Getting Started→
+actionLink: START.md
+
+meta:
+- name: description
+  content: Experience macOS just like before
+
+features:
+- title: Built with security in mind
+  details: Supporting System Integrity Protection(SIP), FileVault 2, .im4m Secure Boot and Vaulting. You're just as secure as a supported Mac
+- title: Native OTA updates
+  details: Install updates the moment they come out just like on a supported Mac, and no more 12GB+ updates.
+- title: Zero firmware patching
+  details: No need to patch APFS ROM support, all protocol upgrades are done in memory and never permanent.
+footer: Copyright © Dortania 2020-2021
+---

docs/START.md

@@ -0,0 +1,23 @@
+# What is OpenCore?
+
+This is a sophisticated boot loader used to inject and patch data in memory, instead of on disk. This means we're able to get near-native experience on many unsupported Macs with Metal GPUs. This includes many of the long desired features of other patchers such as:
+
+* System Integrity Protection, FileVault 2, .im4m Secure Boot and Vaulting
+* Native OTA OS DELTA updates on all Macs
+* Recovery OS, Safe Mode and Single-user Mode booting
+
+While many PC users from the Hackintosh community are familiar with OpenCore, OpenCore was designed as Mac and PC agnostic ensuring both platforms can use it easily. And with OpenCore Legacy Patcher, we help automate the process making running with OpenCore that much easier.
+
+For advanced troubleshooting, we highly recommend users check out the [Unsupported Mac Discord Server](https://discord.gg/XbbWAsE) as this is generally the quickest way to get a hold of us developers and get help from the community.
+
+For those who wish to support this patcher, please see the [Supporting the Patcher page](./DONATE.md) 
+
+## How do I get started?
+
+1. The first step of ensuring whether your model is support is checking here:
+
+* [Supported Models](./MODELS.md)
+
+2. [Download and build macOS Installer](./INSTALLER.md)
+3. [Run the `OpenCore-Patcher.app`](./BUILD.md)
+4. [Reboot and boot OpenCore](./BOOT.md)

docs/TERMS.md

@@ -0,0 +1,39 @@
+# OpenCore Patcher Terminology
+
+With OpenCore Legacy Patcher, we use a lot of different terms to refer to hardware including `SSE4.1`, `32-Bit Firmware`, etc. This page is to help users understand what all these confusing words mean.
+
+# Terminology
+
+Term | Description
+--- | ---
+**macOS**        | Apple's own UNIX based OS used for Mac machines and "What makes a Mac a Mac".
+**Windows**      | Microsoft's proprietary OS that is used and supported on a wide range of devices (stay with this OS if you don't want headaches)
+**Linux**        | Family of open source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991, by Linus Torvalds. Linux is typically packaged in a Linux distribution. Note that while macOS and Linux may be UNIX-based, they're vastly different.
+**Bootloader**   | Piece of software that loads an OS, usually made by the OS creators. OpenCore is technically not a bootloader per se (see boot manager explanation down below). Apple's Boot.efi would be the actual boot loader in a Mac.
+**Boot Manager** | Piece of software that manages bootloaders – we have many of these: Clover, systemd-boot, OpenCore, rEFInd, rEFIt... These are generally seen as prepping the system for the actual boot loader.
+---
+Term | Description
+--- | ---
+**OpenCore**   | The new hotness on the scene, made with security in mind by the [Acidanthera team](https://github.com/acidanthera), has faster booting and lighter weight than previous boot managers. Supports many native Mac features such as SIP, FileVault, Secure Boot, etc
+**ACPI**   | Tables defined in your firmware defining your hardware and different methods, tied directly to how IOKit/IOService handles device setup
+**NVRAM**   | Non-volitile storage, where many variables are stored including default boot options, Hibernation keys, Secure Boot information, etc
+---
+Term | Description
+--- | ---
+**XNU**    | Also known as **X** is **N**ot **U**nix, XNU is referred to as macOS's "kernel" and the heart of what makes macOS tick
+**Kexts**   | Also known as **K**ernel **Ext**ensions, are macOS's drivers. They're used to perform different tasks like device drivers or for a different purpose (in this patcher) like patching the OS, injecting information or running tasks.
+**KernelCollection**   | Also known as the ImmutableKernel and PrelinkedKernel, this is a bundle of the kernel(XNU) and kernel extensions(Kexts) that we use to boot macOS. This is also what OpenCore patches in memory to allow us to have a seamless experience <br/>- PrelinkedKernel: Default caching system since 10.7 <br/>- ImmutableKernel: Secure Boot based caching system since 10.13 <br/>- KernelCollection: Merge of both Prelinked and ImmutableKernel's since macOS 11, Big Sur
+**IOKit**   | Backbone of how Kernel Extentions (Kexts) probe and attach onto hardware, starts quickly after kernel initates
+**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.
+---
+Term | Description
+--- | ---
+**EFI**   | It can denote two things: <br/>- Mac's firmware, which is the same as UEFI, but pretty modified for Macs only, so not so "Universal" <br/>- The partition on your hard drive that stores software read by the UEFI to load OSes (like the Windows bootloader) or UEFI Applications (like OpenCore), it's FAT32 formatted and has an ID type of EF00 (in hex). It can be named ESP or SYSTEM, and it's usually from 100MB to 400MB in size but the size doesn't reflect upon anything.
+**HFS+**   | Also known as MacOS Journaled, this was the default macOS drive format up until macOS 10.13, format was designed around spinning disks
+**APFS**   | This was the default macOS drive from macOS 10.13 and onwards for SSDs, and standard for all drives in Mojave. Format was designed around SSDs primarily.
+**32 and 64-Bit CPU**   | The bit number of a CPU determines how much data a CPU can address. <br/>- 32-Bit CPUs were only supported up-to Mac OS X 10.6, Snow Leopard.
+**32-Bit Firmware**   | The bit number of a Firmware determines how much data the firmware can address. In some older Macs, it's common to have a 64-Bit CPU can have a 32-Bit firmware<br/>- 32-Bit Firmwares were only supported up-to Mac OS X 10.7, Lion.
+**SSE Instructions**   | Also known as **S**IMD **S**ingle-Precision Floating-Point **I**nstructions,  these are defined as instruction sets supported by your CPU. In macOS, there are a certain number of instruction sets required for normal operation: <br/>- SSE3: Required for all Intel CPUs since Mac OS X 10.4, Tiger <br/>- SSSE3: Required for all Intel 64-Bit CPUs since Mac OS X 10.6, Snow Leopard  <br/>- SSE4.1: Required for all Intel CPUs since macOS 10.12, Sierra
+---

docs/TROUBLESHOOTING.md

@@ -7,6 +7,8 @@ Here are some common errors users may experience while using this patcher:
 * [Infinite Recovery OS Booting](#infinite-recovery-os-reboot)
 * [Reboot when entering Hibernation (`Sleep Wake Failure`)](#reboot-when-entering-hibernation-sleep-wake-failure)
 * [Booting with a non-flashed GPU](#booting-with-a-non-flashed-gpu)
+* [How to Boot Big Sur Recovery](#how-to-boot-big-sur-recovery)
+* [Stuck on "Your Mac needs a firmware update"](#stuck-on-your-mac-needs-a-firmware-update)
 
 ## Stuck on `This version of Mac OS X is not supported on this platform`
 
@@ -16,7 +18,7 @@ Once you've booted OpenCore at least once, your hardware should now auto boot it
 
 ## Cannot boot macOS without the USB
 
-At this time, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. Instead, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or run this patcher's Option 2 again but select your internal drive.
+By default, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. Instead, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or run this patcher's Option 2 again but select your internal drive.
 
 Reminder that once this is done, you'll need to select OpenCore in the boot picker again for your hardware to remember this entry and auto boot from then on.
 
@@ -28,7 +30,11 @@ With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates
 
 ## Reboot when entering Hibernation (`Sleep Wake Failure`)
 
-Resolved in OpenCore-Legacy-Patcher v0.0.14
+[Known issue on some models](https://github.com/dortania/Opencore-Legacy-Patcher/issues/72), temporary fix is to disable Hibernation:
+
+```
+sudo pmset -a hibernatemode 0
+```
 
 ## Booting with a non-flashed GPU
 
@@ -41,4 +47,15 @@ sudo bless --verbose --file /Volumes/VOLNAME/EFI/OC/OpenCore.efi --folder /Volum
 * Note you will need to replace `VOLNAME` with the Volume name of your USB or hard drive with OpenCore
 * Note 2: Once done, you can re-enable SIP
 
-Once you boot OpenCore for the first time, LauncherOption will install itself as the top boot priority making OpenCore always launch. Combined with `RequestBootVar`, all boot options must go through OpenCore ensuring seamless usage even with OS installation and updates.
+Once you boot OpenCore for the first time, LauncherOption will install itself as the top boot priority making OpenCore always launch. Combined with `RequestBootVar`, all boot options must go through OpenCore ensuring seamless usage even with OS installation and updates.
+
+## How to Boot Big Sur Recovery
+
+By default, the patcher will try to hide extra boot options such as recovery from the user. To make them appear, simply press the "Spacebar" inside OpenCore's Picker to list all boot options.
+
+## Stuck on "Your Mac needs a firmware update"
+
+Full error: "Your Mac needs a firmware update in order to install to this Volume. Please select a Mac OS Extended (Journaled) volume instead."
+
+
+This error occurs when macOS determines the firmware to not have full APFS support. To resolve is quite simple, when building OpenCore head to "Patcher Settings" and enable "Moderate SMBIOS Patching" or higher. This will ensure that the firmware reported will show as supporting full APFS capabilities.

docs/UNINSTALL.md

@@ -0,0 +1,11 @@
+# Uninstalling OpenCore
+
+To remove OpenCore is actually quite simply:
+
+1. Remove OpenCore either from the USB or internal drive
+  * You'll need to mount the drive's EFI partition, and delete the EFI folder
+  * [See here for example how to mount](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html)
+2. Reset NVRAM
+  * [Reset NVRAM or PRAM on your Mac](https://support.apple.com/HT204063)
+
+Know that if you are on Big Sur when you remove the EFI folder, your Mac will no longer boot and show the prohibited symbol. Be ready to install an older version of macOS before you uninstall OpenCore.

docs/package.json

@@ -0,0 +1,51 @@
+{
+   "name": "OpenCore-Legacy-Patcher",
+   "version": "0.0.1",
+   "description": "Guide to put macOS on unsupported devices",
+   "main": "",
+   "author": {
+      "name": "Dortania",
+      "url": "https://github.com/dortania"
+   },
+   "repository": {
+      "type": "git",
+      "url": "git+https://github.com/dortania/OpenCore-Legacy-Patcher.git"
+   },
+   "scripts": {
+      "dev": "vuepress dev",
+      "build": "vuepress build",
+      "fix-lint": "run-script-os",
+      "fix-lint:default": "(echo Attempting to fix lint... && markdownlint -c .markdownlint.json -p .markdownlintignore '**/*.md' -f && echo Fixed successfully, please commit.) || (echo Fix failed! && exit 1)",
+      "fix-lint:win32": "(echo Attempting to fix lint... && markdownlint -c .markdownlint.json -p .markdownlintignore **/*.md -f && echo Fixed successfully, please commit.) || (echo Fix failed! && exit 1)",
+      "lint": "run-script-os",
+      "lint:default": "(echo Linting... && markdownlint -c .markdownlint.json -p .markdownlintignore '**/*.md' && echo Lint passed.) || (echo Lint failed! Please review and fix errors. && exit 1)",
+      "lint:win32": "(echo Linting... && markdownlint -c .markdownlint.json -p .markdownlintignore **/*.md && echo Lint passed.) || (echo Lint failed! Please review and fix errors. && exit 1)",
+      "lint-ci": "run-script-os",
+      "lint-ci:default": "(echo Linting... && markdownlint -c .markdownlint.json -p .markdownlintignore '**/*.md' && echo Lint passed.) || ((echo Lint failed, attempting fix... && markdownlint -c .markdownlint.json -p .markdownlintignore '**/*.md' -f && echo Fix generated successfully. Please apply the following diff using git apply && git diff) || echo Fix failed! && exit 1)",
+      "lint-ci:win32": "(echo Linting... && markdownlint -c .markdownlint.json -p .markdownlintignore **/*.md && echo Lint passed.) || ((echo Lint failed, attempting fix... && markdownlint -c .markdownlint.json -p .markdownlintignore **/*.md -f && echo Fix generated successfully. Please apply the following diff using git apply && git diff) || echo Fix failed! && exit 1)",
+      "sort-dict": "node ./scripts/sortDict.js",
+      "spellcheck": "run-script-os",
+      "spellcheck:default": "(spellchecker --plugins spell indefinite-article repeated-words syntax-urls --dictionaries dictionary/dictionary.txt dictionary/opencorekeys.txt --files '**/*.md'  && echo Spellcheck passed.) || (echo Spellcheck failed! Please review and fix errors/add words to dictionary as needed. && exit 1)",
+      "spellcheck:win32": "(spellchecker --plugins spell indefinite-article repeated-words syntax-urls --dictionaries dictionary/dictionary.txt dictionary/opencorekeys.txt --files **/*.md  && echo Spellcheck passed.) || (echo Spellcheck failed! Please review and fix errors/add words to dictionary as needed. && exit 1)",
+      "test": "run-script-os",
+      "test:default": "npm run lint --silent; npm run spellcheck --silent",
+      "test:win32": "npm run lint --silent & npm run spellcheck --silent"
+   },
+   "license": "CC-BY-NC-SA-4.0",
+   "devDependencies": {
+      "@vuepress/plugin-back-to-top": "^1.7.1",
+      "markdown-it-multimd-table": "^4.0.3",
+      "markdown-link-check": "^3.8.5",
+      "markdownlint-cli": "^0.26.0",
+      "run-script-os": "^1.1.4",
+      "spellchecker-cli": "^4.4.0",
+      "vuepress": "^1.7.1",
+      "vuepress-plugin-medium-zoom": "^1.1.9",
+      "vuepress-plugin-zooming": "^1.1.8",
+      "vuepress-theme-book": "0.0.5",
+      "vuepress-theme-dark-new": "^0.1.2",
+      "vuepress-theme-succinct": "^1.6.4",
+      "vuepress-theme-yuu": "^2.3.0"
+   },
+   "homepage": "https://dortania.github.io/OpenCore-Legacy-Patcher/"
+}

docs/scripts/linkcheck.py

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

docs/scripts/sortDict.js

@@ -0,0 +1,26 @@
+const fs = require("fs");
+
+process.chdir(__dirname);
+
+console.log("Reading dictionary.txt");
+let dictionary = fs.readFileSync("../dictionary/dictionary.txt", { encoding: "UTF8" })
+                    .replace("\r", "").split("\n");
+
+let ocDictionary = fs.readFileSync("../dictionary/opencorekeys.txt", { encoding: "UTF8" })
+                     .replace("\r", "").split("\n");
+
+dictionary = dictionary.filter(string => string != "");
+ocDictionary = ocDictionary.filter(string => string != "");
+
+dictionary = dictionary.filter((string, index) => dictionary.indexOf(string) == index);
+ocDictionary = ocDictionary.filter((string, index) => ocDictionary.indexOf(string) == index);
+
+dictionary = dictionary.filter(string => !ocDictionary.includes(string));
+
+console.log("Sorting...");
+dictionary.sort();
+ocDictionary.sort();
+
+console.log("Writing dictionary.txt");
+fs.writeFileSync("../dictionary/dictionary.txt", dictionary.join("\n"));
+fs.writeFileSync("../dictionary/opencorekeys.txt", ocDictionary.join("\n"));

entitlements.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.cs.disable-library-validation</key>
+	<true/>
+</dict>
+</plist>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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