Use device_probe

Resources/Constants.py

@@ -5,6 +5,9 @@
 from __future__ import print_function
 
 from pathlib import Path
+from typing import Optional
+
+from Resources import device_probe
 
 
 class Constants:
@@ -41,16 +44,17 @@ class Constants:
         self.debugenhancer_version = "1.0.3"
         self.innie_version = "1.3.0"
         self.fw_kext = "1.0.0"
-        self.payload_version = "0.0.18" # Apple-Binaries-OCLP
+        self.payload_version = "0.0.18"  # Apple-Binaries-OCLP
 
         # Get resource path
         self.current_path = Path(__file__).parent.parent.resolve()
         self.payload_path = self.current_path / Path("payloads")
 
-        self.custom_model: str = None
-        self.custom_mxm_gpu: str = None
-        self.current_gpuv: str = None
-        self.current_gpud: str = None
+        # Hardware
+        self.computer: device_probe.Computer = None  # type: ignore
+
+        self.custom_model: Optional[str] = None
+        self.custom_mxm_gpu: bool = False
 
         # Patcher Settings
         self.opencore_debug = False
@@ -86,7 +90,7 @@ class Constants:
         self.firewire_boot = False
         self.nvme_boot = False
         self.disable_amfi = False
-        self.terscale_2_patch = False
+        self.terascale_2_patch = False
 
         # OS Versions
         self.tiger = 8
@@ -133,252 +137,440 @@ class Constants:
     # Payload Location
     # OpenCore
     @property
-    def opencore_zip_source(self): return self.payload_path / Path(f"OpenCore/OpenCore-{self.opencore_build}.zip")
+    def opencore_zip_source(self):
+        return self.payload_path / Path(f"OpenCore/OpenCore-{self.opencore_build}.zip")
+
     @property
-    def plist_template(self): return self.payload_path / Path(f"Config/config.plist")
+    def plist_template(self):
+        return self.payload_path / Path("Config/config.plist")
 
     # Mount Location
     @property
-    def payload_mnt1_path(self): return self.payload_path / Path("mnt1")
+    def payload_mnt1_path(self):
+        return self.payload_path / Path("mnt1")
 
     # ACPI
     @property
-    def pci_ssdt_path(self): return self.payload_path / Path("ACPI/SSDT-CPBG.aml")
+    def pci_ssdt_path(self):
+        return self.payload_path / Path("ACPI/SSDT-CPBG.aml")
+
     @property
-    def windows_ssdt_path(self): return self.payload_path / Path("ACPI/SSDT-PCI.aml")
+    def windows_ssdt_path(self):
+        return self.payload_path / Path("ACPI/SSDT-PCI.aml")
 
     # Drivers
     @property
-    def nvme_driver_path(self): return self.payload_path / Path("Drivers/NvmExpressDxe.efi")
+    def nvme_driver_path(self):
+        return self.payload_path / Path("Drivers/NvmExpressDxe.efi")
+
     @property
-    def exfat_legacy_driver_path(self): return self.payload_path / Path("Drivers/ExFatDxeLegacy.efi")
+    def exfat_legacy_driver_path(self):
+        return self.payload_path / Path("Drivers/ExFatDxeLegacy.efi")
+
     @property
-    def xhci_driver_path(self): return self.payload_path / Path("Drivers/XhciDxe.efi")
+    def xhci_driver_path(self):
+        return self.payload_path / Path("Drivers/XhciDxe.efi")
 
     # Kexts
     @property
-    def payload_kexts_path(self): return self.payload_path / Path("Kexts")
+    def payload_kexts_path(self):
+        return self.payload_path / Path("Kexts")
+
     @property
-    def lilu_path(self): return self.payload_kexts_path / Path(f"Acidanthera/Lilu-v{self.lilu_version}.zip")
+    def lilu_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/Lilu-v{self.lilu_version}.zip")
+
     @property
-    def whatevergreen_path(self): return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}.zip")
+    def whatevergreen_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/WhateverGreen-v{self.whatevergreen_version}.zip")
+
     @property
