diff --git a/.DS_Store b/.DS_Store
index abe022c..2bb7fec 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/EFI/.DS_Store b/EFI/.DS_Store
index e66d985..30b0175 100644
Binary files a/EFI/.DS_Store and b/EFI/.DS_Store differ
diff --git a/EFI/BOOT/.DS_Store b/EFI/BOOT/.DS_Store
new file mode 100644
index 0000000..bbee584
Binary files /dev/null and b/EFI/BOOT/.DS_Store differ
diff --git a/EFI/BOOT/BOOTx64.efi b/EFI/BOOT/BOOTx64.efi
index 571630d..1142560 100755
Binary files a/EFI/BOOT/BOOTx64.efi and b/EFI/BOOT/BOOTx64.efi differ
diff --git a/EFI/OC/.DS_Store b/EFI/OC/.DS_Store
index 10e9735..3fbc43b 100644
Binary files a/EFI/OC/.DS_Store and b/EFI/OC/.DS_Store differ
diff --git a/EFI/OC/ACPI/.DS_Store b/EFI/OC/ACPI/.DS_Store
new file mode 100644
index 0000000..a0491f2
Binary files /dev/null and b/EFI/OC/ACPI/.DS_Store differ
diff --git a/EFI/OC/ACPI/SSDT-DDGP.aml b/EFI/OC/ACPI/SSDT-DDGPU.aml
similarity index 100%
rename from EFI/OC/ACPI/SSDT-DDGP.aml
rename to EFI/OC/ACPI/SSDT-DDGPU.aml
diff --git a/EFI/OC/ACPI/SSDT-EH01.aml b/EFI/OC/ACPI/SSDT-EH01.aml
new file mode 100755
index 0000000..1392fed
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-EH01.aml differ
diff --git a/EFI/OC/ACPI/SSDT-XHC.aml b/EFI/OC/ACPI/SSDT-XHC.aml
new file mode 100755
index 0000000..9ff4c59
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-XHC.aml differ
diff --git a/EFI/OC/Config.plist b/EFI/OC/Config.plist
index 7fc033a..e290db2 100755
--- a/EFI/OC/Config.plist
+++ b/EFI/OC/Config.plist
@@ -14,6 +14,22 @@
 				<key>Path</key>
 				<string>SSDT-PLUG.aml</string>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>EH01</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Path</key>
+				<string>SSDT-EH01.aml</string>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>XHC</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Path</key>
+				<string>SSDT-XHC.aml</string>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>Backlight, with Whatevergreen applbkl=1</string>
@@ -116,7 +132,7 @@
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-DDGP.aml</string>
+				<string>SSDT-DDGPU.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -131,6 +147,42 @@
 		<array/>
 		<key>Patch</key>
 		<array>
+			<dict>
+				<key>Comment</key>
+				<string>_UPC to XUPC(all)</string>
+				<key>Count</key>
+				<integer>0</integer>
+				<key>Enabled</key>
+				<true/>
+				<key>Find</key>
+				<data>
+				X1VQQw==
+				</data>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data>
+				</data>
+				<key>OemTableId</key>
+				<data>
+				AAAAAAAAAAA=
+				</data>
+				<key>Replace</key>
+				<data>
+				WFVQQw==
+				</data>
+				<key>ReplaceMask</key>
+				<data>
+				</data>
+				<key>Skip</key>
+				<integer>0</integer>
+				<key>TableLength</key>
+				<integer>0</integer>
+				<key>TableSignature</key>
+				<data>
+				AAAAAA==
+				</data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>battery BAT0:GBIF03 to XBIF03</string>
@@ -657,7 +709,7 @@
 			<key>FadtEnableReset</key>
 			<false/>
 			<key>NormalizeHeaders</key>
-			<false/>
+			<true/>
 			<key>RebaseRegions</key>
 			<false/>
 			<key>ResetHwSig</key>
@@ -668,6 +720,25 @@
 	</dict>
 	<key>Booter</key>
 	<dict>
