diff --git a/EFI/OC/ACPI/SSDT-ALS0.aml b/EFI/OC/ACPI/SSDT-ALS0.aml
deleted file mode 100644
index 1e47b42..0000000
Binary files a/EFI/OC/ACPI/SSDT-ALS0.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-AWAC.aml b/EFI/OC/ACPI/SSDT-AWAC.aml
deleted file mode 100644
index 1609a97..0000000
Binary files a/EFI/OC/ACPI/SSDT-AWAC.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-DMAC.aml b/EFI/OC/ACPI/SSDT-DMAC.aml
deleted file mode 100644
index 29b0afe..0000000
Binary files a/EFI/OC/ACPI/SSDT-DMAC.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-EC.aml b/EFI/OC/ACPI/SSDT-EC.aml
new file mode 100644
index 0000000..3eb6e05
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-EC.aml differ
diff --git a/EFI/OC/ACPI/SSDT-GPRW.aml b/EFI/OC/ACPI/SSDT-GPRW.aml
deleted file mode 100644
index 2e62e61..0000000
Binary files a/EFI/OC/ACPI/SSDT-GPRW.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-HPET.aml b/EFI/OC/ACPI/SSDT-HPET.aml
deleted file mode 100644
index d27c426..0000000
Binary files a/EFI/OC/ACPI/SSDT-HPET.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-PLUG.aml b/EFI/OC/ACPI/SSDT-PLUG.aml
index 853cfb9..ae4e0fe 100755
Binary files a/EFI/OC/ACPI/SSDT-PLUG.aml and b/EFI/OC/ACPI/SSDT-PLUG.aml differ
diff --git a/EFI/OC/ACPI/SSDT-PMCR.aml b/EFI/OC/ACPI/SSDT-PMCR.aml
deleted file mode 100644
index b87f1a9..0000000
Binary files a/EFI/OC/ACPI/SSDT-PMCR.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-PNLF.aml b/EFI/OC/ACPI/SSDT-PNLF.aml
deleted file mode 100644
index 103ebad..0000000
Binary files a/EFI/OC/ACPI/SSDT-PNLF.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-PNLFCFL.aml b/EFI/OC/ACPI/SSDT-PNLFCFL.aml
new file mode 100644
index 0000000..18eee9b
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-PNLFCFL.aml differ
diff --git a/EFI/OC/ACPI/SSDT-RHUB.aml b/EFI/OC/ACPI/SSDT-RHUB.aml
deleted file mode 100644
index 7e720f4..0000000
Binary files a/EFI/OC/ACPI/SSDT-RHUB.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-RMDT.aml b/EFI/OC/ACPI/SSDT-RMDT.aml
deleted file mode 100644
index 58b4efb..0000000
Binary files a/EFI/OC/ACPI/SSDT-RMDT.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-SBUS-MCHC.aml b/EFI/OC/ACPI/SSDT-SBUS-MCHC.aml
deleted file mode 100644
index 7a06b3d..0000000
Binary files a/EFI/OC/ACPI/SSDT-SBUS-MCHC.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-USB-Reset.aml b/EFI/OC/ACPI/SSDT-USB-Reset.aml
new file mode 100644
index 0000000..c1d9b9d
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-USB-Reset.aml differ
diff --git a/EFI/OC/ACPI/SSDT-EC-USBX.aml b/EFI/OC/ACPI/SSDT-USBX.aml
similarity index 55%
rename from EFI/OC/ACPI/SSDT-EC-USBX.aml
rename to EFI/OC/ACPI/SSDT-USBX.aml
index 4668c8e..4e89537 100644
Binary files a/EFI/OC/ACPI/SSDT-EC-USBX.aml and b/EFI/OC/ACPI/SSDT-USBX.aml differ
diff --git a/EFI/OC/ACPI/SSDT-ZPTS.aml b/EFI/OC/ACPI/SSDT-ZPTS.aml
deleted file mode 100644
index edc78f3..0000000
Binary files a/EFI/OC/ACPI/SSDT-ZPTS.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-ZWAK.aml b/EFI/OC/ACPI/SSDT-ZWAK.aml
deleted file mode 100644
index 95c162e..0000000
Binary files a/EFI/OC/ACPI/SSDT-ZWAK.aml and /dev/null differ
diff --git a/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist b/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist
new file mode 100644
index 0000000..83572d5
--- /dev/null
+++ b/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist
@@ -0,0 +1,63 @@
+<?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>20G527</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>USBToolBox</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.dhinakg.USBToolBox.kext</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>USBToolBox</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.1.1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>12E507</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>DTPlatformVersion</key>
+	<string>11.3</string>
+	<key>DTSDKBuild</key>
+	<string>20E214</string>
+	<key>DTSDKName</key>
+	<string>macosx11.3</string>
+	<key>DTXcode</key>
+	<string>1251</string>
+	<key>DTXcodeBuild</key>
+	<string>12E507</string>
+	<key>IOKitPersonalities</key>
+	<dict/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.11</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2020-2021 Dhinak G. All rights reserved.</string>
+	<key>OSBundleCompatibleVersion</key>
+	<string>1.0.0</string>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.apple.driver.AppleUSBHostMergeProperties</key>
+		<string>1.0</string>
+		<key>com.apple.iokit.IOPCIFamily</key>
+		<string>2.9</string>
+		<key>com.apple.kpi.iokit</key>
+		<string>15.0.0</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>15.0.0</string>
+	</dict>
+	<key>OSBundleRequired</key>
+	<string>Root</string>
+</dict>
+</plist>
diff --git a/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox b/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox
new file mode 100644
index 0000000..c4547fb
Binary files /dev/null and b/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox differ
diff --git a/EFI/OC/Kexts/USBMapLG17.kext/Contents/Info.plist b/EFI/OC/Kexts/UTBMap.kext/Contents/Info.plist
similarity index 57%
rename from EFI/OC/Kexts/USBMapLG17.kext/Contents/Info.plist
rename to EFI/OC/Kexts/UTBMap.kext/Contents/Info.plist
index 8beca9e..ebcf755 100644
--- a/EFI/OC/Kexts/USBMapLG17.kext/Contents/Info.plist
+++ b/EFI/OC/Kexts/UTBMap.kext/Contents/Info.plist
@@ -5,53 +5,77 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleGetInfoString</key>
-	<string>v1.0</string>
+	<string>v1.1</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.corpnewt.USBMap</string>
+	<string>com.dhinakg.USBToolBox.map</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>USBMap</string>
+	<string>UTBMap</string>
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>IOKitPersonalities</key>
 	<dict>
