diff --git a/data/wacom-hid-52EB-pen.tablet b/data/wacom-hid-52EB-pen.tablet
deleted file mode 100644
index b2d21344..00000000
--- a/data/wacom-hid-52EB-pen.tablet
+++ /dev/null
@@ -1,22 +0,0 @@
-# Wacom
-# Wacom HID 52EB Pen
-# WACF2200
-#
-# sysinfo.0VeQaUVnQ1
-# https://github.com/linuxwacom/wacom-hid-descriptors/issues/369
-
-[Device]
-Name=Wacom HID 52EB Pen
-ModelName=WACF2200
-Class=ISDV4
-DeviceMatch=i2c|056a|52eb;
-Width=11
-Height=7
-# No pad buttons, so no layout
-IntegratedIn=Display;System
-
-[Features]
-Stylus=true
-Reversible=false
-Touch=true
-NumRings=0
diff --git a/data/wacom-hid-52c6.tablet b/data/wacom-hid-52c6.tablet
deleted file mode 100644
index 3fafbe7d..00000000
--- a/data/wacom-hid-52c6.tablet
+++ /dev/null
@@ -1,22 +0,0 @@
-# Wacom
-# Wacom HID 52C6 Pen
-# AES sensor used by the Lenovo Ideapad Flex 5 14ALC7
-#
-# sysinfo.6QHqFdEfjw
-# https://github.com/linuxwacom/wacom-hid-descriptors/issues/413
-
-[Device]
-Name=Wacom HID 52C6
-ModelName=
-Class=ISDV4
-DeviceMatch=i2c|056a|52c6;
-Width=11
-Height=7
-# No pad buttons, so no layout
-IntegratedIn=Display;System
-Styli=@isdv4-aes
-
-[Features]
-Stylus=true
-Touch=true
-Buttons=0
diff --git a/data/wacom-isdv4-0157.tablet b/data/wacom-isdv4-0157.tablet
new file mode 100644
index 00000000..d413975a
--- /dev/null
+++ b/data/wacom-isdv4-0157.tablet
@@ -0,0 +1,23 @@
+# Fujitsu LIFEBOOK T936
+# Sensor Type: EMR
+# Features: Touch (External)
+# HW Resolution: 29376 x 16524 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.jF9DJLUSnM
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/358#issue-2104309860
+
+[Device]
+Name=Wacom ISDv4 0157
+ModelName=
+DeviceMatch=usb|056a|0157
+PairedID=usb|04f3|2256
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/wacom-isdv4-49a5.tablet b/data/wacom-isdv4-49a5.tablet
new file mode 100644
index 00000000..fcc7a512
--- /dev/null
+++ b/data/wacom-isdv4-49a5.tablet
@@ -0,0 +1,22 @@
+# Dell Latitude 7320 Detachable
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 27446 x 18298 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.y2hugf5RZ2
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/347#issue-2067667276
+
+[Device]
+Name=Wacom ISDv4 49a5
+ModelName=
+DeviceMatch=i2c|056a|49a5
+Class=ISDV4
+Width=11
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/wacom-isdv4-50a0.tablet b/data/wacom-isdv4-50a0.tablet
index 0ab65085..74c94269 100644
--- a/data/wacom-isdv4-50a0.tablet
+++ b/data/wacom-isdv4-50a0.tablet
@@ -1,10 +1,13 @@
-# this is for the Wacom pen + touchscreen as found in some versions of the Lenovo ThinkPad Yoga 370
+# Lenovo Thinkpad YOGA370
+# Sensor Type: AES
+# Features: Touch (Integrated)
+# HW Resolution: 29376 x 16524 (2540 x 2540 lpi)
 #
-# sysinfo.i8xtfznvRF.tar.gz
-# https://github.com/linuxwacom/wacom-hid-descriptors/issues/359
+# Autogenerated from sysinfo.i8xtfznvRF
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/359#issue-2109402610
 
 [Device]
-Name=Wacom ISDv4 50A0
+Name=Wacom ISDv4 50a0
 ModelName=
 DeviceMatch=usb|056a|50a0
 Class=ISDV4