+		<key>MmioWhitelist</key>
+		<array>
+			<dict>
+				<key>Address</key>
+				<integer>4275159040</integer>
+				<key>Comment</key>
+				<string>Haswell: SB_RCBA is a 0x4 page memory region, containing SPI_BASE at 0x3800 (SPI_BASE_ADDRESS)</string>
+				<key>Enabled</key>
+				<false/>
+			</dict>
+			<dict>
+				<key>Address</key>
+				<integer>4278190080</integer>
+				<key>Comment</key>
+				<string>Generic: PCI root is a 0x1000 page memory region used by some firmwares</string>
+				<key>Enabled</key>
+				<false/>
+			</dict>
+		</array>
 		<key>Quirks</key>
 		<dict>
 			<key>AvoidRuntimeDefrag</key>
@@ -986,22 +1057,6 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
-			<dict>
-				<key>BundlePath</key>
-				<string>USBPorts.kext</string>
-				<key>Comment</key>
-				<string>USB</string>
-				<key>Enabled</key>
-				<true/>
-				<key>ExecutablePath</key>
-				<string></string>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string></string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
 			<dict>
 				<key>BundlePath</key>
 				<string>HibernationFixup.kext</string>
@@ -1071,32 +1126,16 @@
 		<array>
 			<dict>
 				<key>Comment</key>
-				<string></string>
+				<string>...Fix AppleALC (kind of)</string>
 				<key>Enabled</key>
 				<false/>
 				<key>Identifier</key>
-				<string>com.apple.driver.AppleTyMCEDriver</string>
+				<string>com.apple.driver.AppleHPET</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
 				<string></string>
 			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>Prevent Apple I2C kexts from attaching to I2C controllers</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Identifier</key>
-				<string>com.apple.driver.AppleIntelLpssI2C</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>Prevent Apple I2C kexts from attaching to I2C controllers</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Identifier</key>
-				<string>com.apple.driver.AppleIntelLpssI2CController</string>
-			</dict>
 		</array>
 		<key>Emulate</key>
 		<dict>
@@ -1264,6 +1303,8 @@
 			<false/>
 			<key>PanicNoKextDump</key>
 			<true/>
+			<key>PowerTimeoutKernelPanic</key>
+			<false/>
 			<key>ThirdPartyTrim</key>
 			<true/>
 			<key>XhciPortLimit</key>
@@ -1289,7 +1330,7 @@
 			<key>PollAppleHotKeys</key>
 			<true/>
 			<key>Resolution</key>
-			<string></string>
+			<string>1920×1080@60</string>
 			<key>ShowPicker</key>
 			<true/>
 			<key>Timeout</key>
@@ -1383,13 +1424,14 @@
 				<string>-v debug=0x100 keepsyms=1 darkwake=0 -hbfx-dump-nvram applbkl=1</string>
 				<key>csr-active-config</key>
 				<data>
-				AAAAAA==
+				5wMAAA==
 				</data>
 				<key>nvda_drv</key>
 				<data>
 				</data>
 				<key>prev-lang:kbd</key>
 				<data>
+				emgtSGFuczoyNTI=
 				</data>
 			</dict>
 		</dict>
@@ -1502,7 +1544,7 @@
 			<key>AppleUserInterfaceTheme</key>
 			<false/>
 			<key>ConsoleControl</key>
-			<false/>
+			<true/>
 			<key>DataHub</key>
 			<false/>
 			<key>DeviceProperties</key>
@@ -1525,15 +1567,17 @@
 			<key>IgnoreInvalidFlexRatio</key>
 			<true/>
 			<key>IgnoreTextInGraphics</key>
-			<false/>
+			<true/>
 			<key>ProvideConsoleGop</key>
 			<true/>
+			<key>ReconnectOnResChange</key>
+			<false/>
 			<key>ReleaseUsbOwnership</key>
 			<false/>
 			<key>ReplaceTabWithSpace</key>
 			<false/>
 			<key>RequestBootVarRouting</key>
-			<false/>
+			<true/>
 			<key>SanitiseClearScreen</key>
 			<true/>
 		</dict>