-		<key>MacBookPro16,3-XHC</key>
+		<key>TXHC</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
-			<string>com.apple.driver.AppleUSBHostMergeProperties</string>
+			<string>com.dhinakg.USBToolBox.kext</string>
 			<key>IOClass</key>
-			<string>AppleUSBHostMergeProperties</string>
-			<key>IOParentMatch</key>
+			<string>USBToolBox</string>
+			<key>IOMatchCategory</key>
+			<string>USBToolBox</string>
+			<key>IONameMatch</key>
+			<string>TXHC</string>
+			<key>IOProviderClass</key>
+			<string>IOPCIDevice</string>
+			<key>IOProviderMergeProperties</key>
 			<dict>
-				<key>IOPropertyMatch</key>
+				<key>port-count</key>
+				<data>
+				AgAAAA==
+				</data>
+				<key>ports</key>
 				<dict>
-					<key>pcidebug</key>
-					<string>0:20:0</string>
+					<key>SS01</key>
+					<dict>
+						<key>UsbConnector</key>
+						<integer>9</integer>
+						<key>port</key>
+						<data>
+						AgAAAA==
+						</data>
+					</dict>
 				</dict>
 			</dict>
+		</dict>
+		<key>XHC</key>
+		<dict>
+			<key>CFBundleIdentifier</key>
+			<string>com.dhinakg.USBToolBox.kext</string>
+			<key>IOClass</key>
+			<string>USBToolBox</string>
+			<key>IOMatchCategory</key>
+			<string>USBToolBox</string>
+			<key>IONameMatch</key>
+			<string>XHC</string>
 			<key>IOProviderClass</key>
-			<string>AppleUSBXHCIPCI</string>
+			<string>IOPCIDevice</string>
 			<key>IOProviderMergeProperties</key>
 			<dict>
-				<key>kUSBMuxEnabled</key>
-				<true/>
 				<key>port-count</key>
 				<data>
-				DgAAAA==
+				EAAAAA==
 				</data>
 				<key>ports</key>
 				<dict>
 					<key>HS01</key>
 					<dict>
-						<key>Comment</key>
-						<string>Right Front USB-A 2.0</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
 						<key>port</key>