diff --git a/data/wacom-isdv4-51fe.tablet b/data/wacom-isdv4-51fe.tablet
new file mode 100644
index 00000000..7171ef1d
--- /dev/null
+++ b/data/wacom-isdv4-51fe.tablet
@@ -0,0 +1,22 @@
+# Lenovo IDEAPAD YOGA9
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 34422 x 19362 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.1vwpatoo08
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/374#issue-2261022943
+
+[Device]
+Name=Wacom ISDv4 51fe
+ModelName=
+DeviceMatch=i2c|056a|51fe
+Class=ISDV4
+Width=14
+Height=8
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/wacom-isdv4-52c6.tablet b/data/wacom-isdv4-52c6.tablet
new file mode 100644
index 00000000..de797a67
--- /dev/null
+++ b/data/wacom-isdv4-52c6.tablet
@@ -0,0 +1,22 @@
+# Lenovo IdeaPad Flex 5 14ALC7
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30153 x 18845 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.1zd7apz0XS
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/371#issue-2233537851
+
+[Device]
+Name=Wacom ISDv4 52c6
+ModelName=
+DeviceMatch=i2c|056a|52c6
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/wacom-isdv4-52eb.tablet b/data/wacom-isdv4-52eb.tablet
new file mode 100644
index 00000000..9a39e95c
--- /dev/null
+++ b/data/wacom-isdv4-52eb.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad L13 Yoga Gen 3
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 28604 x 17878 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.0VeQaUVnQ1
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/369#issuecomment-2016834442
+
+[Device]
+Name=Wacom ISDv4 52eb
+ModelName=
+DeviceMatch=i2c|056a|52eb
+Class=ISDV4
+Width=11
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/wacom-isdv4-5309.tablet b/data/wacom-isdv4-5309.tablet
index eccf6843..b1c174d2 100644
--- a/data/wacom-isdv4-5309.tablet
+++ b/data/wacom-isdv4-5309.tablet
@@ -1,13 +1,13 @@
-# Lenovo ThinkPad X1 Yoga Gen 7
+# Lenovo ThinkPad X1 Yoga Gen 7 (21CES00100)
 # Sensor Type: AES
 # Features: Touch (Integrated), Tilt
-# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+# HW Resolution: 30165 x 18853 (2540 x 2540 lpi)
 #
-# Manually generated from sysinfo.up1aDlcShX
-# https://github.com/linuxwacom/wacom-hid-descriptors/issues/353
+# Autogenerated from sysinfo.Vy5OTYeU2H
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/353#issue-2080466173
 
 [Device]
-Name=ISDv4 5309
+Name=Wacom ISDv4 5309
 ModelName=
 DeviceMatch=i2c|056a|5309
 Class=ISDV4
@@ -19,3 +19,4 @@ Styli=@isdv4-aes;
 [Features]
 Stylus=true
 Touch=true
+Buttons=0
diff --git a/data/wacom-isdv4-5349.tablet b/data/wacom-isdv4-5349.tablet
new file mode 100644
index 00000000..07574910
--- /dev/null
+++ b/data/wacom-isdv4-5349.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 8
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.2o2YGbUAHn
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/345#issue-2058618177
+
+[Device]
+Name=Wacom ISDv4 5349
+ModelName=
+DeviceMatch=i2c|056a|5349
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/wacom-isdv4-53a7.tablet b/data/wacom-isdv4-53a7.tablet
new file mode 100644
index 00000000..1b9ff40a
--- /dev/null
+++ b/data/wacom-isdv4-53a7.tablet
@@ -0,0 +1,22 @@
+# Lenovo Yoga 9 2-in-1 14IMH9
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30182 x 18864 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.P1oojt1iSY
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/373#issue-2255198372
+
+[Device]
+Name=Wacom ISDv4 53a7
+ModelName=
+DeviceMatch=i2c|056a|53a7
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/wacom-isdv4-8191.tablet b/data/wacom-isdv4-8191.tablet
new file mode 100644
index 00000000..72348efa
--- /dev/null
+++ b/data/wacom-isdv4-8191.tablet
@@ -0,0 +1,22 @@
+# espresso Touch 15
+# Sensor Type: AES
+# Features: Touch, Tilt
+# HW Resolution: 16383 x 9599 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.pzZajuS1x3
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/365#issue-2166475084
+
+[Device]
+Name=Wacom ISDv4 8191
+ModelName=
+DeviceMatch=usb|056a|8191
+Class=ISDV4
+Width=6
+Height=4
+IntegratedIn=Display;System
+
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0