diff --git a/Scripts/acpi_guru.py b/Scripts/acpi_guru.py
index b109a14..358a019 100644
--- a/Scripts/acpi_guru.py
+++ b/Scripts/acpi_guru.py
@@ -3282,7 +3282,7 @@ DefinitionBlock ("", "SSDT", 2, "ZPSS", "WMIS", 0x00000000)
         if all(network_props.get("Bus Type") == "USB" for network_props in hardware_report.get("Network", {}).values()):
             selected_patches.append("RMNE")
 
-        if hardware_report.get("Motherboard").get("Chipset") in ("C610/X99", "Wellsburg", "X299"):
+        if hardware_report.get("Motherboard").get("Chipset") in chipset_data.IntelChipsets[62:64] + chipset_data.IntelChipsets[90:100]:
             selected_patches.append("RTC0")
 
         if "AMD" in hardware_report.get("CPU").get("Manufacturer") or hardware_report.get("CPU").get("Codename") in cpu_data.IntelCPUGenerations[:40]:
@@ -3299,7 +3299,7 @@ DefinitionBlock ("", "SSDT", 2, "ZPSS", "WMIS", 0x00000000)
                     if "I2C" in device_info.get("Device Type", "None"):
                         selected_patches.append("GPI0")
 
-        if hardware_report.get("Motherboard").get("Chipset") in ("C600/X79", "C610/X99", "Wellsburg"):
+        if hardware_report.get("Motherboard").get("Chipset") in chipset_data.IntelChipsets[27:28] + chipset_data.IntelChipsets[62:64]:
             selected_patches.append("UNC")
         
         if "AMD" in hardware_report.get("CPU").get("Manufacturer") or hardware_report.get("Motherboard").get("Chipset") in chipset_data.IntelChipsets[112:]:
diff --git a/Scripts/config_prodigy.py b/Scripts/config_prodigy.py
index a56408b..e2f276f 100644
--- a/Scripts/config_prodigy.py
+++ b/Scripts/config_prodigy.py
@@ -622,7 +622,7 @@ class ConfigProdigy:
             hardware_report.get("Motherboard").get("Chipset") in chipset_data.IntelChipsets[104:112] and ("Desktop" in hardware_report.get("Motherboard").get("Platform") or not "-8" in hardware_report.get("CPU").get("Processor Name")) or \
             hardware_report.get("Motherboard").get("Chipset") == chipset_data.AMDChipsets[16]
         config["Booter"]["Quirks"]["EnableSafeModeSlide"] = hardware_report.get("BIOS").get("Firmware Type") == "UEFI"
-        config["Booter"]["Quirks"]["EnableWriteUnprotector"] = not (hardware_report.get("BIOS").get("Firmware Type") == "Legacy" or "AMD" in hardware_report.get("CPU").get("Manufacturer") or hardware_report.get("Motherboard").get("Chipset") in chipset_data.IntelChipsets[90:100] + chipset_data.IntelChipsets[112:])
+        config["Booter"]["Quirks"]["EnableWriteUnprotector"] = not (hardware_report.get("BIOS").get("Firmware Type") == "Legacy" or "AMD" in hardware_report.get("CPU").get("Manufacturer") or hardware_report.get("Motherboard").get("Chipset") in chipset_data.IntelChipsets[91:100] + chipset_data.IntelChipsets[112:])
         config["Booter"]["Quirks"]["ProtectMemoryRegions"] = "GOOGLE" in hardware_report.get("Motherboard").get("Name") or any(device_props.get("Device ID") in pci_data.ChromebookIDs and device_props.get("Subsystem ID") in pci_data.ChromebookIDs[device_props.get("Device ID")] for device_props in hardware_report.get("System Devices", {}).values())
         config["Booter"]["Quirks"]["FixupAppleEfiImages"] = not (hardware_report.get("BIOS").get("Firmware Type") == "Legacy" and self.utils.parse_darwin_version("17.0.0") < self.utils.parse_darwin_version(macos_version))
         config["Booter"]["Quirks"]["ProtectUefiServices"] = hardware_report.get("Motherboard").get("Chipset") in chipset_data.IntelChipsets[112:] or \
diff --git a/Scripts/datasets/chipset_data.py b/Scripts/datasets/chipset_data.py
index 8d47fc8..f563998 100644
--- a/Scripts/datasets/chipset_data.py
+++ b/Scripts/datasets/chipset_data.py
@@ -57,12 +57,12 @@ IntelChipsets = [
     "C224",
     "C226",
     "H81",
-    "Wellsburg",
     "HM97",
     "Z97",
     "QM97",
     "H97",
     "C610/X99",
+    "Wellsburg",
     "Wildcat Point-LP",
     "Sunrise Point-LP",
     "Sunrise Point",
@@ -89,6 +89,7 @@ IntelChipsets = [
     "Q250",
     "B250",
     "B365",
+    "C422",
     "C621",
     "C622",
     "C624",
@@ -97,7 +98,6 @@ IntelChipsets = [
     "C627",
     "C628",
     "X299",
-    "C422",
     "Lewisburg",
     "Cannon Point-LP",
     "C246",