@@ -70,8 +94,6 @@
 					</dict>
 					<key>HS03</key>
 					<dict>
-						<key>Comment</key>
-						<string>Right Back USB-A 2.0</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
 						<key>port</key>
@@ -81,8 +103,6 @@
 					</dict>
 					<key>HS04</key>
 					<dict>
-						<key>Comment</key>
-						<string>Left USB-A 2.0</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
 						<key>port</key>
@@ -92,26 +112,6 @@
 					</dict>
 					<key>HS05</key>
 					<dict>
-						<key>#port</key>
-						<data>
-						BQAAAA==
-						</data>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-					</dict>
-					<key>HS06</key>
-					<dict>
-						<key>#port</key>
-						<data>
-						BgAAAA==
-						</data>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-					</dict>
-					<key>HS07</key>
-					<dict>
-						<key>Comment</key>
-						<string>USB-C</string>
 						<key>UsbConnector</key>
 						<integer>9</integer>
 						<key>port</key>
@@ -119,25 +119,7 @@
 						BwAAAA==
 						</data>
 					</dict>
-					<key>HS08</key>
-					<dict>
-						<key>#port</key>
-						<data>
-						CAAAAA==
-						</data>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-					</dict>
-					<key>HS09</key>
-					<dict>
-						<key>#port</key>
-						<data>
-						CQAAAA==
-						</data>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-					</dict>
-					<key>HS10</key>
+					<key>HS06</key>
 					<dict>
 						<key>UsbConnector</key>
 						<integer>255</integer>
@@ -146,28 +128,8 @@
 						CgAAAA==
 						</data>
 					</dict>
-					<key>HS11</key>
-					<dict>
-						<key>#port</key>
-						<data>
-						CwAAAA==
-						</data>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-					</dict>
-					<key>HS12</key>
-					<dict>
-						<key>#port</key>
-						<data>
-						DAAAAA==
-						</data>
-						<key>UsbConnector</key>
-						<integer>3</integer>
-					</dict>
 					<key>SS01</key>
 					<dict>
-						<key>Comment</key>
-						<string>Righ Back USB-A 3.0</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
 						<key>port</key>
@@ -177,8 +139,6 @@
 					</dict>
 					<key>SS02</key>
 					<dict>
-						<key>Comment</key>
-						<string>Right Front USB-A 3.0</string>
 						<key>UsbConnector</key>
 						<integer>3</integer>
 						<key>port</key>
@@ -188,19 +148,22 @@
 					</dict>
 					<key>SS03</key>
 					<dict>
-						<key>#port</key>
-						<data>
-						DwAAAA==
-						</data>
 						<key>UsbConnector</key>
 						<integer>3</integer>
+						<key>port</key>
+						<data>
+						EAAAAA==
+						</data>
 					</dict>
 				</dict>
 			</dict>
-			<key>model</key>
-			<string>MacBookPro16,3</string>
 		</dict>
 	</dict>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.dhinakg.USBToolBox.kext</key>
+		<string>1.0.0</string>
+	</dict>
 	<key>OSBundleRequired</key>
 	<string>Root</string>
 </dict>
diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist
index 11f24b6..b2737fd 100644
--- a/EFI/OC/config.plist
+++ b/EFI/OC/config.plist
@@ -8,35 +8,11 @@
 		<array>
 			<dict>
 				<key>Comment</key>
-				<string>SSDT-ALS0.aml</string>
+				<string>SSDT-EC.aml</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-ALS0.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-AWAC.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-AWAC.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-DMAC.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-DMAC.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-EC-USBX.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-EC-USBX.aml</string>
+				<string>SSDT-EC.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -46,22 +22,6 @@
 				<key>Path</key>
 				<string>SSDT-FNKey.aml</string>
 			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-GPRW.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-GPRW.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-HPET.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-HPET.aml</string>
-			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>SSDT-PLUG.aml</string>
@@ -72,43 +32,27 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>SSDT-PMCR.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-PMCR.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-PNLF.aml</string>
+				<string>SSDT-PNLFCFL.aml</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-PNLF.aml</string>
+				<string>SSDT-PNLFCFL.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>SSDT-RHUB.aml</string>
+				<string>SSDT-USB-Reset.aml</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-RHUB.aml</string>
+				<string>SSDT-USB-Reset.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>SSDT-RMDT.aml</string>
+				<string>SSDT-USBX.aml</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-RMDT.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-SBUS-MCHC.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-SBUS-MCHC.aml</string>
+				<string>SSDT-USBX.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -118,22 +62,6 @@
 				<key>Path</key>
 				<string>SSDT-XOSI.aml</string>
 			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-ZPTS.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-ZPTS.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>SSDT-ZWAK.aml</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-ZWAK.aml</string>
