diff --git a/EFI/CLOVER/ACPI/patched/DSDT.aml b/EFI/CLOVER/ACPI/patched/DSDT.aml
index 1e0faa2..a8bbe36 100755
Binary files a/EFI/CLOVER/ACPI/patched/DSDT.aml and b/EFI/CLOVER/ACPI/patched/DSDT.aml differ
diff --git a/EFI/CLOVER/ACPI/patched/ssdt-2.aml b/EFI/CLOVER/ACPI/patched/ssdt-2.aml
new file mode 100755
index 0000000..a7d6b48
Binary files /dev/null and b/EFI/CLOVER/ACPI/patched/ssdt-2.aml differ
diff --git a/EFI/CLOVER/config-backup.plist b/EFI/CLOVER/config-backup.plist
index c1d0c3d..a62200e 100755
--- a/EFI/CLOVER/config-backup.plist
+++ b/EFI/CLOVER/config-backup.plist
@@ -21,13 +21,19 @@
 				<key>Signature</key>
 				<string>SSDT</string>
 				<key>TableId</key>
-				<string>CpuPm</string>
+				<string>Cpu0Ist</string>
 			</dict>
 			<dict>
 				<key>Signature</key>
 				<string>SSDT</string>
 				<key>TableId</key>
-				<string>Cpu0Ist</string>
+				<string>CpuSsdt</string>
+			</dict>
+			<dict>
+				<key>Signature</key>
+				<string>SSDT</string>
+				<key>TableId</key>
+				<string>CpuPm</string>
 			</dict>
 		</array>
 		<key>SSDT</key>
@@ -41,7 +47,7 @@
 	<key>Boot</key>
 	<dict>
 		<key>Arguments</key>
-		<string>-xcpm nvda_drv=1 kext-dev-mode=1 rootless=0</string>
+		<string>-xcpm kext-dev-mode=1 rootless=0</string>
 		<key>Debug</key>
 		<false/>
 		<key>DefaultVolume</key>
@@ -64,14 +70,10 @@
 	<dict>
 		<key>USB</key>
 		<dict>
-			<key>AddClockID</key>
-			<true/>
 			<key>FixOwnership</key>
-			<true/>
-			<key>HighCurrent</key>
-			<true/>
+			<false/>
 			<key>Inject</key>
-			<true/>
+			<false/>
 		</dict>
 	</dict>
 	<key>DisableDrivers</key>
@@ -123,8 +125,6 @@
 			<key>NVidia</key>
 			<false/>
 		</dict>
-		<key>InjectEDID</key>
-		<true/>
 		<key>NvidiaGeneric</key>
 		<true/>
 		<key>NvidiaSingle</key>
@@ -148,38 +148,6 @@
 		<true/>
 		<key>KextsToPatch</key>
 		<array>
-			<dict>
-				<key>Comment</key>
-				<string>t1-AppleHDA/Resources/xml&gt;zml</string>
-				<key>Disabled</key>
-				<false/>
-				<key>Find</key>
-				<data>
-				eG1sLnps
-				</data>
-				<key>Name</key>
-				<string>AppleHDA</string>
-				<key>Replace</key>
-				<data>
-				em1sLnps
-				</data>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>10.11-SKL530-Port_0-DP2HDMI</string>
-				<key>Disabled</key>
-				<false/>
-				<key>Find</key>
-				<data>
-				/wAAAAEAAABAAAAA
-				</data>
-				<key>Name</key>
-				<string>AppleIntelSKLGraphicsFramebuffer</string>
-				<key>Replace</key>
-				<data>
-				AAAIAAAIAACCAAAA
-				</data>
-			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>t1-10.9-10.12-AppleHDA/Realtek ALC892</string>
@@ -198,18 +166,18 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>External icons patch</string>
+				<string>t1-AppleHDA/Resources/xml&gt;zml</string>
 				<key>Disabled</key>
 				<false/>
 				<key>Find</key>
 				<data>
-				RXh0ZXJuYWw=
+				eG1sLnps
 				</data>
 				<key>Name</key>
-				<string>AppleAHCIPort</string>
+				<string>AppleHDA</string>
 				<key>Replace</key>
 				<data>
-				SW50ZXJuYWw=
+				em1sLnps
 				</data>
 			</dict>
 			<dict>