-    def airportbcrmfixup_path(self): return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}.zip")
+    def airportbcrmfixup_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/AirportBrcmFixup-v{self.airportbcrmfixup_version}.zip")
+
     @property
-    def restrictevents_path(self): return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}.zip")
+    def restrictevents_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-v{self.restrictevents_version}.zip")
+
     @property
-    def restrictevents_mbp_path(self): return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-MBP91-v{self.restrictevents_mbp_version}.zip")
+    def restrictevents_mbp_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/RestrictEvents-MBP91-v{self.restrictevents_mbp_version}.zip")
+
     @property
-    def bcm570_path(self): return self.payload_kexts_path / Path(f"Ethernet/CatalinaBCM5701Ethernet-v{self.bcm570_version}.zip")
+    def bcm570_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/CatalinaBCM5701Ethernet-v{self.bcm570_version}.zip")
+
     @property
-    def marvel_path(self): return self.payload_kexts_path / Path(f"Ethernet/MarvelYukonEthernet-v{self.marvel_version}.zip")
+    def marvel_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/MarvelYukonEthernet-v{self.marvel_version}.zip")
+
     @property
-    def nforce_path(self): return self.payload_kexts_path / Path(f"Ethernet/nForceEthernet-v{self.nforce_version}.zip")
+    def nforce_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/nForceEthernet-v{self.nforce_version}.zip")
+
     @property
-    def mce_path(self): return self.payload_kexts_path / Path(f"Misc/AppleMCEReporterDisabler-v{self.mce_version}.zip")
+    def mce_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleMCEReporterDisabler-v{self.mce_version}.zip")
+
     @property
-    def mousse_path(self): return self.payload_kexts_path / Path(f"SSE/AAAMouSSE-v{self.mousse_version}.zip")
+    def mousse_path(self):
+        return self.payload_kexts_path / Path(f"SSE/AAAMouSSE-v{self.mousse_version}.zip")
+
     @property
-    def telemetrap_path(self): return self.payload_kexts_path / Path(f"SSE/telemetrap-v{self.telemetrap_version}.zip")
+    def telemetrap_path(self):
+        return self.payload_kexts_path / Path(f"SSE/telemetrap-v{self.telemetrap_version}.zip")
+
     @property
-    def corecaptureelcap_path(self): return self.payload_kexts_path / Path(f"Wifi/corecaptureElCap-v{self.corecaptureelcap_version}.zip")
+    def corecaptureelcap_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/corecaptureElCap-v{self.corecaptureelcap_version}.zip")
+
     @property
-    def io80211elcap_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211ElCap-v{self.io80211elcap_version}.zip")
+    def io80211elcap_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211ElCap-v{self.io80211elcap_version}.zip")
+
     @property
-    def io80211high_sierra_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211HighSierra-v{self.io80211high_sierra_version}.zip")
+    def io80211high_sierra_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211HighSierra-v{self.io80211high_sierra_version}.zip")
+
     @property
-    def io80211mojave_path(self): return self.payload_kexts_path / Path(f"Wifi/IO80211Mojave-v{self.io80211mojave_version}.zip")
+    def io80211mojave_path(self):
+        return self.payload_kexts_path / Path(f"Wifi/IO80211Mojave-v{self.io80211mojave_version}.zip")
+
     @property
-    def applealc_path(self): return self.payload_kexts_path / Path(f"Acidanthera/AppleALC-v{self.applealc_version}.zip")
+    def applealc_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/AppleALC-v{self.applealc_version}.zip")
+
     @property
-    def piixata_path(self): return self.payload_kexts_path / Path(f"Misc/AppleIntelPIIXATA-v{self.piixata_version}.zip")
+    def piixata_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleIntelPIIXATA-v{self.piixata_version}.zip")
+
     @property
-    def backlight_path(self): return self.payload_kexts_path / Path(f"Misc/AppleBacklightFixup-v{self.backlight_version}.zip")
+    def backlight_path(self):
+        return self.payload_kexts_path / Path(f"Misc/AppleBacklightFixup-v{self.backlight_version}.zip")
+
     @property
