diff --git a/OC-Booter/EFI/OC/ACPI/SSDT-AWAC.aml b/OC-Booter/EFI/OC/ACPI/SSDT-AWAC.aml
new file mode 100755
index 0000000..5189bf4
Binary files /dev/null and b/OC-Booter/EFI/OC/ACPI/SSDT-AWAC.aml differ
diff --git a/OC-Booter/EFI/OC/ACPI/SSDT-EC.aml b/OC-Booter/EFI/OC/ACPI/SSDT-EC.aml
deleted file mode 100755
index 6574273..0000000
Binary files a/OC-Booter/EFI/OC/ACPI/SSDT-EC.aml and /dev/null differ
diff --git a/OC-Booter/EFI/OC/ACPI/SSDT-NVRAM-PMC.aml b/OC-Booter/EFI/OC/ACPI/SSDT-NVRAM-PMC.aml
new file mode 100755
index 0000000..be3970d
Binary files /dev/null and b/OC-Booter/EFI/OC/ACPI/SSDT-NVRAM-PMC.aml differ
diff --git a/OC-Booter/EFI/OC/ACPI/SSDT-PM.aml b/OC-Booter/EFI/OC/ACPI/SSDT-POWER-PM.aml
similarity index 100%
rename from OC-Booter/EFI/OC/ACPI/SSDT-PM.aml
rename to OC-Booter/EFI/OC/ACPI/SSDT-POWER-PM.aml
diff --git a/OC-Booter/EFI/OC/ACPI/plug-xcpm.aml b/OC-Booter/EFI/OC/ACPI/SSDT0-POWER-XCMP.aml
similarity index 100%
rename from OC-Booter/EFI/OC/ACPI/plug-xcpm.aml
rename to OC-Booter/EFI/OC/ACPI/SSDT0-POWER-XCMP.aml
diff --git a/OC-Booter/EFI/OC/Drivers/ApfsDriverLoader.efi b/OC-Booter/EFI/OC/Drivers/ApfsDriverLoader.efi
deleted file mode 100755
index c05e7e0..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/ApfsDriverLoader.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/AppleKeyFeeder.efi b/OC-Booter/EFI/OC/Drivers/AppleKeyFeeder.efi
deleted file mode 100755
index bdbccf0..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/AppleKeyFeeder.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/AppleUiSupport.efi b/OC-Booter/EFI/OC/Drivers/AppleUiSupport.efi
deleted file mode 100755
index 5638cee..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/AppleUiSupport.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/AptioInputFix.efi b/OC-Booter/EFI/OC/Drivers/AptioInputFix.efi
deleted file mode 100755
index 1f825b3..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/AptioInputFix.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/AudioDxe.efi b/OC-Booter/EFI/OC/Drivers/AudioDxe.efi
deleted file mode 100755
index fb2be26..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/AudioDxe.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/DataHubDxe.efi b/OC-Booter/EFI/OC/Drivers/DataHubDxe.efi
deleted file mode 100755
index c4a91b5..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/DataHubDxe.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/FSInject.efi b/OC-Booter/EFI/OC/Drivers/FSInject.efi
deleted file mode 100755
index 8632bae..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/FSInject.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/HfsPlus.efi b/OC-Booter/EFI/OC/Drivers/HfsPlus.efi
new file mode 100755
index 0000000..154665a
Binary files /dev/null and b/OC-Booter/EFI/OC/Drivers/HfsPlus.efi differ
diff --git a/OC-Booter/EFI/OC/Drivers/MemoryAllocation.efi b/OC-Booter/EFI/OC/Drivers/MemoryAllocation.efi
new file mode 100755
index 0000000..6634a0e
Binary files /dev/null and b/OC-Booter/EFI/OC/Drivers/MemoryAllocation.efi differ
diff --git a/OC-Booter/EFI/OC/Drivers/NvmExpressDxe.efi b/OC-Booter/EFI/OC/Drivers/NvmExpressDxe.efi
deleted file mode 100755
index 599955a..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/NvmExpressDxe.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/UsbKbDxe.efi b/OC-Booter/EFI/OC/Drivers/UsbKbDxe.efi
deleted file mode 100755
index 4ce0ab2..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/UsbKbDxe.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/VBoxHfs.efi b/OC-Booter/EFI/OC/Drivers/VBoxHfs.efi
deleted file mode 100755
index ec6d0e6..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/VBoxHfs.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Drivers/VirtualSmc.efi b/OC-Booter/EFI/OC/Drivers/VirtualSmc.efi
deleted file mode 100755
index 602ac44..0000000
Binary files a/OC-Booter/EFI/OC/Drivers/VirtualSmc.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Kexts/NVMeFix.kext/Contents/Info.plist b/OC-Booter/EFI/OC/Kexts/NVMeFix.kext/Contents/Info.plist
new file mode 100755
index 0000000..0b5f7dc
--- /dev/null
+++ b/OC-Booter/EFI/OC/Kexts/NVMeFix.kext/Contents/Info.plist
@@ -0,0 +1,81 @@
+
+
+
+
+ BuildMachineOSBuild
+ 18E226
+ CFBundleDevelopmentRegion
+ en
+ CFBundleExecutable
+ NVMeFix
+ CFBundleIdentifier
+ org.acidanthera.NVMeFix
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ NVMeFix
+ CFBundlePackageType
+ KEXT
+ CFBundleShortVersionString
+ 1.0.2
+ CFBundleSupportedPlatforms
+
+ MacOSX
+
+ CFBundleVersion
+ 1.0.2
+ DTCompiler
+ com.apple.compilers.llvm.clang.1_0
+ DTPlatformBuild
+ 10E1001
+ DTPlatformVersion
+ GM
+ DTSDKBuild
+ 18E219
+ DTSDKName
+ macosx10.14
+ DTXcode
+ 1020
+ DTXcodeBuild
+ 10E1001
+ IOKitPersonalities
+
+ org.acidanthera.NVMeFix
+
+ CFBundleIdentifier
+ org.acidanthera.NVMeFix
+ IOClass
+ NVMeFix
+ IOMatchCategory
+ NVMeFix
+ IOProviderClass
+ IOResources
+ IOResourceMatch
+ IOKit
+
+
+ NSHumanReadableCopyright
+ Copyright © 2019 acidanthera. All rights reserved.
+ OSBundleCompatibleVersion
+ 1.0
+ OSBundleLibraries
+
+ as.vit9696.Lilu
+ 1.4.1
+ com.apple.kpi.bsd
+ 12.0.0
+ com.apple.kpi.dsep
+ 12.0.0
+ com.apple.kpi.iokit
+ 12.0.0
+ com.apple.kpi.libkern
+ 12.0.0
+ com.apple.kpi.mach
+ 12.0.0
+ com.apple.kpi.unsupported
+ 12.0.0
+
+ OSBundleRequired
+ Root
+
+
diff --git a/OC-Booter/EFI/OC/Kexts/NVMeFix.kext/Contents/MacOS/NVMeFix b/OC-Booter/EFI/OC/Kexts/NVMeFix.kext/Contents/MacOS/NVMeFix
new file mode 100755
index 0000000..a0173b9
Binary files /dev/null and b/OC-Booter/EFI/OC/Kexts/NVMeFix.kext/Contents/MacOS/NVMeFix differ
diff --git a/OC-Booter/EFI/OC/Tools/BootKicker.efi b/OC-Booter/EFI/OC/Tools/BootKicker.efi
deleted file mode 100755
index 97ce246..0000000
Binary files a/OC-Booter/EFI/OC/Tools/BootKicker.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Tools/ChipTune.efi b/OC-Booter/EFI/OC/Tools/ChipTune.efi
deleted file mode 100755
index 89d0885..0000000
Binary files a/OC-Booter/EFI/OC/Tools/ChipTune.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Tools/CleanNvram.efi b/OC-Booter/EFI/OC/Tools/CleanNvram.efi
deleted file mode 100755
index 87f2023..0000000
Binary files a/OC-Booter/EFI/OC/Tools/CleanNvram.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Tools/GopStop.efi b/OC-Booter/EFI/OC/Tools/GopStop.efi
deleted file mode 100755
index bdc66cb..0000000
Binary files a/OC-Booter/EFI/OC/Tools/GopStop.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Tools/HdaCodecDump.efi b/OC-Booter/EFI/OC/Tools/HdaCodecDump.efi
deleted file mode 100755
index 0d68783..0000000
Binary files a/OC-Booter/EFI/OC/Tools/HdaCodecDump.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Tools/KeyTester.efi b/OC-Booter/EFI/OC/Tools/KeyTester.efi
deleted file mode 100755
index ca1af40..0000000
Binary files a/OC-Booter/EFI/OC/Tools/KeyTester.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Tools/MmapDump.efi b/OC-Booter/EFI/OC/Tools/MmapDump.efi
deleted file mode 100755
index dc94132..0000000
Binary files a/OC-Booter/EFI/OC/Tools/MmapDump.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Tools/OpenControl.efi b/OC-Booter/EFI/OC/Tools/OpenControl.efi
deleted file mode 100755
index e079541..0000000
Binary files a/OC-Booter/EFI/OC/Tools/OpenControl.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/Tools/OpenShell.efi b/OC-Booter/EFI/OC/Tools/OpenShell.efi
index 26a6e00..bebac20 100755
Binary files a/OC-Booter/EFI/OC/Tools/OpenShell.efi and b/OC-Booter/EFI/OC/Tools/OpenShell.efi differ
diff --git a/OC-Booter/EFI/OC/Tools/VerifyMsrE2.efi b/OC-Booter/EFI/OC/Tools/VerifyMsrE2.efi
deleted file mode 100755
index fa2ebe0..0000000
Binary files a/OC-Booter/EFI/OC/Tools/VerifyMsrE2.efi and /dev/null differ
diff --git a/OC-Booter/EFI/OC/config.plist b/OC-Booter/EFI/OC/config.plist
index 106bd3a..ec9f918 100755
--- a/OC-Booter/EFI/OC/config.plist
+++ b/OC-Booter/EFI/OC/config.plist
@@ -22,7 +22,7 @@
Enabled
Path
- SSDT-EC.aml
+ SSDT-AWAC.aml
Comment
@@ -30,7 +30,7 @@
Enabled
Path
- SSDT-UIAC.aml
+ SSDT-NVRAM-PMC.aml
Comment
@@ -38,7 +38,7 @@
Enabled
Path
- SSDT-USBX.aml
+ SSDT-POWER-PM.aml
Comment
@@ -46,7 +46,7 @@
Enabled
Path
- plug-xcpm.aml
+ SSDT-UIAC.aml
Comment
@@ -54,7 +54,15 @@
Enabled
Path
- SSDT-PM.aml
+ SSDT-USBX.aml
+
+
+ Comment
+
+ Enabled
+
+ Path
+ SSDT0-POWER-XCMP.aml
Delete
@@ -199,7 +207,7 @@
ProtectMemoryRegions
ProtectSecureBoot
-
+
ProtectUefiServices
ProvideCustomSlide
@@ -263,13 +271,13 @@
PciRoot(0x0)/Pci(0x1f,0x3)
AAPL,slot-name
- Internal@0,31,3
+ AAAACgAAAQ==
device_type
- Audio device
+ Cg0ADgA=
layout-id
BwAAAA==
model
- 200 Series PCH HD Audio
+ IAAOAAAMAAoN
Delete
@@ -350,13 +358,13 @@
BundlePath
- SmallTree-Intel-211-AT-PCIe-GBE.kext
+ NVMeFix.kext
Comment
Enabled
ExecutablePath
- Contents/MacOS/SmallTreeIntel82576
+ Contents/MacOS/NVMeFix
MaxKernel
MinKernel
@@ -396,6 +404,22 @@
PlistPath
Contents/Info.plist
+
+ BundlePath
+ SmallTree-Intel-211-AT-PCIe-GBE.kext
+ Comment
+
+ Enabled
+
+ ExecutablePath
+ Contents/MacOS/SmallTreeIntel82576
+ MaxKernel
+
+ MinKernel
+
+ PlistPath
+ Contents/Info.plist
+
BundlePath
USBInjectAll.kext
@@ -569,9 +593,9 @@
Quirks
AppleCpuPmCfgLock
-
+
AppleXcpmCfgLock
-
+
AppleXcpmExtraMsrs
AppleXcpmForceBoost
@@ -593,11 +617,11 @@
PanicNoKextDump
PowerTimeoutKernelPanic
-
+
ThirdPartyDrives
XhciPortLimit
-
+
Misc
@@ -613,11 +637,11 @@
HideAuxiliary
PickerAttributes
- 0
+ 1
PickerAudioAssist
PickerMode
- Builtin
+ External
PollAppleHotKeys
ShowPicker
@@ -672,9 +696,9 @@
BlacklistAppleUpdate
BootProtect
- None
+ Bootstrap
ExposeSensitiveData
- 6
+ 2
HaltLevel
2147483648
ScanPolicy
@@ -688,29 +712,15 @@
Arguments
Auxiliary
-
+
Comment
- Not signed for security reasons
- Enabled
-
- Name
- UEFI Shell
- Path
OpenShell.efi
-
-
- Arguments
-
- Auxiliary
-
- Comment
- Memory testing utility
Enabled
-
+
Name
- memcheck
+ OpenShell.efi
Path
- memcheck/memcheck.efi
+ OpenShell.efi
@@ -730,11 +740,11 @@
SystemAudioVolume
Rg==
boot-args
- -v keepsyms=1 darkwake=2 dart=0 -disablegfxfirmware
+ slide=1 -v keepsyms=1 darkwake=0
csr-active-config
5wMAAA==
prev-lang:kbd
- cnUtUlU6MjUy
+ emgtSGFuczoyNTI=
Delete
@@ -817,11 +827,11 @@
APFS
EnableJumpstart
-
+
HideVerbose
-
+
JumpstartHotPlug
-
+
MinDate
0
MinVersion
@@ -832,7 +842,7 @@
AudioCodec
0
AudioDevice
- PciRoot(0x0)/Pci(0x1b,0x0)
+ PciRoot(0x0)/Pci(0x1F,0x3)
AudioOut
0
AudioSupport
@@ -848,18 +858,9 @@
Drivers
- ApfsDriverLoader.efi
- AppleKeyFeeder.efi
- AppleUiSupport.efi
- AptioInputFix.efi
- AudioDxe.efi
- DataHubDxe.efi
- FSInject.efi
- NvmExpressDxe.efi
+ HfsPlus.efi
+ MemoryAllocation.efi
OpenRuntime.efi
- UsbKbDxe.efi
- VBoxHfs.efi
- VirtualSmc.efi
Input
@@ -899,9 +900,9 @@
ReplaceTabWithSpace
Resolution
- Max
+ 3840×2160
SanitiseClearScreen
-
+
TextRenderer
BuiltinGraphics
@@ -922,7 +923,7 @@
AppleRtcRam
AppleSmcIo
-
+
AppleUserInterfaceTheme
DataHub
@@ -941,11 +942,11 @@
Quirks
DeduplicateBootOrder
-
+
ExitBootServicesDelay
0
IgnoreInvalidFlexRatio
-
+
ReleaseUsbOwnership
RequestBootVarRouting