diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-Battery.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-Battery.aml
new file mode 100644
index 0000000..d75f720
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/ACPI/SSDT-Battery.aml differ
diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-PNLF.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-PNLF.aml
index 1936aa4..4106e81 100644
Binary files a/EFI-OpenCore/EFI/OC/ACPI/SSDT-PNLF.aml and b/EFI-OpenCore/EFI/OC/ACPI/SSDT-PNLF.aml differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/ECEnabler.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/ECEnabler.kext/Contents/Info.plist
deleted file mode 100644
index a14ac54..0000000
--- a/EFI-OpenCore/EFI/OC/Kexts/ECEnabler.kext/Contents/Info.plist
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
- BuildMachineOSBuild
- 19H524
- CFBundleDevelopmentRegion
- en
- CFBundleExecutable
- ECEnabler
- CFBundleIdentifier
- com.1Revenger1.ECEnabler
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- ECEnabler
- CFBundlePackageType
- KEXT
- CFBundleShortVersionString
- 1.0
- CFBundleSupportedPlatforms
-
- MacOSX
-
- CFBundleVersion
- 1
- DTCompiler
- com.apple.compilers.llvm.clang.1_0
- DTPlatformBuild
- 12B45b
- DTPlatformName
- macosx
- DTPlatformVersion
- 11.0
- DTSDKBuild
- 20A2408
- DTSDKName
- macosx11.0
- DTXcode
- 1220
- DTXcodeBuild
- 12B45b
- IOKitPersonalities
-
- com.1Revenger1.ECEnabler
-
- CFBundleIdentifier
- com.1Revenger1.ECEnabler
- IOClass
- ECEnabler
- IOClassCategory
- ECEnabler
- IOProviderClass
- IOResources
- IOResourceMatch
- IOKit
-
-
- LSMinimumSystemVersion
- 10.7
- OSBundleLibraries
-
- as.vit9696.Lilu
- 1.4.9
- com.apple.kpi.bsd
- 11.0.0
- com.apple.kpi.dsep
- 11.0.0
- com.apple.kpi.iokit
- 11.0.0
- com.apple.kpi.libkern
- 11.0.0
- com.apple.kpi.mach
- 11.0.0
- com.apple.kpi.unsupported
- 11.0.0
-
- OSBundleRequired
- Root
-
-
diff --git a/EFI-OpenCore/EFI/OC/Kexts/ECEnabler.kext/Contents/MacOS/ECEnabler b/EFI-OpenCore/EFI/OC/Kexts/ECEnabler.kext/Contents/MacOS/ECEnabler
deleted file mode 100755
index 9854863..0000000
Binary files a/EFI-OpenCore/EFI/OC/Kexts/ECEnabler.kext/Contents/MacOS/ECEnabler and /dev/null differ
diff --git a/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_en_SIPIsDisabled.mp3 b/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_en_SIPIsDisabled.mp3
new file mode 100644
index 0000000..9e1ba7e
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_en_SIPIsDisabled.mp3 differ
diff --git a/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_en_SIPIsEnabled.mp3 b/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_en_SIPIsEnabled.mp3
new file mode 100644
index 0000000..9650f75
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_en_SIPIsEnabled.mp3 differ
diff --git a/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_ru_SIPIsDisabled.mp3 b/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_ru_SIPIsDisabled.mp3
new file mode 100644
index 0000000..7d6564b
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_ru_SIPIsDisabled.mp3 differ
diff --git a/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_ru_SIPIsEnabled.mp3 b/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_ru_SIPIsEnabled.mp3
new file mode 100644
index 0000000..ad4e821
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Resources/Audio/OCEFIAudio_ru_SIPIsEnabled.mp3 differ
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldAppleRecv.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/AppleRecv.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldAppleRecv.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/AppleRecv.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldAppleTM.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/AppleTM.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldAppleTM.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/AppleTM.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/BtnFocus.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/BtnFocus.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/BtnFocus.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/BtnFocus.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldCursor.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Cursor.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldCursor.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Cursor.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldDot.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Dot.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldDot.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Dot.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldEnter.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Enter.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldEnter.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Enter.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldExtAppleRecv.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/ExtAppleRecv.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldExtAppleRecv.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/ExtAppleRecv.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldExtAppleTM.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/ExtAppleTM.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldExtAppleTM.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/ExtAppleTM.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldExtHardDrive.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/ExtHardDrive.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldExtHardDrive.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/ExtHardDrive.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldHardDrive.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/HardDrive.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldHardDrive.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/HardDrive.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldLeft.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Left.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldLeft.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Left.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldLock.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Lock.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldLock.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Lock.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldPassword.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Password.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldPassword.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Password.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldRestart.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Restart.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldRestart.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Restart.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldRight.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Right.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldRight.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Right.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldSelected.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Selected.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldSelected.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Selected.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldSelector.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Selector.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldSelector.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Selector.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldSetDefault.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/SetDefault.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldSetDefault.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/SetDefault.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldShell.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Shell.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldShell.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Shell.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldShutDown.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/ShutDown.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldShutDown.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/ShutDown.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldTool.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Tool.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldTool.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Tool.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldWindows.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Windows.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldWindows.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Chardonnay/Windows.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernAppleRecv.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/AppleRecv.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernAppleRecv.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/AppleRecv.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernAppleTM.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/AppleTM.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernAppleTM.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/AppleTM.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernBtnFocus.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/BtnFocus.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernBtnFocus.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/BtnFocus.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernCursor.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Cursor.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernCursor.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Cursor.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernDot.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Dot.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernDot.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Dot.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernEnter.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Enter.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernEnter.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Enter.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernExtAppleRecv.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/ExtAppleRecv.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernExtAppleRecv.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/ExtAppleRecv.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernExtAppleTM.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/ExtAppleTM.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernExtAppleTM.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/ExtAppleTM.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernExtHardDrive.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/ExtHardDrive.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernExtHardDrive.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/ExtHardDrive.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernHardDrive.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/HardDrive.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernHardDrive.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/HardDrive.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernLeft.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Left.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernLeft.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Left.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernLock.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Lock.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernLock.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Lock.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernPassword.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Password.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernPassword.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Password.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Restart.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Restart.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Restart.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Restart.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernRight.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Right.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernRight.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Right.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernSelected.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Selected.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernSelected.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Selected.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernSelector.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Selector.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernSelector.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Selector.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernSetDefault.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/SetDefault.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernSetDefault.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/SetDefault.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernShell.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Shell.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernShell.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Shell.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ShutDown.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/ShutDown.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ShutDown.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/ShutDown.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernTool.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Tool.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernTool.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Tool.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernWindows.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Windows.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernWindows.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/GoldenGate/Windows.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/AppleRecv.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/AppleRecv.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/AppleRecv.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/AppleRecv.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/AppleTM.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/AppleTM.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/AppleTM.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/AppleTM.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/OldBtnFocus.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/BtnFocus.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/OldBtnFocus.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/BtnFocus.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Cursor.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Cursor.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Cursor.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Cursor.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Dot.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Dot.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Dot.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Dot.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Enter.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Enter.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Enter.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Enter.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ExtAppleRecv.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/ExtAppleRecv.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ExtAppleRecv.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/ExtAppleRecv.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ExtAppleTM.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/ExtAppleTM.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ExtAppleTM.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/ExtAppleTM.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ExtHardDrive.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/ExtHardDrive.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ExtHardDrive.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/ExtHardDrive.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/HardDrive.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/HardDrive.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/HardDrive.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/HardDrive.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Left.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Left.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Left.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Left.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Lock.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Lock.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Lock.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Lock.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Password.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Password.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Password.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Password.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernRestart.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Restart.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernRestart.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Restart.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Right.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Right.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Right.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Right.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Selected.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Selected.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Selected.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Selected.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Selector.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Selector.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Selector.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Selector.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/SetDefault.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/SetDefault.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/SetDefault.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/SetDefault.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Shell.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Shell.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Shell.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Shell.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/ModernShutDown.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/ShutDown.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/ModernShutDown.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/ShutDown.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Tool.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Tool.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Tool.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Tool.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Image/Windows.icns b/EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Windows.icns
similarity index 100%
rename from EFI-OpenCore/EFI/OC/Resources/Image/Windows.icns
rename to EFI-OpenCore/EFI/OC/Resources/Image/Acidanthera/Syrah/Windows.icns
diff --git a/EFI-OpenCore/EFI/OC/Resources/Label/SIPDisabled.l2x b/EFI-OpenCore/EFI/OC/Resources/Label/SIPDisabled.l2x
new file mode 100755
index 0000000..73293ba
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Resources/Label/SIPDisabled.l2x differ
diff --git a/EFI-OpenCore/EFI/OC/Resources/Label/SIPDisabled.lbl b/EFI-OpenCore/EFI/OC/Resources/Label/SIPDisabled.lbl
new file mode 100755
index 0000000..6a16cf9
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Resources/Label/SIPDisabled.lbl differ
diff --git a/EFI-OpenCore/EFI/OC/Resources/Label/SIPEnabled.l2x b/EFI-OpenCore/EFI/OC/Resources/Label/SIPEnabled.l2x
new file mode 100755
index 0000000..41faffa
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Resources/Label/SIPEnabled.l2x differ
diff --git a/EFI-OpenCore/EFI/OC/Resources/Label/SIPEnabled.lbl b/EFI-OpenCore/EFI/OC/Resources/Label/SIPEnabled.lbl
new file mode 100755
index 0000000..c943e6a
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Resources/Label/SIPEnabled.lbl differ
diff --git a/EFI-OpenCore/EFI/OC/config.plist b/EFI-OpenCore/EFI/OC/config.plist
index db3a008..0566df0 100644
--- a/EFI-OpenCore/EFI/OC/config.plist
+++ b/EFI-OpenCore/EFI/OC/config.plist
@@ -30,6 +30,14 @@
Path
SSDT-AC.aml
+
+ Comment
+ Patch Battery
+ Enabled
+
+ Path
+ SSDT-Battery.aml
+
Comment
Battery: fix access to 16byte-EC-field HWAC: depends on / patches/ OpenCore Patches/ HWAC.plist
@@ -1422,24 +1430,6 @@
PlistPath
Contents/Info.plist
-
- Arch
- x86_64
- BundlePath
- ECEnabler.kext
- Comment
- Allows reading Embedded Controller fields over 1 byte long
- Enabled
-
- ExecutablePath
- Contents/MacOS/ECEnabler
- MaxKernel
-
- MinKernel
-
- PlistPath
- Contents/Info.plist
-
Block
@@ -1538,7 +1528,7 @@
PickerMode
External
PickerVariant
- Auto
+ Acidanthera\GoldenGate
PollAppleHotKeys
ShowPicker
diff --git a/README.md b/README.md
index ce68c67..ba86238 100644
--- a/README.md
+++ b/README.md
@@ -26,14 +26,13 @@
##### Recent | [Changelog Archive](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/CHANGELOG.md)
-> ### 2021-6-8
+> ### 2021-6-21
#### Changed
-- OC to 0.7.0 and upgraded various Acidanthera kexts.
-- Big Sur to 11.4
-- Deprecate `SSDT-Battery` in favor of `ECEnabler.kext`
-- Fixed Brightness Adjustment issue (forgot to add patch entry when removing AppleBacklightSmoother.kext two commits back)
+- Fixed `Resources` folder structuring and added new support files.
+- Revert `ECEnabler.kext` in favor of `SSDT-Battery` (`ECEnabler` had some trouble updating charge level for me).
+- Fix brightness adjustment patch.
#### Notice
- This will likely be the last repo update until macOS Monterey is stable. At which I plan:
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 170cce8..6a140c6 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+> ### 2021-6-21
+
+#### Changed
+
+- Fixed `Resources` folder structuring and added new support files.
+- Revert `ECEnabler.kext` in favor of `SSDT-Battery` (`ECEnabler` had some trouble updating charge level for me).
+- Fix brightness adjustment patch.
+
+#### Notice
+- This will likely be the last repo update until macOS Monterey is stable. At which I plan:
+ - Implement AX200 is the network card with the OpenIntelWireless kexts.
+
> ### 2021-6-8
#### Changed
diff --git a/patches/Legacy Patches/SSDT-Battery.dsl b/patches/SSDT-Battery.dsl
similarity index 100%
rename from patches/Legacy Patches/SSDT-Battery.dsl
rename to patches/SSDT-Battery.dsl
diff --git a/patches/SSDT-PNLF.dsl b/patches/SSDT-PNLF.dsl
index 35268fc..b019c25 100644
--- a/patches/SSDT-PNLF.dsl
+++ b/patches/SSDT-PNLF.dsl
@@ -41,7 +41,7 @@ DefinitionBlock("", "SSDT", 2, "tyler", "_PNLF", 0)
// 0x11 - 17: custom LMAX=0x7a1
// 0x12 - 18: custom LMAX=0x1499
// 0x13 - 19: CoffeeLake 0xffff
- Name (_UID, 0x16) // _UID: Unique ID
+ Name (_UID, 0x10) // _UID: Unique ID
Method (_STA, 0, NotSerialized)
{