-    def backlight_injector_path(self): return self.payload_kexts_path / Path(f"Misc/BacklightInjector-v{self.backlight_injector_version}.zip")
+    def backlight_injector_path(self):
+        return self.payload_kexts_path / Path(f"Misc/BacklightInjector-v{self.backlight_injector_version}.zip")
+
     @property
-    def cpufriend_path(self): return self.payload_kexts_path / Path(f"Acidanthera/CPUFriend-v{self.cpufriend_version}.zip")
+    def cpufriend_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/CPUFriend-v{self.cpufriend_version}.zip")
+
     @property
-    def nightshift_path(self): return self.payload_kexts_path / Path(f"Misc/NightShiftEnabler-v{self.nightshift_version}.zip")
+    def nightshift_path(self):
+        return self.payload_kexts_path / Path(f"Misc/NightShiftEnabler-v{self.nightshift_version}.zip")
+
     @property
-    def smcspoof_path(self): return self.payload_kexts_path / Path(f"Misc/SMC-Spoof-v{self.smcspoof_version}.zip")
+    def smcspoof_path(self):
+        return self.payload_kexts_path / Path(f"Misc/SMC-Spoof-v{self.smcspoof_version}.zip")
+
     @property
-    def cputscsync_path(self): return self.payload_kexts_path / Path(f"Acidanthera/CpuTscSync-v{self.cputscsync}.zip")
+    def 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")
+    def hibernationfixup_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/HibernationFixup-v{self.hibernationfixup}.zip")
+
     @property
-    def nvmefix_path(self): return self.payload_kexts_path / Path(f"Acidanthera/NVMeFix-v{self.nvmefix_version}.zip")
+    def nvmefix_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/NVMeFix-v{self.nvmefix_version}.zip")
+
     @property
-    def sidecarfixup_path(self): return self.payload_kexts_path / Path(f"Acidanthera/SidecarFixup-v{self.sidecarfixup_version}.zip")
+    def sidecarfixup_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/SidecarFixup-v{self.sidecarfixup_version}.zip")
+
     @property
-    def debugenhancer_path(self): return self.payload_kexts_path / Path(f"Acidanthera/DebugEnhancer-v{self.debugenhancer_version}.zip")
+    def debugenhancer_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/DebugEnhancer-v{self.debugenhancer_version}.zip")
+
     @property
-    def innie_path(self): return self.payload_kexts_path / Path(f"Misc/Innie-v{self.innie_version}.zip")
+    def innie_path(self):
+        return self.payload_kexts_path / Path(f"Misc/Innie-v{self.innie_version}.zip")
+
     @property
-    def plist_folder_path(self): return self.payload_kexts_path / Path(f"Plists")
+    def plist_folder_path(self):
+        return self.payload_kexts_path / Path("Plists")
+
     @property
-    def platform_plugin_plist_path(self): return self.plist_folder_path / Path(f"PlatformPlugin")
+    def platform_plugin_plist_path(self):
+        return self.plist_folder_path / Path("PlatformPlugin")
+
     @property
-    def fw_family_path(self): return self.payload_kexts_path / Path(f"FireWire/IOFireWireFamily-v{self.fw_kext}.zip")
+    def fw_family_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireFamily-v{self.fw_kext}.zip")
+
     @property
-    def fw_sbp2_path(self): return self.payload_kexts_path / Path(f"FireWire/IOFireWireSBP2-v{self.fw_kext}.zip")
+    def fw_sbp2_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireSBP2-v{self.fw_kext}.zip")
+
     @property
-    def fw_bus_path(self): return self.payload_kexts_path / Path(f"FireWire/IOFireWireSerialBusProtocolTransport-v{self.fw_kext}.zip")
+    def fw_bus_path(self):
+        return self.payload_kexts_path / Path(f"FireWire/IOFireWireSerialBusProtocolTransport-v{self.fw_kext}.zip")
 
     # Build Location
     @property
