diff --git a/EFI/OC/Config.plist b/EFI/OC/Config.plist
index 23277f1..5987b59 100644
--- a/EFI/OC/Config.plist
+++ b/EFI/OC/Config.plist
@@ -339,42 +339,6 @@
PlistPath
Contents/Info.plist
-
- Arch
- x86_64
- BundlePath
- USBToolBox.kext
- Comment
-
- Enabled
-
- ExecutablePath
- Contents/MacOS/USBToolBox
- MaxKernel
-
- MinKernel
-
- PlistPath
- Contents/Info.plist
-
-
- Arch
- x86_64
- BundlePath
- UTBDefault.kext
- Comment
-
- Enabled
-
- ExecutablePath
-
- MaxKernel
-
- MinKernel
-
- PlistPath
- Contents/Info.plist
-
Arch
x86_64
@@ -609,6 +573,24 @@
PlistPath
Contents/Info.plist
+
+ Arch
+ x86_64
+ BundlePath
+ USBMap.kext
+ Comment
+
+ Enabled
+
+ ExecutablePath
+
+ MaxKernel
+
+ MinKernel
+
+ PlistPath
+ Contents/Info.plist
+
Block
diff --git a/EFI/OC/Kexts/USBMap.kext/Contents/Info.plist b/EFI/OC/Kexts/USBMap.kext/Contents/Info.plist
new file mode 100755
index 0000000..65aa7f2
--- /dev/null
+++ b/EFI/OC/Kexts/USBMap.kext/Contents/Info.plist
@@ -0,0 +1,294 @@
+
+
+
+
+ CFBundleDevelopmentRegion
+ English
+ CFBundleGetInfoString
+ v1.0
+ CFBundleIdentifier
+ com.corpnewt.USBMap
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ USBMap
+ CFBundlePackageType
+ KEXT
+ CFBundleShortVersionString
+ 1.0
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ 1.0
+ IOKitPersonalities
+
+ MacBookPro16,2-XHC
+
+ CFBundleIdentifier
+ com.apple.driver.AppleUSBHostMergeProperties
+ IOClass
+ AppleUSBHostMergeProperties
+ IOParentMatch
+
+ IOPropertyMatch
+
+ pcidebug
+ 0:20:0
+
+
+ IOProviderClass
+ AppleUSBXHCIPCI
+ IOProviderMergeProperties
+
+ kUSBMuxEnabled
+
+ port-count
+
+ GgAAAA==
+
+ ports
+
+ UK01
+
+ UsbConnector
+ 3
+ port
+
+ AQAAAA==
+
+
+ UK02
+
+ UsbConnector
+ 3
+ port
+
+ AgAAAA==
+
+
+ UK03
+
+ UsbConnector
+ 3
+ port
+
+ AwAAAA==
+
+
+ UK04
+
+ UsbConnector
+ 3
+ port
+
+ BAAAAA==
+
+
+ UK05
+
+ UsbConnector
+ 3
+ port
+
+ BQAAAA==
+
+
+ UK06
+
+ UsbConnector
+ 3
+ port
+
+ BgAAAA==
+
+
+ UK07
+
+ UsbConnector
+ 3
+ port
+
+ BwAAAA==
+
+
+ UK08
+
+ UsbConnector
+ 3
+ port
+
+ CAAAAA==
+
+
+ UK09
+
+ UsbConnector
+ 3
+ port
+
+ CQAAAA==
+
+
+ UK10
+
+ UsbConnector
+ 3
+ port
+
+ CgAAAA==
+
+
+ UK11
+
+ UsbConnector
+ 3
+ port
+
+ CwAAAA==
+
+
+ UK12
+
+ UsbConnector
+ 3
+ port
+
+ DAAAAA==
+
+
+ UK13
+
+ UsbConnector
+ 3
+ port
+
+ DQAAAA==
+
+
+ UK14
+
+ UsbConnector
+ 3
+ port
+
+ DgAAAA==
+
+
+ UK15
+
+ UsbConnector
+ 3
+ port
+
+ DwAAAA==
+
+
+ UK16
+
+ UsbConnector
+ 3
+ port
+
+ EAAAAA==
+
+
+ UK17
+
+ UsbConnector
+ 3
+ port
+
+ EQAAAA==
+
+
+ UK18
+
+ UsbConnector
+ 3
+ port
+
+ EgAAAA==
+
+
+ UK19
+
+ UsbConnector
+ 3
+ port
+
+ EwAAAA==
+
+
+ UK20
+
+ UsbConnector
+ 3
+ port
+
+ FAAAAA==
+
+
+ UK21
+
+ UsbConnector
+ 3
+ port
+
+ FQAAAA==
+
+
+ UK22
+
+ UsbConnector
+ 3
+ port
+
+ FgAAAA==
+
+
+ UK23
+
+ UsbConnector
+ 3
+ port
+
+ FwAAAA==
+
+
+ UK24
+
+ UsbConnector
+ 3
+ port
+
+ GAAAAA==
+
+
+ UK25
+
+ UsbConnector
+ 3
+ port
+
+ GQAAAA==
+
+
+ UK26
+
+ UsbConnector
+ 3
+ port
+
+ GgAAAA==
+
+
+
+
+ model
+ MacBookPro16,2
+
+
+ OSBundleRequired
+ Root
+
+
diff --git a/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist b/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist
deleted file mode 100644
index 83572d5..0000000
--- a/EFI/OC/Kexts/USBToolBox.kext/Contents/Info.plist
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
- BuildMachineOSBuild
- 20G527
- CFBundleDevelopmentRegion
- en
- CFBundleExecutable
- USBToolBox
- CFBundleIdentifier
- com.dhinakg.USBToolBox.kext
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- USBToolBox
- CFBundlePackageType
- KEXT
- CFBundleSupportedPlatforms
-
- MacOSX
-
- CFBundleVersion
- 1.1.1
- DTCompiler
- com.apple.compilers.llvm.clang.1_0
- DTPlatformBuild
- 12E507
- DTPlatformName
- macosx
- DTPlatformVersion
- 11.3
- DTSDKBuild
- 20E214
- DTSDKName
- macosx11.3
- DTXcode
- 1251
- DTXcodeBuild
- 12E507
- IOKitPersonalities
-
- LSMinimumSystemVersion
- 10.11
- NSHumanReadableCopyright
- Copyright © 2020-2021 Dhinak G. All rights reserved.
- OSBundleCompatibleVersion
- 1.0.0
- OSBundleLibraries
-
- com.apple.driver.AppleUSBHostMergeProperties
- 1.0
- com.apple.iokit.IOPCIFamily
- 2.9
- com.apple.kpi.iokit
- 15.0.0
- com.apple.kpi.libkern
- 15.0.0
-
- OSBundleRequired
- Root
-
-
diff --git a/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox b/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox
deleted file mode 100644
index c4547fb..0000000
Binary files a/EFI/OC/Kexts/USBToolBox.kext/Contents/MacOS/USBToolBox and /dev/null differ
diff --git a/EFI/OC/Kexts/UTBDefault.kext/Contents/Info.plist b/EFI/OC/Kexts/UTBDefault.kext/Contents/Info.plist
deleted file mode 100644
index 8a31654..0000000
--- a/EFI/OC/Kexts/UTBDefault.kext/Contents/Info.plist
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleGetInfoString
- v1.0
- CFBundleIdentifier
- com.dhinakg.USBToolBox.injector
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- UTBMap
- CFBundlePackageType
- KEXT
- CFBundleShortVersionString
- 1.0
- CFBundleSignature
- ????
- CFBundleVersion
- 1.0
- IOKitPersonalities
-
- XHC1
-
- CFBundleIdentifier
- com.dhinakg.USBToolBox.kext
- IOClass
- USBToolBox
- IOMatchCategory
- USBToolBox
- IOPCIClassMatch
- 0x0c030000&0xffff0000
- IOProviderClass
- IOPCIDevice
-
-
- OSBundleLibraries
-
- com.dhinakg.USBToolBox.kext
- 1.0.0
-
- OSBundleRequired
- Root
-
-
diff --git a/README.md b/README.md
index 4f01272..dcda128 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Tested on macOS 12.4 Monterey
## Features
-- [x] 🍎 Boot!
+- [x] 🍎 Boot! (MacBookPro16,2)
- [x] ⌨️ Keyboard, Touchpad (VoodooPS2Controller.kext)
- [x] Touchpad Gestures (VoodooI2C + VoodooI2CHID)
- [x] Left click by touching (Settings > Touchpad > Tap to click)