diff --git a/EFI/OC/Drivers/.DS_Store b/EFI/OC/Drivers/.DS_Store
new file mode 100644
index 0000000..01066ee
Binary files /dev/null and b/EFI/OC/Drivers/.DS_Store differ
diff --git a/EFI/OC/Drivers/FwRuntimeServices.efi b/EFI/OC/Drivers/FwRuntimeServices.efi
index 2101c07..a79ada3 100755
Binary files a/EFI/OC/Drivers/FwRuntimeServices.efi and b/EFI/OC/Drivers/FwRuntimeServices.efi differ
diff --git a/EFI/OC/Kexts/.DS_Store b/EFI/OC/Kexts/.DS_Store
index 8b4bbed..8434994 100644
Binary files a/EFI/OC/Kexts/.DS_Store and b/EFI/OC/Kexts/.DS_Store differ
diff --git a/EFI/OC/Kexts/SMCBatteryManager.kext/Contents/MacOS/SMCBatteryManager b/EFI/OC/Kexts/SMCBatteryManager.kext/Contents/MacOS/SMCBatteryManager
index fe1aa64..5cf73a3 100755
Binary files a/EFI/OC/Kexts/SMCBatteryManager.kext/Contents/MacOS/SMCBatteryManager and b/EFI/OC/Kexts/SMCBatteryManager.kext/Contents/MacOS/SMCBatteryManager differ
diff --git a/EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor b/EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor
index 6bd2487..e1f7beb 100755
Binary files a/EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor and b/EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor differ
diff --git a/EFI/OC/Kexts/SMCProcessor.kext/Contents/Info.plist b/EFI/OC/Kexts/SMCProcessor.kext/Contents/Info.plist
index 63994ac..91cb021 100755
--- a/EFI/OC/Kexts/SMCProcessor.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/SMCProcessor.kext/Contents/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.8</string>
+	<string>1.0.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,7 +25,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.8</string>
+	<string>1.0.9</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
diff --git a/EFI/OC/Kexts/SMCProcessor.kext/Contents/MacOS/SMCProcessor b/EFI/OC/Kexts/SMCProcessor.kext/Contents/MacOS/SMCProcessor
index 7f63869..d845d1d 100755
Binary files a/EFI/OC/Kexts/SMCProcessor.kext/Contents/MacOS/SMCProcessor and b/EFI/OC/Kexts/SMCProcessor.kext/Contents/MacOS/SMCProcessor differ
diff --git a/EFI/OC/Kexts/SMCSuperIO.kext/Contents/Info.plist b/EFI/OC/Kexts/SMCSuperIO.kext/Contents/Info.plist
index 25672d9..e2f1b36 100755
--- a/EFI/OC/Kexts/SMCSuperIO.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/SMCSuperIO.kext/Contents/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.8</string>
+	<string>1.0.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,7 +25,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.8</string>
+	<string>1.0.9</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
diff --git a/EFI/OC/Kexts/SMCSuperIO.kext/Contents/MacOS/SMCSuperIO b/EFI/OC/Kexts/SMCSuperIO.kext/Contents/MacOS/SMCSuperIO
index 0b4deec..caca48a 100755
Binary files a/EFI/OC/Kexts/SMCSuperIO.kext/Contents/MacOS/SMCSuperIO and b/EFI/OC/Kexts/SMCSuperIO.kext/Contents/MacOS/SMCSuperIO differ
diff --git a/EFI/OC/Kexts/USBPorts.kext/Contents/Info.plist b/EFI/OC/Kexts/USBPorts.kext/Contents/Info.plist
deleted file mode 100755
index cf380d9..0000000
--- a/EFI/OC/Kexts/USBPorts.kext/Contents/Info.plist
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleGetInfoString</key>
-	<string>1.0 Copyright © 2018 Headsoft. All rights reserved.</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.Headsoft.USBPorts</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>USBPorts</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>IOKitPersonalities</key>
-	<dict>
-		<key>MacBookPro12,1-EH01</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleUSBMergeNub</string>
-			<key>IOClass</key>
-			<string>AppleUSBMergeNub</string>
-			<key>IONameMatch</key>
-			<string>EH01</string>
-			<key>IOProbeScore</key>
-			<integer>5000</integer>
-			<key>IOProviderClass</key>
-			<string>AppleUSBEHCIPCI</string>
-			<key>IOProviderMergeProperties</key>
-			<dict>
-				<key>port-count</key>
-				<data>
-				AQAAAA==
-				</data>
-				<key>ports</key>
-				<dict>
-					<key>PR11</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>255</integer>
-						<key>port</key>
-						<data>
-						AQAAAA==
-						</data>
-					</dict>
-				</dict>
-			</dict>
-			<key>model</key>
-			<string>MacBookPro12,1</string>
-		</dict>
-		<key>MacBookPro12,1-XHC</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleUSBMergeNub</string>
-			<key>IOClass</key>
-			<string>AppleUSBMergeNub</string>
-			<key>IONameMatch</key>
-			<string>XHC</string>
-			<key>IOProbeScore</key>
-			<integer>5000</integer>
-			<key>IOProviderClass</key>
-			<string>AppleUSBXHCIPCI</string>
-			<key>IOProviderMergeProperties</key>
-			<dict>
-				<key>port-count</key>
-				<data>
-				DgAAAA==
-				</data>
-				<key>ports</key>
-				<dict>
-					<key>HS01</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>
-						AQAAAA==
-						</data>
-					</dict>
-					<key>HS02</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>
-						AgAAAA==
-						</data>
-					</dict>
-					<key>HS03</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>
-						AwAAAA==
-						</data>
-					</dict>
-					<key>HS07</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>255</integer>
-						<key>port</key>
-						<data>
-						BwAAAA==
-						</data>
-					</dict>
-					<key>HS08</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>255</integer>
-						<key>port</key>
-						<data>
-						CAAAAA==
-						</data>
-					</dict>
-					<key>SS01</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>
-						DAAAAA==
-						</data>
-					</dict>
-					<key>SS02</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>
-						DQAAAA==
-						</data>
-					</dict>
-					<key>SS03</key>
-					<dict>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-						<key>port</key>
-						<data>
-						DgAAAA==
-						</data>
-					</dict>
-				</dict>
-			</dict>
-			<key>model</key>
-			<string>MacBookPro12,1</string>
-		</dict>
-	</dict>
-	<key>OSBundleRequired</key>
-	<string>Root</string>
-</dict>
-</plist>
diff --git a/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist b/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
index 0c83251..fd767c0 100755
--- a/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.8</string>
+	<string>1.0.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,7 +25,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.8</string>
+	<string>1.0.9</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
diff --git a/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC b/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC
index 739b118..862cfb3 100755
Binary files a/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC and b/EFI/OC/Kexts/VirtualSMC.kext/Contents/MacOS/VirtualSMC differ
diff --git a/EFI/OC/OpenCore.efi b/EFI/OC/OpenCore.efi
index 13c50d1..bcec236 100755
Binary files a/EFI/OC/OpenCore.efi and b/EFI/OC/OpenCore.efi differ
diff --git a/EFI/OC/Tools/.DS_Store b/EFI/OC/Tools/.DS_Store
new file mode 100644
index 0000000..46b7d0d
Binary files /dev/null and b/EFI/OC/Tools/.DS_Store differ
diff --git a/EFI/OC/Tools/VerifyMsrE2.efi b/EFI/OC/Tools/VerifyMsrE2.efi
new file mode 100755
index 0000000..4ea2336
Binary files /dev/null and b/EFI/OC/Tools/VerifyMsrE2.efi differ
diff --git a/EFI/OC/Tools/libaistat.dylib b/EFI/OC/Tools/libaistat.dylib
deleted file mode 100755
index 4dfb0a2..0000000
Binary files a/EFI/OC/Tools/libaistat.dylib and /dev/null differ
diff --git a/EFI/OC/Tools/rtcread b/EFI/OC/Tools/rtcread
deleted file mode 100755
index a042fea..0000000
Binary files a/EFI/OC/Tools/rtcread and /dev/null differ
diff --git a/EFI/OC/Tools/smc b/EFI/OC/Tools/smc
deleted file mode 100755
index cd3ee86..0000000
Binary files a/EFI/OC/Tools/smc and /dev/null differ
diff --git a/EFI/OC/Tools/smcread b/EFI/OC/Tools/smcread
deleted file mode 100755
index c95ce7b..0000000
Binary files a/EFI/OC/Tools/smcread and /dev/null differ