diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-DTPG.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-DTPG.aml
new file mode 100755
index 0000000..7927097
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/ACPI/SSDT-DTPG.aml differ
diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-TB3.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-TB3.aml
deleted file mode 100755
index 73381d0..0000000
Binary files a/EFI-OpenCore/EFI/OC/ACPI/SSDT-TB3.aml and /dev/null differ
diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-Z390-TB3HP.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-Z390-TB3HP.aml
new file mode 100755
index 0000000..b235c82
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/ACPI/SSDT-Z390-TB3HP.aml differ
diff --git a/EFI-OpenCore/EFI/OC/Drivers/TbtForcePower.efi b/EFI-OpenCore/EFI/OC/Drivers/TbtForcePower.efi
new file mode 100755
index 0000000..667091f
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Drivers/TbtForcePower.efi differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/IOElectrify.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/IOElectrify.kext/Contents/Info.plist
deleted file mode 100755
index 8f12bd0..0000000
--- a/EFI-OpenCore/EFI/OC/Kexts/IOElectrify.kext/Contents/Info.plist
+++ /dev/null
@@ -1,108 +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>BuildMachineOSBuild</key>
-	<string>17B48</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>IOElectrify</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.darkvoid.driver.IOElectrify</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>IOElectrify</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.0.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>9B55</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>17B41</string>
-	<key>DTSDKName</key>
-	<string>macosx10.13</string>
-	<key>DTXcode</key>
-	<string>0910</string>
-	<key>DTXcodeBuild</key>
-	<string>9B55</string>
-	<key>IOKitPersonalities</key>
-	<dict>
-		<key>IOElectrify</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>org.darkvoid.driver.IOElectrify</string>
-			<key>IOClass</key>
-			<string>IOElectrify</string>
-			<key>IONameMatch</key>
-			<array>
-				<string>PNP0C14</string>
-				<string>pnp0c14</string>
-			</array>
-			<key>IOProbeScore</key>
-			<integer>10</integer>
-			<key>IOPropertyMatch</key>
-			<dict>
-				<key>_UID</key>
-				<string>TBFP</string>
-			</dict>
-			<key>IOProviderClass</key>
-			<string>IOACPIPlatformDevice</string>
-		</dict>
-		<key>IOElectrifyBridge</key>
-		<dict>
-			<key>#CFBundleIdentifier</key>
-			<string>org.darkvoid.driver.IOElectrify</string>
-			<key>#IOClass</key>
-			<string>IOElectrifyBridge</string>
-			<key>#IOMatchCategory</key>
-			<string>IOElectrify</string>
-			<key>#IOPCIClassMatch</key>
-			<string>0x06040000&amp;0xffff0000</string>
-			<key>#IOPCIPrimaryMatch</key>
-			<string>0x76158086</string>
-			<key>#IOProbeScore</key>
-			<integer>10</integer>
-			<key>#IOProviderClass</key>
-			<string>IOPCI2PCIBridge</string>
-		</dict>
-	</dict>
-	<key>OSBundleCompatibleVersion</key>
-	<string>1.0.0</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>com.apple.iokit.IOACPIFamily</key>
-		<string>1.0.0d1</string>
-		<key>com.apple.iokit.IOPCIFamily</key>
-		<string>1.0.0b1</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0.0</string>
-		<key>com.apple.kpi.unsupported</key>
-		<string>8.0.0</string>
-	</dict>
-	<key>OSBundleRequired</key>
-	<string>Root</string>
-	<key>Source Code</key>
-	<string>https://github.com/the-darkvoid/OS-X-IOElectrify</string>
-</dict>
-</plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/IOElectrify.kext/Contents/MacOS/IOElectrify b/EFI-OpenCore/EFI/OC/Kexts/IOElectrify.kext/Contents/MacOS/IOElectrify
deleted file mode 100755
index 6845465..0000000
Binary files a/EFI-OpenCore/EFI/OC/Kexts/IOElectrify.kext/Contents/MacOS/IOElectrify and /dev/null differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/Info.plist
new file mode 100755
index 0000000..2de4698
--- /dev/null
+++ b/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/Info.plist
@@ -0,0 +1,81 @@
+<?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>BuildMachineOSBuild</key>
+	<string>18G95</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>ThunderboltReset</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.osy86.ThunderboltReset</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>ThunderboltReset</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0d1</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.0.0d1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>11B52</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>19B81</string>
+	<key>DTSDKName</key>
+	<string>macosx10.15</string>
+	<key>DTXcode</key>
+	<string>1120</string>
+	<key>DTXcodeBuild</key>
+	<string>11B52</string>
+	<key>IOKitPersonalities</key>
+	<dict>
+		<key>Polaris22Fixup</key>
+		<dict>
+			<key>CFBundleIdentifier</key>
+			<string>com.osy86.ThunderboltReset</string>
+			<key>IOClass</key>
+			<string>ThunderboltReset</string>
+			<key>IOMatchCategory</key>
+			<string>ThunderboltReset</string>
+			<key>IOProviderClass</key>
+			<string>IOResources</string>
+			<key>IOResourceMatch</key>
+			<string>IOKit</string>
+		</dict>
+	</dict>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.14</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 osy86. All rights reserved.</string>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>as.vit9696.Lilu</key>
+		<string>1.2.0</string>
+		<key>com.apple.kpi.bsd</key>
+		<string>12.0.0</string>
+		<key>com.apple.kpi.dsep</key>
+		<string>12.0.0</string>
+		<key>com.apple.kpi.iokit</key>
+		<string>12.0.0</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>12.0.0</string>
+		<key>com.apple.kpi.mach</key>
+		<string>12.0.0</string>
+		<key>com.apple.kpi.unsupported</key>
+		<string>12.0.0</string>
+	</dict>
+	<key>OSBundleRequired</key>
+	<string>Root</string>
+</dict>
+</plist>
diff --git a/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/MacOS/ThunderboltReset b/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/MacOS/ThunderboltReset
new file mode 100755
index 0000000..5924ffb
Binary files /dev/null and b/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/MacOS/ThunderboltReset differ
diff --git a/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/_CodeSignature/CodeResources b/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/_CodeSignature/CodeResources
new file mode 100755
index 0000000..d5d0fd7
--- /dev/null
+++ b/EFI-OpenCore/EFI/OC/Kexts/ThunderboltReset.kext/Contents/_CodeSignature/CodeResources
@@ -0,0 +1,115 @@
+<?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>files</key>
+	<dict/>
+	<key>files2</key>
+	<dict/>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^[^/]+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/EFI-OpenCore/EFI/OC/config.plist b/EFI-OpenCore/EFI/OC/config.plist
index fb08006..3bc871d 100755
--- a/EFI-OpenCore/EFI/OC/config.plist
+++ b/EFI-OpenCore/EFI/OC/config.plist
@@ -104,11 +104,19 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>Thunderbolt 3 Hotplug</string>
+				<string>DTPG</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-TB3.aml</string>
+				<string>SSDT-DTPG.aml</string>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>TB3HP</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Path</key>
+				<string>SSDT-Z390-TB3HP.aml</string>
 			</dict>
 		</array>
 		<key>Block</key>
@@ -1345,13 +1353,13 @@
 			</dict>
 			<dict>
 				<key>BundlePath</key>
-				<string>IOElectrify.kext</string>
+				<string>RTCMemoryFixup.kext</string>
 				<key>Comment</key>
 				<string></string>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/IOElectrify</string>
+				<string>Contents/MacOS/RTCMemoryFixup</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -1361,13 +1369,13 @@
 			</dict>
 			<dict>
 				<key>BundlePath</key>
-				<string>RTCMemoryFixup.kext</string>
+				<string>ThunderboltReset.kext</string>
 				<key>Comment</key>
 				<string></string>
 				<key>Enabled</key>
 				<false/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/RTCMemoryFixup</string>
+				<string>Contents/MacOS/ThunderboltReset</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -1618,6 +1626,7 @@
 			<string>HFSPlus.efi</string>
 			<string>ApfsDriverLoader.efi</string>
 			<string>FwRuntimeServices.efi</string>
+			<string>TbtForcePower.efi</string>
 		</array>
 		<key>Input</key>
 		<dict>