@@ -230,18 +198,34 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>AppleGraphicsDevicePolicy (board-id) Patch (c) Pike R. Alpha</string>
+				<string>External icons patch</string>
 				<key>Disabled</key>
 				<false/>
 				<key>Find</key>
 				<data>
-				Ym9hcmQtaWQ=
+				RXh0ZXJuYWw=
 				</data>
 				<key>Name</key>
-				<string>AppleGraphicsDevicePolicy</string>
+				<string>AppleAHCIPort</string>
 				<key>Replace</key>
 				<data>
-				Ym9hcmQtaXg=
+				SW50ZXJuYWw=
+				</data>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>10.11-SKL530-Port_0-DP2HDMI</string>
+				<key>Disabled</key>
+				<false/>
+				<key>Find</key>
+				<data>
+				/wAAAAEAAABAAAAA
+				</data>
+				<key>Name</key>
+				<string>AppleIntelSKLGraphicsFramebuffer</string>
+				<key>Replace</key>
+				<data>
+				AAAIAAAIAACCAAAA
 				</data>
 			</dict>
 			<dict>
@@ -260,6 +244,22 @@
 				vhcAAACQ
 				</data>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>AppleGraphicsDevicePolicy (board-id) Patch (c) Pike R. Alpha</string>
+				<key>Disabled</key>
+				<false/>
+				<key>Find</key>
+				<data>
+				Ym9hcmQtaWQ=
+				</data>
+				<key>Name</key>
+				<string>AppleGraphicsDevicePolicy</string>
+				<key>Replace</key>
+				<data>
+				Ym9hcmQtaXg=
+				</data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>t1-10.12-AppleHDA/Realtek ALC...</string>
@@ -287,7 +287,7 @@
 		<key>MLB</key>
 		<string>C02KXS3UF8JC</string>
 		<key>ROM</key>
-		<string>ac:7f:3e:f3:1d:e9</string>
+		<string>UseMacAddr0</string>
 	</dict>
 	<key>SMBIOS</key>
 	<dict>
@@ -332,6 +332,8 @@
 		<string>Yes</string>
 		<key>InjectSystemID</key>
 		<true/>
+		<key>NvidiaWeb</key>
+		<true/>
 	</dict>
 </dict>
 </plist>
diff --git a/EFI/CLOVER/config.plist b/EFI/CLOVER/config.plist
index 180ed20..a62200e 100755
--- a/EFI/CLOVER/config.plist
+++ b/EFI/CLOVER/config.plist
@@ -21,13 +21,19 @@
 				<key>Signature</key>
 				<string>SSDT</string>
 				<key>TableId</key>
-				<string>CpuPm</string>
+				<string>Cpu0Ist</string>
 			</dict>
 			<dict>
 				<key>Signature</key>
 				<string>SSDT</string>
 				<key>TableId</key>
-				<string>Cpu0Ist</string>
+				<string>CpuSsdt</string>
+			</dict>
+			<dict>
+				<key>Signature</key>
+				<string>SSDT</string>
+				<key>TableId</key>
+				<string>CpuPm</string>
 			</dict>
 		</array>
 		<key>SSDT</key>
@@ -41,7 +47,7 @@
 	<key>Boot</key>
 	<dict>
 		<key>Arguments</key>
-		<string>-xcpm nvda_drv=1 kext-dev-mode=1 rootless=0</string>
+		<string>-xcpm kext-dev-mode=1 rootless=0</string>
 		<key>Debug</key>
 		<false/>
 		<key>DefaultVolume</key>
@@ -62,21 +68,12 @@
 	</dict>
 	<key>Devices</key>
 	<dict>
-		<key>Audio</key>
-		<dict>
-			<key>Inject</key>
-			<string>1</string>
-		</dict>
 		<key>USB</key>
 		<dict>
-			<key>AddClockID</key>
-			<true/>
 			<key>FixOwnership</key>
-			<true/>
-			<key>HighCurrent</key>
-			<true/>
+			<false/>
 			<key>Inject</key>
-			<true/>
+			<false/>
 		</dict>
 	</dict>
 	<key>DisableDrivers</key>
@@ -153,50 +150,18 @@
 		<array>
 			<dict>
 				<key>Comment</key>
-				<string>AppleGraphicsDevicePolicy (board-id) Patch (c) Pike R. Alpha</string>
+				<string>t1-10.9-10.12-AppleHDA/Realtek ALC892</string>
 				<key>Disabled</key>
 				<false/>
 				<key>Find</key>
 				<data>