-    def build_path(self): return self.current_path / Path("Build-Folder/")
-    @property
-    def opencore_release_folder(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}")
-    @property
-    def opencore_zip_copied(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}.zip")
+    def build_path(self):
+        return self.current_path / Path("Build-Folder/")
 
     @property
-    def oc_folder(self): return self.opencore_release_folder / Path("EFI/OC/")
+    def opencore_release_folder(self):
+        return self.build_path / Path(f"OpenCore-{self.opencore_build}")
+
     @property
-    def plist_path(self): return self.oc_folder / Path("config.plist")
+    def opencore_zip_copied(self):
+        return self.build_path / Path(f"OpenCore-{self.opencore_build}.zip")
+
     @property
-    def acpi_path(self): return self.oc_folder / Path("ACPI")
+    def oc_folder(self):
+        return self.opencore_release_folder / Path("EFI/OC/")
+
     @property
-    def drivers_path(self): return self.oc_folder / Path("Drivers")
+    def plist_path(self):
+        return self.oc_folder / Path("config.plist")
+
     @property
-    def kexts_path(self): return self.oc_folder / Path("Kexts")
+    def acpi_path(self):
+        return self.oc_folder / Path("ACPI")
+
     @property
-    def resources_path(self): return self.oc_folder / Path("Resources")
+    def drivers_path(self):
+        return self.oc_folder / Path("Drivers")
+
     @property
-    def map_kext_folder(self): return self.kexts_path / Path("USB-Map.kext")
+    def kexts_path(self):
+        return self.oc_folder / Path("Kexts")
+
     @property
-    def map_contents_folder(self): return self.map_kext_folder / Path("Contents")
+    def resources_path(self):
+        return self.oc_folder / Path("Resources")
+
     @property
-    def pp_kext_folder(self): return self.kexts_path / Path("CPUFriendDataProvider.kext")
+    def map_kext_folder(self):
+        return self.kexts_path / Path("USB-Map.kext")
+
     @property
-    def pp_contents_folder(self): return self.pp_kext_folder / Path("Contents")
+    def map_contents_folder(self):
+        return self.map_kext_folder / Path("Contents")
+
     @property
-    def agdp_kext_folder(self): return self.kexts_path / Path("AGDP-Override.kext")
+    def pp_kext_folder(self):
+        return self.kexts_path / Path("CPUFriendDataProvider.kext")
+
     @property
-    def agdp_contents_folder(self): return self.agdp_kext_folder / Path("Contents")
+    def pp_contents_folder(self):
+        return self.pp_kext_folder / Path("Contents")
+
     @property
-    def agpm_kext_folder(self): return self.kexts_path / Path("AGPM-Override.kext")
+    def agdp_kext_folder(self):
+        return self.kexts_path / Path("AGDP-Override.kext")
+
     @property
-    def agpm_contents_folder(self): return self.agpm_kext_folder / Path("Contents")
+    def agdp_contents_folder(self):
+        return self.agdp_kext_folder / Path("Contents")
+
     @property
-    def amc_kext_folder(self): return self.kexts_path / Path("AMC-Override.kext")
+    def agpm_kext_folder(self):
+        return self.kexts_path / Path("AGPM-Override.kext")
+
     @property
-    def amc_contents_folder(self): return self.amc_kext_folder / Path("Contents")
+    def agpm_contents_folder(self):
+        return self.agpm_kext_folder / Path("Contents")
+
+    @property
+    def amc_kext_folder(self):
+        return self.kexts_path / Path("AMC-Override.kext")
+
+    @property
+    def amc_contents_folder(self):
+        return self.amc_kext_folder / Path("Contents")
 
     # Tools
     @property
-    def macserial_path(self): return self.payload_path / Path("Tools/macserial")
+    def macserial_path(self):
+        return self.payload_path / Path("Tools/macserial")
+
     @property
-    def gfxutil_path(self): return self.payload_path / Path("Tools/gfxutil")
+    def gfxutil_path(self):
+        return self.payload_path / Path("Tools/gfxutil")
+
     @property
