Index: libwacom-1.3/data/isdv4-2d1f-002e.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-2d1f-002e.tablet
+++ libwacom-1.3/data/isdv4-2d1f-002e.tablet
@@ -9,6 +9,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4800.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4800.tablet
+++ libwacom-1.3/data/isdv4-4800.tablet
@@ -6,6 +6,7 @@ ModelName=
 DeviceMatch=i2c:056a:4800
 Class=ISDV4
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4806.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4806.tablet
+++ libwacom-1.3/data/isdv4-4806.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=9
 Height=5
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4807.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4807.tablet
+++ libwacom-1.3/data/isdv4-4807.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=9
 Height=5
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4809.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4809.tablet
+++ libwacom-1.3/data/isdv4-4809.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=4
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4814.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4814.tablet
+++ libwacom-1.3/data/isdv4-4814.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=10
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-481a.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-481a.tablet
+++ libwacom-1.3/data/isdv4-481a.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4822.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4822.tablet
+++ libwacom-1.3/data/isdv4-4822.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4824.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4824.tablet
+++ libwacom-1.3/data/isdv4-4824.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=4
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4831.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4831.tablet
+++ libwacom-1.3/data/isdv4-4831.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4841.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4841.tablet
+++ libwacom-1.3/data/isdv4-4841.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-484c.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-484c.tablet
+++ libwacom-1.3/data/isdv4-484c.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=10
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-485e.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-485e.tablet
+++ libwacom-1.3/data/isdv4-485e.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=10
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4865.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4865.tablet
+++ libwacom-1.3/data/isdv4-4865.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-486a.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-486a.tablet
+++ libwacom-1.3/data/isdv4-486a.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4870.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4870.tablet
+++ libwacom-1.3/data/isdv4-4870.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-4875.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-4875.tablet
+++ libwacom-1.3/data/isdv4-4875.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-488f.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-488f.tablet
+++ libwacom-1.3/data/isdv4-488f.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-48c9.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-48c9.tablet
+++ libwacom-1.3/data/isdv4-48c9.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-48ec.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-48ec.tablet
+++ libwacom-1.3/data/isdv4-48ec.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-48ed.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-48ed.tablet
+++ libwacom-1.3/data/isdv4-48ed.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-48ee.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-48ee.tablet
+++ libwacom-1.3/data/isdv4-48ee.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5010.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5010.tablet
+++ libwacom-1.3/data/isdv4-5010.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5013.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5013.tablet
+++ libwacom-1.3/data/isdv4-5013.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5014.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5014.tablet
+++ libwacom-1.3/data/isdv4-5014.tablet
@@ -9,6 +9,7 @@ Class=ISDV4
 Width=10
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-502a.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-502a.tablet
+++ libwacom-1.3/data/isdv4-502a.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-503e.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-503e.tablet
+++ libwacom-1.3/data/isdv4-503e.tablet
@@ -10,6 +10,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-503f.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-503f.tablet
+++ libwacom-1.3/data/isdv4-503f.tablet
@@ -10,6 +10,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5040.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5040.tablet
+++ libwacom-1.3/data/isdv4-5040.tablet
@@ -11,6 +11,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5044.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5044.tablet
+++ libwacom-1.3/data/isdv4-5044.tablet
@@ -11,6 +11,7 @@ Class=ISDV4
 Width=11
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5048.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5048.tablet
+++ libwacom-1.3/data/isdv4-5048.tablet
@@ -10,6 +10,7 @@ Class=ISDV4
 Width=10
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-504a.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-504a.tablet
+++ libwacom-1.3/data/isdv4-504a.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5090.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5090.tablet
+++ libwacom-1.3/data/isdv4-5090.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5099.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5099.tablet
+++ libwacom-1.3/data/isdv4-5099.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=10
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-509d.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-509d.tablet
+++ libwacom-1.3/data/isdv4-509d.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-509f.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-509f.tablet
+++ libwacom-1.3/data/isdv4-509f.tablet
@@ -14,6 +14,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50b4.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50b4.tablet
+++ libwacom-1.3/data/isdv4-50b4.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50b6.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50b6.tablet
+++ libwacom-1.3/data/isdv4-50b6.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50b8.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50b8.tablet
+++ libwacom-1.3/data/isdv4-50b8.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50db.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50db.tablet
+++ libwacom-1.3/data/isdv4-50db.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50e9.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50e9.tablet
+++ libwacom-1.3/data/isdv4-50e9.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50ef.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50ef.tablet
+++ libwacom-1.3/data/isdv4-50ef.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50f1.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50f1.tablet
+++ libwacom-1.3/data/isdv4-50f1.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50f8.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50f8.tablet
+++ libwacom-1.3/data/isdv4-50f8.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-50fd.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-50fd.tablet
+++ libwacom-1.3/data/isdv4-50fd.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5110.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5110.tablet
+++ libwacom-1.3/data/isdv4-5110.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5115.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5115.tablet
+++ libwacom-1.3/data/isdv4-5115.tablet
@@ -7,7 +7,7 @@ Class=ISDV4
 Width=10
 Height=7
 IntegratedIn=Display;System
