diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55b8ea619..a2110399c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,9 @@
 ## 0.0.20
 - Fix CPU Calculation on early MCP79 chipsets (ie. iMac9,1, MacBook5,x)
 - Increment binaries
-  - OpenCore a57d8df (0.6.8 rolling - 2021-03-28)
+  - 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
diff --git a/Resources/Constants.py b/Resources/Constants.py
index 64ea4b0e9..009d9f276 100644
--- a/Resources/Constants.py
+++ b/Resources/Constants.py
@@ -10,7 +10,7 @@ from pathlib import Path
 class Constants:
     def __init__(self):
         self.patcher_version = "0.0.20"
-        self.opencore_commit = "a57d8df - 2021-03-27"
+        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"
diff --git a/Resources/build.py b/Resources/build.py
index 3b12565cd..99a0c9867 100644
--- a/Resources/build.py
+++ b/Resources/build.py
@@ -284,7 +284,6 @@ class BuildOpenCore:
         else:
             print("- Hiding picker and enabling PollAppleHotKeys")
             self.config["Misc"]["Boot"]["ShowPicker"] = False
-            self.config["Misc"]["Boot"]["PollAppleHotKeys"] = True
         if self.constants.vault is True:
             print("- Setting Vault configuration")
             self.config["Misc"]["Security"]["Vault"] = "Secure"
diff --git a/payloads/Config/v0.6.8/config.plist b/payloads/Config/v0.6.8/config.plist
index cb86e6774..ceac1fa39 100644
--- a/payloads/Config/v0.6.8/config.plist
+++ b/payloads/Config/v0.6.8/config.plist
@@ -29,6 +29,10 @@
 		<key>Patch</key>
 		<array>
 			<dict>
+				<key>Base</key>
+				<string></string>
+				<key>BaseSkip</key>
+				<integer>0</integer>
 				<key>Comment</key>
 				<string>XHC1 to SHC1</string>
 				<key>Count</key>
@@ -55,6 +59,10 @@
 				<data></data>
 			</dict>
 			<dict>
+				<key>Base</key>
+				<string></string>
+				<key>BaseSkip</key>
+				<integer>0</integer>
 				<key>Comment</key>
 				<string>EHC1 to EH01</string>
 				<key>Count</key>
@@ -81,6 +89,10 @@
 				<data></data>
 			</dict>
 			<dict>
+				<key>Base</key>
+				<string></string>
+				<key>BaseSkip</key>
+				<integer>0</integer>
 				<key>Comment</key>
 				<string>EHC2 to EH02</string>
 				<key>Count</key>
@@ -841,7 +853,7 @@
 			<key>PickerVariant</key>
 			<string>Modern</string>
 			<key>PollAppleHotKeys</key>
-			<false/>
+			<true/>
 			<key>ShowPicker</key>
 			<true/>
 			<key>TakeoffDelay</key>
@@ -1183,6 +1195,21 @@
 			<key>MinVersion</key>
 			<integer>0</integer>
 		</dict>
+		<key>AppleInput</key>
+		<dict>
+			<key>AppleEvent</key>
+			<string>Builtin</string>
+			<key>CustomDelays</key>
+			<string>Disabled</string>
+			<key>KeyInitialDelay</key>
+			<integer>0</integer>
+			<key>KeySubsequentDelay</key>
+			<integer>5</integer>
+			<key>PointerSpeedDiv</key>
+			<integer>1</integer>
+			<key>PointerSpeedMul</key>
+			<integer>1</integer>
+		</dict>
 		<key>Audio</key>
 		<dict>
 			<key>AudioCodec</key>
@@ -1264,8 +1291,6 @@
 			<true/>
 			<key>AppleDebugLog</key>
 			<true/>
-			<key>AppleEvent</key>
-			<true/>
 			<key>AppleFramebufferInfo</key>
 			<false/>
 			<key>AppleImageConversion</key>
diff --git a/payloads/Kexts/Acidanthera/Lilu-v1.5.1.zip b/payloads/Kexts/Acidanthera/Lilu-v1.5.1.zip
deleted file mode 100644
index 4f1334979..000000000
Binary files a/payloads/Kexts/Acidanthera/Lilu-v1.5.1.zip and /dev/null differ
diff --git a/payloads/Kexts/Acidanthera/Lilu-v1.5.2.zip b/payloads/Kexts/Acidanthera/Lilu-v1.5.2.zip
new file mode 100644
index 000000000..16fe6fbd2
Binary files /dev/null and b/payloads/Kexts/Acidanthera/Lilu-v1.5.2.zip differ
diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.4.8.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.4.8.zip
deleted file mode 100644
index f3d2a0dc4..000000000
Binary files a/payloads/Kexts/Acidanthera/WhateverGreen-v1.4.8.zip and /dev/null differ
diff --git a/payloads/Kexts/Acidanthera/WhateverGreen-v1.4.9.zip b/payloads/Kexts/Acidanthera/WhateverGreen-v1.4.9.zip
new file mode 100644
index 000000000..97db6b54c
Binary files /dev/null and b/payloads/Kexts/Acidanthera/WhateverGreen-v1.4.9.zip differ
diff --git a/payloads/OpenCore/OpenCore-DEBUG-v0.6.8.zip b/payloads/OpenCore/OpenCore-DEBUG-v0.6.8.zip
index 778de7fd0..d1b79dee6 100644
Binary files a/payloads/OpenCore/OpenCore-DEBUG-v0.6.8.zip and b/payloads/OpenCore/OpenCore-DEBUG-v0.6.8.zip differ
diff --git a/payloads/OpenCore/OpenCore-RELEASE-v0.6.8.zip b/payloads/OpenCore/OpenCore-RELEASE-v0.6.8.zip
index 1bd80fa8d..42b0024c3 100644
Binary files a/payloads/OpenCore/OpenCore-RELEASE-v0.6.8.zip and b/payloads/OpenCore/OpenCore-RELEASE-v0.6.8.zip differ