diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cebdb4fe..e921ad86c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## 0.1.6
 - Add XHCI UEFI Driver for 3rd Party USB 3.0 Controllers
   - Allows for Boot Support from OpenCore' Picker
+- Fix UEFI output on MacPro3,1 with PC GPUs
+- Increment binaries:
+  - OpenCore 4e0ff2d (0.7.0 rolling - 05-23-2021)
 
 ## 0.1.5
 - Fix crashing when Wireless module not present
diff --git a/Resources/Build.py b/Resources/Build.py
index d68a4a25c..b9c86b6e4 100644
--- a/Resources/Build.py
+++ b/Resources/Build.py
@@ -499,7 +499,7 @@ class BuildOpenCore:
         # Add UGA to GOP layer
         if self.model in ModelArray.UGAtoGOP:
             print("- Adding UGA to GOP Patch")
-            self.config["UEFI"]["Output"]["GopPassThrough"] = True
+            self.config["UEFI"]["Output"]["GopPassThrough"] = "Apple"
 
         # ThirdPartDrives Check
         if self.model not in ModelArray.NoSATAPatch:
diff --git a/Resources/Constants.py b/Resources/Constants.py
index 255a9897c..e5348ab29 100644
--- a/Resources/Constants.py
+++ b/Resources/Constants.py
@@ -10,8 +10,8 @@ from pathlib import Path
 class Constants:
     def __init__(self):
         self.patcher_version = "0.1.6"
-        self.opencore_commit = "65cc81b - 05-03-2021"
-        self.opencore_version = "0.6.9"
+        self.opencore_commit = "4e0ff2d - 05-23-2021"
+        self.opencore_version = "0.7.0"
         self.lilu_version = "1.5.3"
         self.whatevergreen_version = "1.4.9"
         self.airportbcrmfixup_version = "2.1.2"
@@ -127,11 +127,11 @@ class Constants:
     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")
-    
+
     # Mount Location
     @property
     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")
diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index 086015a7a..268d343df 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -975,6 +975,8 @@
 			<true/>
 			<key>PowerTimeoutKernelPanic</key>
 			<false/>
+			<key>ProvideCurrentCpuInfo</key>
+			<false/>
 			<key>SetApfsTrimTimeout</key>
 			<integer>-1</integer>
 			<key>ThirdPartyDrives</key>
@@ -1015,7 +1017,7 @@
 			<key>PickerMode</key>
 			<string>External</string>
 			<key>PickerVariant</key>
-			<string>Modern</string>
+			<string>Acidanthera\GoldenGate</string>
 			<key>PollAppleHotKeys</key>
 			<true/>
 			<key>ShowPicker</key>
@@ -1090,6 +1092,8 @@
 				<string>BootKicker.efi</string>
 				<key>Enabled</key>
 				<true/>
+				<key>Flavour</key>
+				<string>Auto</string>
 				<key>Path</key>
 				<string>BootKicker.efi</string>
 				<key>RealPath</key>
@@ -1106,6 +1110,8 @@
 				<string>OpenShell.efi</string>
 				<key>Comment</key>
 				<string>OpenShell.efi</string>
+				<key>Flavour</key>
+				<string>OpenShell:UEFIShell:Shell</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
@@ -1642,7 +1648,7 @@
 			<key>ForceResolution</key>
 			<false/>
 			<key>GopPassThrough</key>
-			<false/>
+			<string>Disabled</string>
 			<key>IgnoreTextInGraphics</key>
 			<false/>
 			<key>ProvideConsoleGop</key>
@@ -1668,6 +1674,8 @@
 			<true/>
 			<key>AppleDebugLog</key>
 			<true/>
+			<key>AppleEg2Info</key>
+			<false/>
 			<key>AppleFramebufferInfo</key>
 			<false/>
 			<key>AppleImageConversion</key>
diff --git a/payloads/Icon/Resources.zip b/payloads/Icon/Resources.zip
index ab2200d5f..5c09ddccd 100644
Binary files a/payloads/Icon/Resources.zip and b/payloads/Icon/Resources.zip differ
diff --git a/payloads/OpenCore/OpenCore-DEBUG.zip b/payloads/OpenCore/OpenCore-DEBUG.zip
index 36bcd2fff..413e0f070 100644
Binary files a/payloads/OpenCore/OpenCore-DEBUG.zip and b/payloads/OpenCore/OpenCore-DEBUG.zip differ
diff --git a/payloads/OpenCore/OpenCore-RELEASE.zip b/payloads/OpenCore/OpenCore-RELEASE.zip
index 4ac872f14..09301368d 100644
Binary files a/payloads/OpenCore/OpenCore-RELEASE.zip and b/payloads/OpenCore/OpenCore-RELEASE.zip differ