diff --git a/.DS_Store b/.DS_Store
index ddac347..67e7426 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/EFI/.DS_Store b/EFI/.DS_Store
index 2ca3e22..821cd6c 100644
Binary files a/EFI/.DS_Store and b/EFI/.DS_Store differ
diff --git a/EFI/OC/.DS_Store b/EFI/OC/.DS_Store
index 1e73915..4a798be 100755
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
index 12f94d9..19c6c33 100644
Binary files a/EFI/OC/ACPI/.DS_Store and b/EFI/OC/ACPI/.DS_Store differ
diff --git a/EFI/OC/ACPI/SSDT-ALS0.aml b/EFI/OC/ACPI/SSDT-ALS0.aml
index 0da75f7..5c5d3f3 100755
Binary files a/EFI/OC/ACPI/SSDT-ALS0.aml and b/EFI/OC/ACPI/SSDT-ALS0.aml differ
diff --git a/EFI/OC/ACPI/SSDT-BKEY.aml b/EFI/OC/ACPI/SSDT-BKEY.aml
deleted file mode 100755
index 7bdd7b4..0000000
Binary files a/EFI/OC/ACPI/SSDT-BKEY.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-DEH01.aml b/EFI/OC/ACPI/SSDT-DEH01.aml
index 435db71..d1981bb 100755
Binary files a/EFI/OC/ACPI/SSDT-DEH01.aml and b/EFI/OC/ACPI/SSDT-DEH01.aml differ
diff --git a/EFI/OC/ACPI/SSDT-DTGP.aml b/EFI/OC/ACPI/SSDT-DTGP.aml
deleted file mode 100755
index 664c099..0000000
Binary files a/EFI/OC/ACPI/SSDT-DTGP.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-GPRW.aml b/EFI/OC/ACPI/SSDT-GPRW.aml
deleted file mode 100755
index e359753..0000000
Binary files a/EFI/OC/ACPI/SSDT-GPRW.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-HPET-IPIC.aml b/EFI/OC/ACPI/SSDT-HPET-IPIC.aml
new file mode 100755
index 0000000..435893b
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-HPET-IPIC.aml differ
diff --git a/EFI/OC/ACPI/SSDT-HPET.aml b/EFI/OC/ACPI/SSDT-HPET.aml
deleted file mode 100755
index f24bf67..0000000
Binary files a/EFI/OC/ACPI/SSDT-HPET.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-IGPU.aml b/EFI/OC/ACPI/SSDT-IGPU.aml
index 1755267..92e8d09 100755
Binary files a/EFI/OC/ACPI/SSDT-IGPU.aml and b/EFI/OC/ACPI/SSDT-IGPU.aml differ
diff --git a/EFI/OC/ACPI/SSDT-IPIC.aml b/EFI/OC/ACPI/SSDT-IPIC.aml
deleted file mode 100755
index 739e1da..0000000
Binary files a/EFI/OC/ACPI/SSDT-IPIC.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-MEM2.aml b/EFI/OC/ACPI/SSDT-MEM2.aml
deleted file mode 100755
index 26a1150..0000000
Binary files a/EFI/OC/ACPI/SSDT-MEM2.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-OCBAT0.aml b/EFI/OC/ACPI/SSDT-OCBAT0.aml
deleted file mode 100755
index 66d5e25..0000000
Binary files a/EFI/OC/ACPI/SSDT-OCBAT0.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-OCBATC.aml b/EFI/OC/ACPI/SSDT-OCBATC.aml
deleted file mode 100755
index eb6e9ac..0000000
Binary files a/EFI/OC/ACPI/SSDT-OCBATC.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-OCBATT.aml b/EFI/OC/ACPI/SSDT-OCBATT.aml
new file mode 100755
index 0000000..81b801e
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-OCBATT.aml differ
diff --git a/EFI/OC/ACPI/SSDT-PNLF.aml b/EFI/OC/ACPI/SSDT-PNLF.aml
index e09aa9e..62644e1 100755
Binary files a/EFI/OC/ACPI/SSDT-PNLF.aml and b/EFI/OC/ACPI/SSDT-PNLF.aml differ
diff --git a/EFI/OC/ACPI/SSDT-PWRB.aml b/EFI/OC/ACPI/SSDT-PWRB.aml
deleted file mode 100755
index 13cd47d..0000000
Binary files a/EFI/OC/ACPI/SSDT-PWRB.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-TEMP.aml b/EFI/OC/ACPI/SSDT-TEMP.aml
new file mode 100755
index 0000000..a51ae67
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-TEMP.aml differ
diff --git a/EFI/OC/ACPI/SSDT-Thinkpad_Clickpad.aml b/EFI/OC/ACPI/SSDT-Thinkpad_Clickpad.aml
deleted file mode 100755
index 03245cc..0000000
Binary files a/EFI/OC/ACPI/SSDT-Thinkpad_Clickpad.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-UIAC.aml b/EFI/OC/ACPI/SSDT-UIAC.aml
deleted file mode 100755
index 9d994bd..0000000
Binary files a/EFI/OC/ACPI/SSDT-UIAC.aml and /dev/null differ
diff --git a/EFI/OC/ACPI/SSDT-USBX.aml b/EFI/OC/ACPI/SSDT-USBX.aml
index 07bdf6a..2b07ff6 100755
Binary files a/EFI/OC/ACPI/SSDT-USBX.aml and b/EFI/OC/ACPI/SSDT-USBX.aml differ
diff --git a/EFI/OC/ACPI/SSDT-VPS2.aml b/EFI/OC/ACPI/SSDT-VPS2.aml
new file mode 100755
index 0000000..8b1cb2e
Binary files /dev/null and b/EFI/OC/ACPI/SSDT-VPS2.aml differ
diff --git a/EFI/OC/ACPI/SSDT-XOSI.aml b/EFI/OC/ACPI/SSDT-XOSI.aml
deleted file mode 100755
index f2e6eae..0000000
Binary files a/EFI/OC/ACPI/SSDT-XOSI.aml and /dev/null differ
diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist
index ad18221..1758229 100755
--- a/EFI/OC/config.plist
+++ b/EFI/OC/config.plist
@@ -8,20 +8,12 @@
 		<array>
 			<dict>
 				<key>Comment</key>