-			</dict>
 		</array>
 		<key>Delete</key>
 		<array/>
@@ -853,9 +781,27 @@
 				<key>Arch</key>
 				<string>Any</string>
 				<key>BundlePath</key>
-				<string>USBMapLG17.kext</string>
+				<string>USBToolBox.kext</string>
 				<key>Comment</key>
-				<string>USBMapLG17.kext</string>
+				<string>USBToolBox.kext</string>
+				<key>Enabled</key>
+				<true/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/USBToolBox</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>Any</string>
+				<key>BundlePath</key>
+				<string>UTBMap.kext</string>
+				<key>Comment</key>
+				<string>UTBMap.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
@@ -925,13 +871,13 @@
 				<key>Arch</key>
 				<string>Any</string>
 				<key>BundlePath</key>
-				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext</string>
+				<string>VoodooI2C.kext/Contents/PlugIns/VoodooGPIO.kext</string>
 				<key>Comment</key>
-				<string>VoodooInput.kext</string>
+				<string>VoodooGPIO.kext</string>
 				<key>Enabled</key>
-				<false/>
+				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooInput</string>
+				<string>Contents/MacOS/VoodooGPIO</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -943,13 +889,13 @@
 				<key>Arch</key>
 				<string>Any</string>
 				<key>BundlePath</key>
-				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext</string>
+				<string>VoodooI2C.kext/Contents/PlugIns/VoodooI2CServices.kext</string>
 				<key>Comment</key>
-				<string>VoodooPS2Keyboard.kext</string>
+				<string>VoodooI2CServices.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooPS2Keyboard</string>
+				<string>Contents/MacOS/VoodooI2CServices</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -961,13 +907,13 @@
 				<key>Arch</key>
 				<string>Any</string>
 				<key>BundlePath</key>
-				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext</string>
+				<string>VoodooI2C.kext/Contents/PlugIns/VoodooInput.kext</string>
 				<key>Comment</key>
-				<string>VoodooPS2Mouse.kext</string>
+				<string>VoodooInput.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooPS2Mouse</string>
+				<string>Contents/MacOS/VoodooInput</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -979,13 +925,13 @@
 				<key>Arch</key>
 				<string>Any</string>
 				<key>BundlePath</key>
-				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext</string>
+				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext</string>
 				<key>Comment</key>
-				<string>VoodooPS2Trackpad.kext</string>
+				<string>VoodooInput.kext</string>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooPS2Trackpad</string>
+				<string>Contents/MacOS/VoodooInput</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -997,13 +943,13 @@
 				<key>Arch</key>
 				<string>Any</string>
 				<key>BundlePath</key>
-				<string>VoodooI2C.kext/Contents/PlugIns/VoodooGPIO.kext</string>
+				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext</string>
 				<key>Comment</key>
-				<string>VoodooGPIO.kext</string>
+				<string>VoodooPS2Keyboard.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooGPIO</string>
+				<string>Contents/MacOS/VoodooPS2Keyboard</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -1015,13 +961,13 @@
 				<key>Arch</key>
 				<string>Any</string>
 				<key>BundlePath</key>
-				<string>VoodooI2C.kext/Contents/PlugIns/VoodooI2CServices.kext</string>
+				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext</string>
 				<key>Comment</key>
-				<string>VoodooI2CServices.kext</string>
+				<string>VoodooPS2Mouse.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooI2CServices</string>
+				<string>Contents/MacOS/VoodooPS2Mouse</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
@@ -1033,13 +979,13 @@
 				<key>Arch</key>
 				<string>Any</string>
 				<key>BundlePath</key>
-				<string>VoodooI2C.kext/Contents/PlugIns/VoodooInput.kext</string>
+				<string>VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext</string>
 				<key>Comment</key>
-				<string>VoodooInput.kext</string>
+				<string>VoodooPS2Trackpad.kext</string>
 				<key>Enabled</key>
 				<true/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/VoodooInput</string>
+				<string>Contents/MacOS/VoodooPS2Trackpad</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>