diff --git a/device- b/device-
new file mode 100644
index 00000000..e69de29b
diff --git a/quirks/30-vendor-starlabs.quirks b/quirks/30-vendor-starlabs.quirks
deleted file mode 100644
index 845c0916..00000000
--- a/quirks/30-vendor-starlabs.quirks
+++ /dev/null
@@ -1,35 +0,0 @@
-[StarBook Mk V]
-MatchName=STAR0001:00 093A:0255 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:pnStarBook*
-AttrEventCodeDisable=BTN_RIGHT
-
-[StarLabTop Mk IV - coreboot firmware]
-MatchName=STAR0001:00 093A:1336 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:pnLabTop*
-AttrEventCodeDisable=BTN_RIGHT
-
-[StarLabTop Mk IV - AMI firmware]
-MatchName=PCT1336:00 093A:1336 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:pnLabTop*
-AttrEventCodeDisable=BTN_RIGHT
-
-[StarLite Mk IV - AMI firmware]
-MatchName=HTIX5288:00 093A:0255 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:pnStarLite*
-AttrEventCodeDisable=BTN_RIGHT
-
-[StarLite Mk III - coreboot firmware]
-MatchName=STAR0001:00 093A:0255 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:pnLite*
-AttrEventCodeDisable=BTN_RIGHT
-
-[StarLite Mk III - AMI firmware]
-MatchName=HTIX5288:00 093A:0255 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:pnLite*
-AttrEventCodeDisable=BTN_RIGHT
diff --git a/quirks/50-system-starlabs.quirks b/quirks/50-system-starlabs.quirks
new file mode 100644
index 00000000..9864d85b
--- /dev/null
+++ b/quirks/50-system-starlabs.quirks
@@ -0,0 +1,6 @@
+[Star Labs Touchpad]
+MatchName=*Touchpad
+MatchUdevType=touchpad
+MatchDMIModalias=dmi:*svnStarLabs:*
+AttrEventCodeDisable=BTN_RIGHT
+AttrInputPropEnable=INPUT_PROP_BUTTONPAD