-    def vault_path(self): return self.payload_path / Path("Tools/CreateVault/sign.command")
+    def vault_path(self):
+        return self.payload_path / Path("Tools/CreateVault/sign.command")
 
     # Icons
     @property
-    def app_icon_path(self): return self.current_path / Path("OC-Patcher.icns")
+    def app_icon_path(self):
+        return self.current_path / Path("OC-Patcher.icns")
+
     @property
-    def icon_path_external(self): return self.payload_path / Path("Icon/External/.VolumeIcon.icns")
+    def icon_path_external(self):
+        return self.payload_path / Path("Icon/External/.VolumeIcon.icns")
+
     @property
-    def icon_path_internal(self): return self.payload_path / Path("Icon/Internal/.VolumeIcon.icns")
+    def icon_path_internal(self):
+        return self.payload_path / Path("Icon/Internal/.VolumeIcon.icns")
+
     @property
-    def icon_path_sd(self): return self.payload_path / Path("Icon/SD-Card/.VolumeIcon.icns")
+    def icon_path_sd(self):
+        return self.payload_path / Path("Icon/SD-Card/.VolumeIcon.icns")
+
     @property
-    def icon_path_ssd(self): return self.payload_path / Path("Icon/SSD/.VolumeIcon.icns")
+    def icon_path_ssd(self):
+        return self.payload_path / Path("Icon/SSD/.VolumeIcon.icns")
+
     @property
-    def gui_path(self): return self.payload_path / Path("Icon/Resources.zip")
+    def gui_path(self):
+        return self.payload_path / Path("Icon/Resources.zip")
 
     # Apple Payloads Paths
     @property
-    def payload_apple_root_path_unzip(self): return self.payload_path / Path(f"Apple-Binaries-OCLP-{self.payload_version}")
+    def payload_apple_root_path_unzip(self):
+        return self.payload_path / Path(f"Apple-Binaries-OCLP-{self.payload_version}")
+
     @property