-Styli=0x21;
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5122.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5122.tablet
+++ libwacom-1.3/data/isdv4-5122.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=10
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5128.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5128.tablet
+++ libwacom-1.3/data/isdv4-5128.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=11
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-513b.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-513b.tablet
+++ libwacom-1.3/data/isdv4-513b.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=10
 Height=6
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5146.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5146.tablet
+++ libwacom-1.3/data/isdv4-5146.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5147.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5147.tablet
+++ libwacom-1.3/data/isdv4-5147.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5150.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5150.tablet
+++ libwacom-1.3/data/isdv4-5150.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5157.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5157.tablet
+++ libwacom-1.3/data/isdv4-5157.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System;
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5158.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5158.tablet
+++ libwacom-1.3/data/isdv4-5158.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System;
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-515a.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-515a.tablet
+++ libwacom-1.3/data/isdv4-515a.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System;
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5169.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5169.tablet
+++ libwacom-1.3/data/isdv4-5169.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-516b.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-516b.tablet
+++ libwacom-1.3/data/isdv4-516b.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-517d.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-517d.tablet
+++ libwacom-1.3/data/isdv4-517d.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5196.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5196.tablet
+++ libwacom-1.3/data/isdv4-5196.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51a0.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51a0.tablet
+++ libwacom-1.3/data/isdv4-51a0.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=14
 Height=8
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51af.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51af.tablet
+++ libwacom-1.3/data/isdv4-51af.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51b0.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51b0.tablet
+++ libwacom-1.3/data/isdv4-51b0.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51b1.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51b1.tablet
+++ libwacom-1.3/data/isdv4-51b1.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51b2.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51b2.tablet
+++ libwacom-1.3/data/isdv4-51b2.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51b3.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51b3.tablet
+++ libwacom-1.3/data/isdv4-51b3.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51b6.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51b6.tablet
+++ libwacom-1.3/data/isdv4-51b6.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51b7.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51b7.tablet
+++ libwacom-1.3/data/isdv4-51b7.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51b8.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51b8.tablet
+++ libwacom-1.3/data/isdv4-51b8.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51b9.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51b9.tablet
+++ libwacom-1.3/data/isdv4-51b9.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51ba.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51ba.tablet
+++ libwacom-1.3/data/isdv4-51ba.tablet
@@ -10,6 +10,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51bb.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51bb.tablet
+++ libwacom-1.3/data/isdv4-51bb.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51bc.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51bc.tablet
+++ libwacom-1.3/data/isdv4-51bc.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51bd.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51bd.tablet
+++ libwacom-1.3/data/isdv4-51bd.tablet
@@ -10,6 +10,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51be.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51be.tablet
+++ libwacom-1.3/data/isdv4-51be.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51bf.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51bf.tablet
+++ libwacom-1.3/data/isdv4-51bf.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51c4.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51c4.tablet
+++ libwacom-1.3/data/isdv4-51c4.tablet
@@ -8,6 +8,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51e2.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51e2.tablet
+++ libwacom-1.3/data/isdv4-51e2.tablet
@@ -9,6 +9,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51f5.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51f5.tablet
+++ libwacom-1.3/data/isdv4-51f5.tablet
@@ -9,6 +9,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-51f6.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-51f6.tablet
+++ libwacom-1.3/data/isdv4-51f6.tablet
@@ -9,6 +9,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-521f.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-521f.tablet
+++ libwacom-1.3/data/isdv4-521f.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5221.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5221.tablet
+++ libwacom-1.3/data/isdv4-5221.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true
Index: libwacom-1.3/data/isdv4-5222.tablet
===================================================================
--- libwacom-1.3.orig/data/isdv4-5222.tablet
+++ libwacom-1.3/data/isdv4-5222.tablet
@@ -15,6 +15,7 @@ Class=ISDV4
 Width=12
 Height=7
 IntegratedIn=Display;System
+Styli=@isdv4-aes;
 
 [Features]
 Stylus=true