-				<string></string>
+				<string>Sensor</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
 				<string>SSDT-ALS0.aml</string>
 			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>Shortcuts</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-BKEY.aml</string>
-			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>CPUOC-X86</string>
@@ -32,27 +24,19 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string></string>
+				<string>Shortcuts Clickpad</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-DEH01.aml</string>
+				<string>SSDT-VPS2.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string></string>
+				<string>Battery</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-DTGP.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-GPRW.aml</string>
+				<string>SSDT-OCBATT.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -62,46 +46,6 @@
 				<key>Path</key>
 				<string>SSDT-IGPU.aml</string>
 			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>Sound card IRQ patch</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-HPET.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>Sound card IRQ patch</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-IPIC.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-MEM2.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>Battery</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-OCBAT0.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>Battery</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-OCBATC.aml</string>
-			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>Backlight</string>
@@ -112,35 +56,11 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string></string>
+				<string>Sound card IRQ patch</string>
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-PWRB.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-SMBU.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>Clickpad</string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-Thinkpad_Clickpad.aml</string>
-			</dict>
-			<dict>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<true/>
-				<key>Path</key>
-				<string>SSDT-UIAC.aml</string>
+				<string>SSDT-HPET-IPIC.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -156,7 +76,15 @@
 				<key>Enabled</key>
 				<true/>
 				<key>Path</key>
-				<string>SSDT-XOSI.aml</string>
+				<string>SSDT-DEH01.aml</string>
+			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>Collection</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Path</key>
+				<string>SSDT-TEMP.aml</string>
 			</dict>
 			<dict>
 				<key>Comment</key>
@@ -166,6 +94,14 @@
 				<key>Path</key>
 				<string>SSDT-ALC3.aml</string>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>SMBU</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Path</key>
+				<string>SSDT-SMBU.aml</string>
+			</dict>
 		</array>
 		<key>Delete</key>
 		<array>
@@ -1390,8 +1326,6 @@
 				<string>Intel Wi-Fi 6 AX200 Beta(802.11ax wireless)</string>
 				<key>name</key>
 				<string>Airport</string>
-				<key>pci-aspm-default</key>
-				<integer>0</integer>
 			</dict>
 			<key>PciRoot(0x0)/Pci(0x2,0x0)</key>
 			<dict>
@@ -1467,7 +1401,7 @@
 				<key>Comment</key>
 				<string></string>
 				<key>Enabled</key>
-				<false/>
+				<true/>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/VirtualSMC</string>
 				<key>MaxKernel</key>
@@ -1483,7 +1417,7 @@
 				<key>Comment</key>
 				<string></string>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/FakeSMC</string>
 				<key>MaxKernel</key>
@@ -2518,9 +2452,7 @@
 				<key>SystemAudioVolume</key>
 				<data>Rg==</data>
 				<key>boot-args</key>
-				<string>alcid=15  brcmfx-driver=2 vsmcgen=1 brcmfx-country=#a -v</string>
-				<key>booter-fileset-basesystem</key>
-				<data></data>
+				<string>alcid=15 brcmfx-driver=2 vsmcgen=1 brcmfx-country=#a -v</string>
 				<key>booter-fileset-kernel</key>
 				<data></data>
 				<key>csr-active-config</key>