diff --git a/quirks/30-vendor-pixart.quirks b/quirks/30-vendor-pixart.quirks
new file mode 100644
index 00000000..629ab0fd
--- /dev/null
+++ b/quirks/30-vendor-pixart.quirks
@@ -0,0 +1,28 @@
+# Do not edit this file, it will be overwritten on update
+
+# GPD Win Max - All versions
+# TongFang GX4 (X4SP4NAL)
+[Pixart Touchpad (093A:0255)]
+MatchBus=i2c
+MatchUdevType=touchpad
+MatchVendor=0x093A
+MatchProduct=0x0255
+AttrEventCode=-BTN_RIGHT
+
+# Framework Laptop
+# PCSpecialist Recoil 17
+[Pixart Touchpad (093A:0274)]
+MatchBus=i2c
+MatchUdevType=touchpad
+MatchVendor=0x093A
+MatchProduct=0x0274
+AttrEventCode=-BTN_RIGHT
+
+# Chuwi AeroBook Plus
+# Chuwi Gemibook
+[Pixart Touchpad (093A:1336)]
+MatchBus=i2c
+MatchUdevType=touchpad
+MatchVendor=0x093A
+MatchProduct=0x1336
+AttrEventCode=-BTN_RIGHT
diff --git a/quirks/30-vendor-uniwill.quirks b/quirks/30-vendor-uniwill.quirks
deleted file mode 100644
index e3907990..00000000
--- a/quirks/30-vendor-uniwill.quirks
+++ /dev/null
@@ -1,9 +0,0 @@
-# Do not edit this file, it will be overwritten on update
-
-# Tested on PCSpecialist Recoil 17
-[Uniwill Touchpad]
-MatchUdevType=touchpad
-MatchBus=i2c
-MatchVendor=0x093A
-MatchProduct=0x0274
-AttrEventCode=-BTN_RIGHT
diff --git a/quirks/50-system-chuwi.quirks b/quirks/50-system-chuwi.quirks
deleted file mode 100644
index ac90037a..00000000
--- a/quirks/50-system-chuwi.quirks
+++ /dev/null
@@ -1,9 +0,0 @@
-[Chuwi Gemibook]
-MatchName=HTIX5288:00 093A:1336 Touchpad
-MatchUdevType=touchpad
-AttrEventCode=-BTN_RIGHT
-
-[Chuwi AeroBook Plus]
-MatchName=SYNA3602:01 093A:1336 Touchpad
-MatchUdevType=touchpad
-AttrEventCode=-BTN_RIGHT
diff --git a/quirks/50-system-framework.quirks b/quirks/50-system-framework.quirks
index 3f4408ec..48dc2bcc 100644
--- a/quirks/50-system-framework.quirks
+++ b/quirks/50-system-framework.quirks
@@ -1,8 +1,4 @@
-[Framework Laptop Touchpad]
-MatchName=PIXA3854:00 093A:0274 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnFramework:pnLaptop*
-AttrEventCode=-BTN_RIGHT
+# Do not edit this file, it will be overwritten on update
 
 [Framework Laptop 16 Keyboard Module]
 MatchName=Framework Laptop 16 Keyboard Module*
diff --git a/quirks/50-system-gpd.quirks b/quirks/50-system-gpd.quirks
index f1432995..87e8aa4e 100644
--- a/quirks/50-system-gpd.quirks
+++ b/quirks/50-system-gpd.quirks
@@ -1,8 +1,4 @@
-[GPD Win Max - All versions]
-MatchName=HTIX5288:00 093A:0255 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnGPD:*pnG1619-*
-AttrEventCode=-BTN_RIGHT
+# Do not edit this file, it will be overwritten on update
 
 [GPD MicroPC 2 Touchpad]
 MatchName=ALPS0001:00 36B6:C001 Touchpad
diff --git a/quirks/50-system-tongfang.quirks b/quirks/50-system-tongfang.quirks
deleted file mode 100644
index e7f2aa45..00000000
--- a/quirks/50-system-tongfang.quirks
+++ /dev/null
@@ -1,5 +0,0 @@
-[TongFang GX4 (X4SP4NAL) Touchpad]
-MatchName=UNIW0001:00 093A:0255 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnAiStone:pnX4SP4NAL:*
-AttrEventCode=-BTN_RIGHT