-				Ym9hcmQtaWQ=
+				ixnUEQ==
 				</data>
 				<key>Name</key>
-				<string>AppleGraphicsDevicePolicy</string>
+				<string>AppleHDA</string>
 				<key>Replace</key>
 				<data>
-				Ym9hcmQtaXg=
-				</data>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>10.11-SKL530-Port_0-DP2HDMI</string>
-				<key>Disabled</key>
-				<false/>
-				<key>Find</key>
-				<data>
-				/wAAAAEAAABAAAAA
-				</data>
-				<key>Name</key>
-				<string>AppleIntelSKLGraphicsFramebuffer</string>
-				<key>Replace</key>
-				<data>
-				AAAIAAAIAACCAAAA
-				</data>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>change 15 port limit to 30 in AppleUSBXHCIPCI</string>
-				<key>Disabled</key>
-				<false/>
-				<key>Find</key>
-				<data>
-				g72M/v//EA==
-				</data>
-				<key>Name</key>
-				<string>AppleUSBXHCIPCI</string>
-				<key>Replace</key>
-				<data>
-				g72M/v//Hw==
+				kgjsEA==
 				</data>
 			</dict>
 			<dict>
@@ -215,6 +180,22 @@
 				em1sLnps
 				</data>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>change 15 port limit to 30 in AppleUSBXHCIPCI</string>
+				<key>Disabled</key>
+				<false/>
+				<key>Find</key>
+				<data>
+				g72M/v//EA==
+				</data>
+				<key>Name</key>
+				<string>AppleUSBXHCIPCI</string>
+				<key>Replace</key>
+				<data>
+				g72M/v//Hw==
+				</data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>External icons patch</string>
@@ -233,18 +214,18 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>t1-10.9-10.12-AppleHDA/Realtek ALC892</string>
+				<string>10.11-SKL530-Port_0-DP2HDMI</string>
 				<key>Disabled</key>
 				<false/>
 				<key>Find</key>
 				<data>
-				ixnUEQ==
+				/wAAAAEAAABAAAAA
 				</data>
 				<key>Name</key>
-				<string>AppleHDA</string>
+				<string>AppleIntelSKLGraphicsFramebuffer</string>
 				<key>Replace</key>
 				<data>
-				kgjsEA==
+				AAAIAAAIAACCAAAA
 				</data>
 			</dict>
 			<dict>
@@ -263,6 +244,22 @@
 				vhcAAACQ
 				</data>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>AppleGraphicsDevicePolicy (board-id) Patch (c) Pike R. Alpha</string>
+				<key>Disabled</key>
+				<false/>
+				<key>Find</key>
+				<data>
+				Ym9hcmQtaWQ=
+				</data>
+				<key>Name</key>
+				<string>AppleGraphicsDevicePolicy</string>
+				<key>Replace</key>
+				<data>
+				Ym9hcmQtaXg=
+				</data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>t1-10.12-AppleHDA/Realtek ALC...</string>
@@ -290,7 +287,7 @@
 		<key>MLB</key>
 		<string>C02KXS3UF8JC</string>
 		<key>ROM</key>
-		<string>ac:7f:3e:f3:1d:e9</string>
+		<string>UseMacAddr0</string>
 	</dict>
 	<key>SMBIOS</key>
 	<dict>
diff --git a/EFI/Microsoft/Boot/BCD b/EFI/Microsoft/Boot/BCD
index ac30a65..5168d9d 100755
Binary files a/EFI/Microsoft/Boot/BCD and b/EFI/Microsoft/Boot/BCD differ
diff --git a/EFI/Microsoft/Boot/BCD.LOG b/EFI/Microsoft/Boot/BCD.LOG
index 8117a5b..3d0234b 100755
Binary files a/EFI/Microsoft/Boot/BCD.LOG and b/EFI/Microsoft/Boot/BCD.LOG differ
diff --git a/EFI/Microsoft/Boot/BOOTSTAT.DAT b/EFI/Microsoft/Boot/BOOTSTAT.DAT
index f64295f..bf0f290 100755
Binary files a/EFI/Microsoft/Boot/BOOTSTAT.DAT and b/EFI/Microsoft/Boot/BOOTSTAT.DAT differ