diff --git a/Scripts/compatibility_checker.py b/Scripts/compatibility_checker.py
index 40c7827..b40f693 100644
--- a/Scripts/compatibility_checker.py
+++ b/Scripts/compatibility_checker.py
@@ -300,10 +300,10 @@ class CompatibilityChecker:
             max_version = os_data.get_latest_darwin_version()
             min_version = os_data.get_lowest_darwin_version()
 
-            if device_id in pci_data.BroadcomBluetoothIDs + pci_data.IntelBluetoothIDs + pci_data.BluetoothDongleIDs:
-                pass
-            elif device_id in pci_data.AtherosBluetoothIDs:
+            if device_id in pci_data.AtherosBluetoothIDs:
                 max_version = "20.99.99"
+            elif device_id in pci_data.BluetoothIDs:
+                pass
             else:
                 max_version = min_version = None
 
diff --git a/Scripts/datasets/pci_data.py b/Scripts/datasets/pci_data.py
index 34e9899..1582c85 100644
--- a/Scripts/datasets/pci_data.py
+++ b/Scripts/datasets/pci_data.py
@@ -174,7 +174,37 @@ IntelBluetoothIDs = [
     "8087-0AAA"
 ]
 
-BluetoothDongleIDs = [
+BluetoothIDs = AtherosBluetoothIDs + BroadcomBluetoothIDs + IntelBluetoothIDs + [
+    "05AC-1000",
+    "05AC-8203",
+    "05AC-8204",
+    "05AC-8205",
+    "05AC-8206",
+    "05AC-8207",
+    "05AC-820F",
+    "05AC-8210",
+    "05AC-8213",
+    "05AC-8215",
+    "05AC-8216",
+    "05AC-8217",
+    "05AC-8218",
+    "05AC-821A",
+    "05AC-821B",
+    "05AC-821D",
+    "05AC-821F",
+    "05AC-8281",
+    "05AC-8286",
+    "05AC-8289",
+    "05AC-828A",
+    "05AC-828B",
+    "05AC-828C",
+    "05AC-828D",
+    "05AC-828F",
+    "05AC-8290",
+    "05AC-8291",
+    "05AC-8294",
+    "05AC-8296",
+    "05AC-F007",
     "0A12-0001"
 ]
 
diff --git a/Scripts/kext_maestro.py b/Scripts/kext_maestro.py
index acd5267..c82666f 100644
--- a/Scripts/kext_maestro.py
+++ b/Scripts/kext_maestro.py
@@ -202,7 +202,7 @@ class KextMaestro:
                 selected_kexts.append("BrcmFirmwareData")
             elif usb_id in pci_data.IntelBluetoothIDs:
                 selected_kexts.append("IntelBluetoothFirmware")
-            elif usb_id in pci_data.BluetoothDongleIDs:
+            elif usb_id in pci_data.BluetoothIDs[-1]:
                 selected_kexts.append("BlueToolFixup")
 
         if "Laptop" in hardware_report.get("Motherboard").get("Platform"):