-    def payload_apple_root_path_zip(self): return self.payload_path / Path("Apple.zip")
+    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")
+    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")
+    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")
+    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")
+    def payload_apple_frameworks_path_accel(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration")
+
     @property
-    def payload_apple_frameworks_path_accel_ts2(self): return self.payload_apple_frameworks_path / Path("Graphics-Acceleration-TS2")
+    def payload_apple_frameworks_path_accel_ts2(self):
+        return self.payload_apple_frameworks_path / Path("Graphics-Acceleration-TS2")
+
     @property
-    def payload_apple_lauchd_path(self): return self.payload_apple_root_path / Path("LaunchDaemons")
+    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")
+    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")
+    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")
+    def payload_apple_private_frameworks_path_accel(self):
+        return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration")
+
     @property
-    def payload_apple_private_frameworks_path_accel_ts2(self): return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration-TS2")
+    def payload_apple_private_frameworks_path_accel_ts2(self):
+        return self.payload_apple_private_frameworks_path / Path("Graphics-Acceleration-TS2")
+
     @property
-    def payload_apple_private_frameworks_path_brightness(self): return self.payload_apple_private_frameworks_path / Path("Brightness-Control")
+    def payload_apple_private_frameworks_path_brightness(self):
+        return self.payload_apple_private_frameworks_path / Path("Brightness-Control")
 
     # Apple Extensions
     @property
-    def audio_path(self): return self.payload_apple_kexts_path / Path("Audio")
+    def audio_path(self):
+        return self.payload_apple_kexts_path / Path("Audio")
 
     # GPU Kexts and Bundles
 
     @property
-    def legacy_graphics(self): return self.payload_apple_kexts_path / Path("Graphics-Acceleration")
-    @property
-    def legacy_graphics_ts2(self): return self.payload_apple_kexts_path / Path("Graphics-Acceleration-TS2")
-    @property
-    def legacy_nvidia_path(self): return self.legacy_graphics / Path("Nvidia-Tesla-Fermi")
-    @property
-    def legacy_nvidia_kepler_path(self): return self.legacy_graphics / Path("Nvidia-Kepler")
-    @property
-    def legacy_amd_path(self): return self.legacy_graphics / Path("AMD-ATI")
-    @property
-    def legacy_amd_path_ts2(self): return self.legacy_graphics / Path("ATI-TS2")
-    @property
-    def legacy_intel_gen1_path(self): return self.legacy_graphics / Path("Intel-Gen5-Ironlake")
-    @property
-    def legacy_intel_gen2_path(self): return self.legacy_graphics / Path("Intel-Gen6-SandyBridge")
-    @property
-    def legacy_intel_gen3_path(self): return self.legacy_graphics / Path("Intel-Gen7-IvyBridge")
-    @property
-    def legacy_general_path(self): return self.legacy_graphics / Path("General-Patches")
+    def legacy_graphics(self):
+        return self.payload_apple_kexts_path / Path("Graphics-Acceleration")
 
     @property
-    def legacy_brightness(self): return self.payload_apple_kexts_path / Path("Brightness-Control")
+    def legacy_graphics_ts2(self):
+        return self.payload_apple_kexts_path / Path("Graphics-Acceleration-TS2")
+
+    @property
+    def legacy_nvidia_path(self):
+        return self.legacy_graphics / Path("Nvidia-Tesla-Fermi")
+
+    @property
+    def legacy_nvidia_kepler_path(self):
+        return self.legacy_graphics / Path("Nvidia-Kepler")
+
+    @property
+    def legacy_amd_path(self):
+        return self.legacy_graphics / Path("AMD-ATI")
+
+    @property
+    def legacy_amd_path_ts2(self):
+        return self.legacy_graphics / Path("ATI-TS2")
+
+    @property
+    def legacy_intel_gen1_path(self):
+        return self.legacy_graphics / Path("Intel-Gen5-Ironlake")
+
+    @property
+    def legacy_intel_gen2_path(self):
+        return self.legacy_graphics / Path("Intel-Gen6-SandyBridge")
+
+    @property
+    def legacy_intel_gen3_path(self):
+        return self.legacy_graphics / Path("Intel-Gen7-IvyBridge")
+
+    @property
+    def legacy_general_path(self):
+        return self.legacy_graphics / Path("General-Patches")
+
+    @property
+    def legacy_brightness(self):
+        return self.payload_apple_kexts_path / Path("Brightness-Control")
 
     # Apple Frameworks
     @property
-    def coredisplay_path(self): return self.payload_apple_frameworks_path_accel / Path("CoreDisplay.framework")
+    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")
+    def iosurface_f_path(self):
+        return self.payload_apple_frameworks_path_accel / Path("IOSurface.framework")
+
     @property
-    def opengl_path(self): return self.payload_apple_frameworks_path_accel / Path("OpenGL.framework")
+    def 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("IOHID-Fixup.plist")
+    def hiddhack_path(self):
+        return self.payload_apple_lauchd_path_accel / Path("IOHID-Fixup.plist")
+
     @property
-    def legacy_hiddhack_path(self): return self.payload_apple_lauchd_path_accel / Path("HiddHack.plist")
+    def legacy_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")
+    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")
+    def skylight_path(self):
+        return self.payload_apple_private_frameworks_path_accel / Path("SkyLight.framework")
 
     csr_values = {
-        "CSR_ALLOW_UNTRUSTED_KEXTS":            False,  # 0x1   - Allows Unsigned Kexts           - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_UNRESTRICTED_FS":            False,  # 0x2   - File System Access              - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_TASK_FOR_PID":               False,  # 0x4   - Unrestricted Debugging          - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_KERNEL_DEBUGGER":            False,  # 0x8   - Allow Kernel Debugger           - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_APPLE_INTERNAL":             False,  # 0x10  - Set AppleInternal Features      - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_UNRESTRICTED_DTRACE":        False,  # 0x20  - Unrestricted DTrace usage       - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_UNRESTRICTED_NVRAM":         False,  # 0x40  - Unrestricted NVRAM write        - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_DEVICE_CONFIGURATION":       False,  # 0x80  - Allow Device Configuration(?)   - Introduced in El Capitan  # noqa: E241
-        "CSR_ALLOW_ANY_RECOVERY_OS":            False,  # 0x100 - Disable BaseSystem Verification - Introduced in Sierra      # noqa: E241
-        "CSR_ALLOW_UNAPPROVED_KEXTS":           False,  # 0x200 - Allow Unapproved Kexts          - Introduced in High Sierra # noqa: E241
+        "CSR_ALLOW_UNTRUSTED_KEXTS": False,  # 0x1   - Allows Unsigned Kexts           - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_UNRESTRICTED_FS": False,  # 0x2   - File System Access              - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_TASK_FOR_PID": False,  # 0x4   - Unrestricted Debugging          - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_KERNEL_DEBUGGER": False,  # 0x8   - Allow Kernel Debugger           - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_APPLE_INTERNAL": False,  # 0x10  - Set AppleInternal Features      - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_UNRESTRICTED_DTRACE": False,  # 0x20  - Unrestricted DTrace usage       - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_UNRESTRICTED_NVRAM": False,  # 0x40  - Unrestricted NVRAM write        - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_DEVICE_CONFIGURATION": False,  # 0x80  - Allow Device Configuration(?)   - Introduced in El Capitan  # noqa: E241
+        "CSR_ALLOW_ANY_RECOVERY_OS": False,  # 0x100 - Disable BaseSystem Verification - Introduced in Sierra      # noqa: E241
+        "CSR_ALLOW_UNAPPROVED_KEXTS": False,  # 0x200 - Allow Unapproved Kexts          - Introduced in High Sierra # noqa: E241
         "CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE": False,  # 0x400 - Override Executable Policy      - Introduced in Mojave      # noqa: E241
-        "CSR_ALLOW_UNAUTHENTICATED_ROOT":       False,  # 0x800 - Allow Root Volume Mounting      - Introduced in Big Sur     # noqa: E241
+        "CSR_ALLOW_UNAUTHENTICATED_ROOT": False,  # 0x800 - Allow Root Volume Mounting      - Introduced in Big Sur     # noqa: E241
     }
 
     root_patch_sip_mojave = [
@@ -442,7 +634,7 @@ class Constants:
         "MacBookAir7,1": "Mac-9F18E312C5C2BF0B",
         "MacBookAir7,2": "Mac-937CB26E2E02BB01",
         "MacBookAir8,1": "Mac-827FAC58A8FDFA22",
-        "MacBookAir8,1": "Mac-226CB3C6A851A671",
+        "MacBookAir8,2": "Mac-226CB3C6A851A671",
         "MacBookAir9,1": "Mac-0CFF9C7C2B63DF8D",
         "MacBookPro1,1": "Mac-F425BEC8",
         "MacBookPro1,2": "Mac-F42DBEC8",
@@ -505,14 +697,13 @@ class Constants:
         "iMac8,1": "Mac-F227BEC8",
         "iMac9,1": "Mac-F2218FA9",
         "iMac10,1": "Mac-F221DCC8",
-        "iMac10,1": "Mac-F2268CC8",
+        # "iMac10,1": "Mac-F2268CC8",
         "iMac11,1": "Mac-F2268DAE",
         "iMac11,2": "Mac-F2238AC8",
         "iMac11,3": "Mac-F2238BAE",
         "iMac12,1": "Mac-942B5BF58194151B",
         "iMac12,2": "Mac-942B59F58194171B",
         "iMac13,1": "Mac-00BE6ED71E35EB86",
-        "iMac13,1": "Mac-00BE6ED71E35EB86",
         "iMac13,2": "Mac-FC02E91DDD3FA6A4",
         "iMac13,3": "Mac-7DF2A3B5E5D671ED",
         "iMac14,1": "Mac-031B6874CF7F642A",