diff --git a/data/huion-gc610-710.tablet b/data/huion-gc610-710.tablet
index c8f16b05..126306d3 100644
--- a/data/huion-gc610-710.tablet
+++ b/data/huion-gc610-710.tablet
@@ -17,7 +17,7 @@ Styli=@generic-no-eraser;
 IntegratedIn=
 
 [Features]
-NumStrips=1
+NumStrips=0
 NumRings=0
 Reversible=true
 Stylus=true
diff --git a/data/huion-hc16.tablet b/data/huion-hc16.tablet
index 3df75318..32b23b6b 100644
--- a/data/huion-hc16.tablet
+++ b/data/huion-hc16.tablet
@@ -17,8 +17,8 @@ Styli=@generic-no-eraser;
 IntegratedIn=
 
 [Features]
-NumStrips=1
-NumRings=0
+NumStrips=0
+NumRings=1
 Reversible=true
 Stylus=true
 Touch=false
diff --git a/data/huion-inspiroy-g10t.tablet b/data/huion-inspiroy-g10t.tablet
index 1b81252e..9c1c5f8a 100644
--- a/data/huion-inspiroy-g10t.tablet
+++ b/data/huion-inspiroy-g10t.tablet
@@ -17,7 +17,7 @@ Styli=@generic-no-eraser;
 IntegratedIn=
 
 [Features]
-NumStrips=1
+NumStrips=0
 NumRings=0
 Reversible=true
 Stylus=true
diff --git a/data/huion-kamvas-gt-221-pro.tablet b/data/huion-kamvas-gt-221-pro.tablet
deleted file mode 100644
index d9b08ac4..00000000
--- a/data/huion-kamvas-gt-221-pro.tablet
+++ /dev/null
@@ -1,29 +0,0 @@
-# This tablet description file has been generated using an automated tool:
-# https://github.com/JoseExposito/uclogic-libwacom-tablet-descriptions
-# If you own this tablet, please improve it.
-#
-# sysinfo missing - if you own this device please provide it. See this link
-# for details: https://github.com/linuxwacom/libwacom/wiki/Adding-a-new-device
-
-[Device]
-Name=KAMVAS  GT-221 Pro
-ModelName=KAMVAS  GT-221 Pro
-# Product ID is unknown, please fix
-DeviceMatch=usb|256c|006e||HUION_M167;usb|256c|006d||HUION_M167;usb|256c|006f||HUION_M167;usb|256c|0064||HUION_M167;
-Width=9  # autogenerated value, please fix
-Height=6  # autogenerated value, please fix
-Layout=huion-kamvas-gt-221-pro.svg
-Styli=@generic-no-eraser;
-IntegratedIn=Display
-
-[Features]
-NumStrips=2
-NumRings=0
-Reversible=false
-Stylus=true
-Touch=false
-TouchSwitch=false
-
-[Buttons]
-Left=A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T
-EvdevCodes=BTN_0;BTN_1;BTN_2;BTN_3;BTN_4;BTN_5;BTN_6;BTN_7;BTN_8;BTN_9;BTN_SOUTH;BTN_EAST;BTN_C;BTN_NORTH;BTN_WEST;BTN_Z;BTN_TL;BTN_TR;BTN_TL2;BTN_TR2
diff --git a/data/huion-kamvas-pro-22-gt-221.tablet b/data/huion-kamvas-pro-22-gt-221.tablet
index c0644d2c..530008f7 100644
--- a/data/huion-kamvas-pro-22-gt-221.tablet
+++ b/data/huion-kamvas-pro-22-gt-221.tablet
@@ -9,9 +9,9 @@
 Name=KAMVAS Pro 22 GT-221
 ModelName=KAMVAS Pro 22 GT-221
 # Product ID is unknown, please fix
-DeviceMatch=usb|256c|006e||HUION_M175;usb|256c|006d||HUION_M175;usb|256c|006f||HUION_M175;usb|256c|0064||HUION_M175;
-Width=9  # autogenerated value, please fix
-Height=6  # autogenerated value, please fix
+DeviceMatch=usb|256c|006e||HUION_M167;usb|256c|006d||HUION_M167;usb|256c|006f||HUION_M167;usb|256c|0064||HUION_M167;usb|256c|006e||HUION_M175;usb|256c|006d||HUION_M175;usb|256c|006f||HUION_M175;usb|256c|0064||HUION_M175;usb|256c|006e||HUION_M194;usb|256c|006d||HUION_M194;usb|256c|006f||HUION_M194;usb|256c|0064||HUION_M194;
+Width=19
+Height=11
 Layout=huion-kamvas-pro-22-gt-221.svg
 Styli=@generic-no-eraser;
 IntegratedIn=Display
diff --git a/data/huion-kamvas-pro-studio-22.tablet b/data/huion-kamvas-pro-studio-22.tablet
deleted file mode 100644
index 64992eba..00000000
--- a/data/huion-kamvas-pro-studio-22.tablet
+++ /dev/null
@@ -1,29 +0,0 @@
-# This tablet description file has been generated using an automated tool:
-# https://github.com/JoseExposito/uclogic-libwacom-tablet-descriptions
-# If you own this tablet, please improve it.
-#
-# sysinfo missing - if you own this device please provide it. See this link
-# for details: https://github.com/linuxwacom/libwacom/wiki/Adding-a-new-device
-
-[Device]
-Name=KAMVAS Pro/Studio 22
-ModelName=KAMVAS Pro/Studio 22
-# Product ID is unknown, please fix
-DeviceMatch=usb|256c|006e||HUION_M194;usb|256c|006d||HUION_M194;usb|256c|006f||HUION_M194;usb|256c|0064||HUION_M194;
-Width=9  # autogenerated value, please fix
-Height=6  # autogenerated value, please fix
-Layout=huion-kamvas-pro-studio-22.svg
-Styli=@generic-no-eraser;
-IntegratedIn=Display
-
-[Features]
-NumStrips=2
-NumRings=0
-Reversible=false
-Stylus=true
-Touch=false
-TouchSwitch=false
-
-[Buttons]
-Left=A;B;C;D;E;F;G;H;I;J;K;L;M;N;O;P;Q;R;S;T
-EvdevCodes=BTN_0;BTN_1;BTN_2;BTN_3;BTN_4;BTN_5;BTN_6;BTN_7;BTN_8;BTN_9;BTN_SOUTH;BTN_EAST;BTN_C;BTN_NORTH;BTN_WEST;BTN_Z;BTN_TL;BTN_TR;BTN_TL2;BTN_TR2
diff --git a/data/layouts/huion-hc16.svg b/data/layouts/huion-hc16.svg
index 5bda2751..159e810f 100644
--- a/data/layouts/huion-hc16.svg
+++ b/data/layouts/huion-hc16.svg
@@ -68,4 +68,48 @@
     <text id="LabelM" class="M Label" x="102.0" y="217" style="text-anchor:start;">M</text>
     <path style="fill:none" d="M 87.0,215.0 H 94.0" id="LeaderM" class="Leader M"/>
   </g>
+  <g
+    id="g48"
+    transform="matrix(2.2820631,0,0,2.2820631,-14.358852,-70.068449)"
+    style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.10955;stroke-dasharray:none">
+    <circle
+      id="Ring"
+      class="Ring TouchRing"
+      cx="34"
+      cy="125"
+      r="19.5"
+      style="stroke-width:0.10955;stroke-dasharray:none" />
+    <path
+      id="LeaderRingCCW"
+      class="RingCCW Ring Leader"
+      d="m 34,105 v -2 h 26"
+      style="stroke-width:0.10955;stroke-dasharray:none" />
+    <text
+      id="LabelRingCCW"
+      class="RingCCW Ring Label"
+      x="62"
+      y="103"
+      style="line-height:0%;text-anchor:start;stroke-width:0.10955;stroke-dasharray:none">CCW</text>
+    <path
+      id="RingCCW"
+      class="RingCCW Button"
+      d="m 31,111 3,-1.5 v 1 a 7.5,7.5 0 0 1 5,1.5 6.5,6.5 0 0 0 -5,-0.5 v 1 z"
+      style="stroke-width:0.10955;stroke-dasharray:none" />
+    <path
+      id="LeaderRingCW"
+      class="RingCW Ring Leader"
+      d="m 34,145 v 2 h 26"
+      style="stroke-width:0.10955;stroke-dasharray:none" />
+    <text
+      id="LabelRingCW"
+      class="RingCW Ring Label"
+      x="62"
+      y="147"
+      style="line-height:0%;text-anchor:start;stroke-width:0.10955;stroke-dasharray:none">CW</text>
+    <path
+      id="RingCW"
+      class="RingCW Button"
+      d="m 31,139 3,-1.5 v 1 a 7.5,7.5 0 0 0 5,-1 6.5,6.5 0 0 1 -5,2 v 1 z"
+      style="stroke-width:0.10955;stroke-dasharray:none" />
+    </g>
 </svg>
diff --git a/data/layouts/huion-inspiroy-h1161.svg b/data/layouts/huion-inspiroy-h1161.svg
index e1312ea6..232754ea 100644
--- a/data/layouts/huion-inspiroy-h1161.svg
+++ b/data/layouts/huion-inspiroy-h1161.svg
@@ -24,9 +24,9 @@
     <path style="fill:none" d="M 76.0,162.0 H 83.0" id="LeaderD" class="Leader D"/>
   </g>
   <g>
-    <rect id="ButtonE" class="E Button" x="33" y="180" width="38" height="34"/>
-    <text id="LabelE" class="E Label" x="90.0" y="199" style="text-anchor:start;">E</text>
-    <path style="fill:none" d="M 75.0,197.0 H 82.0" id="LeaderE" class="Leader E"/>
+    <rect id="ButtonE" class="E Button ModeSwitch" x="33" y="180" width="38" height="34"/>
+    <text id="LabelE" class="E Label ModeSwitch" x="90.0" y="199" style="text-anchor:start;">E</text>
+    <path style="fill:none" d="M 75.0,197.0 H 82.0" id="LeaderE" class="Leader E ModeSwitch"/>
   </g>
   <g>
     <rect id="ButtonF" class="F Button" x="33" y="217" width="38" height="30"/>
@@ -53,4 +53,12 @@
     <text id="LabelJ" class="J Label" x="91.0" y="367" style="text-anchor:start;">J</text>
     <path style="fill:none" d="M 76.0,365.0 H 83.0" id="LeaderJ" class="Leader J"/>
   </g>
+
+  <g>
+    <rect id="Strip" class="Strip TouchStrip" x="120" y="116" width="6" height="200"/>
+    <text id="LabelStripUp" class="StripUp Strip Label" x="118" y="100">UP</text>
+    <path style="fill:none" d="M 123.0,112.0 V 104.0" id="LeaderStripUp" class="StripUp Strip Leader"/>
+    <text id="LabelStripDown" class="StripDown Strip Label" x="111" y="337">DOWN</text>
+    <path style="fill:none" d="M 123.0,320.0 V 328.0" id="LeaderStripDown" class="StripDown Strip Leader"/>
+  </g>
 </svg>
diff --git a/data/layouts/huion-kamvas-gt-156hd-v2.svg b/data/layouts/huion-kamvas-gt-156hd-v2.svg
index 1f3d3a26..02e3477a 100644
--- a/data/layouts/huion-kamvas-gt-156hd-v2.svg
+++ b/data/layouts/huion-kamvas-gt-156hd-v2.svg
@@ -73,4 +73,11 @@
     <text id="LabelN" class="N Label" x="28" y="405.0" style="text-anchor:start;">N</text>
     <path style="fill:none" d="M 30.0,390.0 V 397.0" id="LeaderN" class="Leader N"/>
   </g>
+  <g>
+    <rect id="Strip" class="Strip TouchStrip" x="22" y="172" width="16" height="86" rx="8.0" />
+    <path id="LeaderStripUp" class="StripUp Strip Leader" d="M 30.0,170.0 V 168.0 H 50.0" />
+    <text id="LabelStripUp" class="StripUp Strip Label" x="52" y="170">UP</text>
+    <path id="LeaderStripDown" class="StripDown Strip Leader" d="M 30.0,260.0 V 262.0 H 50.0" />
+    <text id="LabelStripDown" class="StripDown Strip Label" x="52" y="264">DOWN</text>
+  </g>
 </svg>
diff --git a/data/layouts/huion-kamvas-gt-221-pro.svg b/data/layouts/huion-kamvas-gt-221-pro.svg
deleted file mode 100644
index 531cfda2..00000000
--- a/data/layouts/huion-kamvas-gt-221-pro.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='ASCII'?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="huion-kamvas-gt-221-pro" width="736" height="430">
-  <title id="title">KAMVAS  GT-221 Pro</title>
-  <rect x="69" y="43" width="598" height="338"/>
-  <g>
-    <rect id="ButtonA" class="A Button" x="12" y="68" width="28" height="14"/>
-    <text id="LabelA" class="A Label" x="64.0" y="77" style="text-anchor:start;">A</text>
-    <path style="fill:none" d="M 49.0,75.0 H 56.0" id="LeaderA" class="Leader A"/>
-  </g>
-  <g>
-    <rect id="ButtonB" class="B Button" x="12" y="86" width="28" height="14"/>
-    <text id="LabelB" class="B Label" x="64.0" y="95" style="text-anchor:start;">B</text>
-    <path style="fill:none" d="M 49.0,93.0 H 56.0" id="LeaderB" class="Leader B"/>
-  </g>
-  <g>
-    <rect id="ButtonC" class="C Button" x="12" y="105" width="28" height="14"/>
-    <text id="LabelC" class="C Label" x="64.0" y="114" style="text-anchor:start;">C</text>
-    <path style="fill:none" d="M 49.0,112.0 H 56.0" id="LeaderC" class="Leader C"/>
-  </g>
-  <g>
-    <rect id="ButtonD" class="D Button" x="12" y="123" width="28" height="14"/>
-    <text id="LabelD" class="D Label" x="64.0" y="132" style="text-anchor:start;">D</text>
-    <path style="fill:none" d="M 49.0,130.0 H 56.0" id="LeaderD" class="Leader D"/>
-  </g>
-  <g>
-    <rect id="ButtonE" class="E Button" x="12" y="143" width="28" height="14"/>
-    <text id="LabelE" class="E Label" x="64.0" y="152" style="text-anchor:start;">E</text>
-    <path style="fill:none" d="M 49.0,150.0 H 56.0" id="LeaderE" class="Leader E"/>
-  </g>
-  <g>
-    <rect id="ButtonF" class="F Button" x="11" y="268" width="28" height="14"/>
-    <text id="LabelF" class="F Label" x="63.0" y="277" style="text-anchor:start;">F</text>
-    <path style="fill:none" d="M 48.0,275.0 H 55.0" id="LeaderF" class="Leader F"/>
-  </g>
-  <g>
-    <rect id="ButtonG" class="G Button" x="11" y="288" width="28" height="14"/>
-    <text id="LabelG" class="G Label" x="63.0" y="297" style="text-anchor:start;">G</text>
-    <path style="fill:none" d="M 48.0,295.0 H 55.0" id="LeaderG" class="Leader G"/>
-  </g>
-  <g>
-    <rect id="ButtonH" class="H Button" x="11" y="307" width="28" height="14"/>
-    <text id="LabelH" class="H Label" x="63.0" y="316" style="text-anchor:start;">H</text>
-    <path style="fill:none" d="M 48.0,314.0 H 55.0" id="LeaderH" class="Leader H"/>
-  </g>
-  <g>
-    <rect id="ButtonI" class="I Button" x="11" y="325" width="28" height="14"/>
-    <text id="LabelI" class="I Label" x="63.0" y="334" style="text-anchor:start;">I</text>
-    <path style="fill:none" d="M 48.0,332.0 H 55.0" id="LeaderI" class="Leader I"/>
-  </g>
-  <g>
-    <rect id="ButtonJ" class="J Button" x="11" y="344" width="28" height="14"/>
-    <text id="LabelJ" class="J Label" x="63.0" y="353" style="text-anchor:start;">J</text>
-    <path style="fill:none" d="M 48.0,351.0 H 55.0" id="LeaderJ" class="Leader J"/>
-  </g>
-  <g>
-    <rect id="ButtonK" class="K Button" x="696" y="68" width="28" height="14"/>
-    <text id="LabelK" class="K Label" x="748.0" y="77" style="text-anchor:start;">K</text>
-    <path style="fill:none" d="M 733.0,75.0 H 740.0" id="LeaderK" class="Leader K"/>
-  </g>
-  <g>
-    <rect id="ButtonL" class="L Button" x="696" y="87" width="28" height="14"/>
-    <text id="LabelL" class="L Label" x="748.0" y="96" style="text-anchor:start;">L</text>
-    <path style="fill:none" d="M 733.0,94.0 H 740.0" id="LeaderL" class="Leader L"/>
-  </g>
-  <g>
-    <rect id="ButtonM" class="M Button" x="696" y="106" width="28" height="14"/>
-    <text id="LabelM" class="M Label" x="748.0" y="115" style="text-anchor:start;">M</text>
-    <path style="fill:none" d="M 733.0,113.0 H 740.0" id="LeaderM" class="Leader M"/>
-  </g>
-  <g>
-    <rect id="ButtonN" class="N Button" x="696" y="126" width="28" height="14"/>
-    <text id="LabelN" class="N Label" x="748.0" y="135" style="text-anchor:start;">N</text>
-    <path style="fill:none" d="M 733.0,133.0 H 740.0" id="LeaderN" class="Leader N"/>
-  </g>
-  <g>
-    <rect id="ButtonO" class="O Button" x="696" y="146" width="28" height="14"/>
-    <text id="LabelO" class="O Label" x="748.0" y="155" style="text-anchor:start;">O</text>
-    <path style="fill:none" d="M 733.0,153.0 H 740.0" id="LeaderO" class="Leader O"/>
-  </g>
-  <g>
-    <rect id="ButtonP" class="P Button" x="695" y="267" width="28" height="14"/>
-    <text id="LabelP" class="P Label" x="747.0" y="276" style="text-anchor:start;">P</text>
-    <path style="fill:none" d="M 732.0,274.0 H 739.0" id="LeaderP" class="Leader P"/>
-  </g>
-  <g>
-    <rect id="ButtonQ" class="Q Button" x="695" y="286" width="28" height="14"/>
-    <text id="LabelQ" class="Q Label" x="747.0" y="295" style="text-anchor:start;">Q</text>
-    <path style="fill:none" d="M 732.0,293.0 H 739.0" id="LeaderQ" class="Leader Q"/>
-  </g>
-  <g>
-    <rect id="ButtonR" class="R Button" x="695" y="306" width="28" height="14"/>
-    <text id="LabelR" class="R Label" x="747.0" y="315" style="text-anchor:start;">R</text>
-    <path style="fill:none" d="M 732.0,313.0 H 739.0" id="LeaderR" class="Leader R"/>
-  </g>
-  <g>
-    <rect id="ButtonS" class="S Button" x="695" y="325" width="28" height="14"/>
-    <text id="LabelS" class="S Label" x="747.0" y="334" style="text-anchor:start;">S</text>
-    <path style="fill:none" d="M 732.0,332.0 H 739.0" id="LeaderS" class="Leader S"/>
-  </g>
-  <g>
-    <rect id="ButtonT" class="T Button" x="695" y="345" width="28" height="14"/>
-    <text id="LabelT" class="T Label" x="747.0" y="354" style="text-anchor:start;">T</text>
-    <path style="fill:none" d="M 732.0,352.0 H 739.0" id="LeaderT" class="Leader T"/>
-  </g>
-</svg>
diff --git a/data/layouts/huion-kamvas-pro-12-gt-116.svg b/data/layouts/huion-kamvas-pro-12-gt-116.svg
index b1bea615..871e2326 100644
--- a/data/layouts/huion-kamvas-pro-12-gt-116.svg
+++ b/data/layouts/huion-kamvas-pro-12-gt-116.svg
@@ -4,28 +4,35 @@
   <title id="title">KAMVAS Pro 12 GT-116</title>
   <rect x="110" y="51" width="574" height="319"/>
   <g>
-    <rect id="ButtonA" class="A Button" x="32" y="90" width="21" height="21"/>
+    <rect id="ButtonA" class="A Button" x="32" y="90" width="20" height="20" rx="10.0"/>
     <text id="LabelA" class="A Label" x="80.5" y="102.5" style="text-anchor:start;">A</text>
     <path style="fill:none" d="M 65.5,100.5 H 72.5" id="LeaderA" class="Leader A"/>
   </g>
   <g>
-    <rect id="ButtonB" class="B Button" x="32" y="118" width="21" height="21"/>
+    <rect id="ButtonB" class="B Button" x="32" y="118" width="20" height="20" rx="10.0"/>
     <text id="LabelB" class="B Label" x="80.5" y="130.5" style="text-anchor:start;">B</text>
     <path style="fill:none" d="M 65.5,128.5 H 72.5" id="LeaderB" class="Leader B"/>
   </g>
   <g>
-    <rect id="ButtonC" class="C Button" x="32" y="287" width="21" height="21"/>
+    <rect id="ButtonC" class="C Button" x="32" y="287" width="20" height="20" rx="10.0"/>
     <text id="LabelC" class="C Label" x="80.5" y="299.5" style="text-anchor:start;">C</text>
     <path style="fill:none" d="M 65.5,297.5 H 72.5" id="LeaderC" class="Leader C"/>
   </g>
   <g>
-    <rect id="ButtonD" class="D Button" x="32" y="316" width="21" height="21"/>
+    <rect id="ButtonD" class="D Button" x="32" y="316" width="20" height="20" rx="10.0"/>
     <text id="LabelD" class="D Label" x="80.5" y="328.5" style="text-anchor:start;">D</text>
     <path style="fill:none" d="M 65.5,326.5 H 72.5" id="LeaderD" class="Leader D"/>
   </g>
   <g>
-    <rect id="ButtonE" class="E Button" x="29" y="343" width="27" height="27"/>
+    <rect id="ButtonE" class="E Button" x="29" y="343" width="26" height="27" rx="13.0"/>
     <text id="LabelE" class="E Label" x="80.5" y="358.5" style="text-anchor:start;">E</text>
     <path style="fill:none" d="M 65.5,356.5 H 72.5" id="LeaderE" class="Leader E"/>
   </g>
+  <g>
+    <rect id="Strip" class="Strip TouchStrip" x="32" y="157" width="20" height="114" rx="10.0" />
+    <path id="LeaderStripUp" class="StripUp Strip Leader" d="M 42.0,155.0 V 153.0 H 70.0" />
+    <text id="LabelStripUp" class="StripUp Strip Label" x="72" y="156">UP</text>
+    <path id="LeaderStripDown" class="StripDown Strip Leader" d="M 42.0,273.0 V 275.0 H 70.0" />
+    <text id="LabelStripDown" class="StripDown Strip Label" x="72" y="277">DOWN</text>
+  </g>
 </svg>
diff --git a/data/layouts/huion-kamvas-pro-20-gt-192.svg b/data/layouts/huion-kamvas-pro-20-gt-192.svg
index a73bd616..a7447abb 100644
--- a/data/layouts/huion-kamvas-pro-20-gt-192.svg
+++ b/data/layouts/huion-kamvas-pro-20-gt-192.svg
@@ -83,4 +83,18 @@
     <text id="LabelP" class="P Label" x="693.5" y="353.5" style="text-anchor:start;">P</text>
     <path style="fill:none" d="M 711.5,351.5 H 703.5" id="LeaderP" class="Leader P"/>
   </g>
+  <g>
+    <rect id="Strip" class="Strip TouchStrip" x="16" y="172" width="28" height="94" rx="14.0" />
+    <path id="LeaderStripUp" class="StripUp Strip Leader" d="M 30.0,170.0 V 168.0 H 48.0" />
+    <text id="LabelStripUp" class="StripUp Strip Label" x="50" y="170">UP</text>
+    <path id="LeaderStripDown" class="StripDown Strip Leader" d="M 30.0,268.0 V 270.0 H 48.0" />
+    <text id="LabelStripDown" class="StripDown Strip Label" x="50" y="272">DOWN</text>
+  </g>
+  <g>
+    <rect id="Strip2" class="Strip TouchStrip" x="721" y="172" width="28" height="94" rx="14.0" />
+    <path id="LeaderStrip2Up" class="StripUp Strip Leader" d="M 735.0,170.0 V 168.0 H 718.0" />
+    <text id="LabelStrip2Up" class="StripUp Strip Label" x="705" y="170">UP</text>
+    <path id="LeaderStrip2Down" class="StripDown Strip Leader" d="M 735.0,268.0 V 270.0 H 718.0" />
+    <text id="LabelStrip2Down" class="StripDown Strip Label" x="690" y="272">DOWN</text>
+  </g>
 </svg>
diff --git a/data/layouts/huion-kamvas-pro-20-gt1901.svg b/data/layouts/huion-kamvas-pro-20-gt1901.svg
index 88256999..3af3e4e1 100644
--- a/data/layouts/huion-kamvas-pro-20-gt1901.svg
+++ b/data/layouts/huion-kamvas-pro-20-gt1901.svg
@@ -2,31 +2,31 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="huion-kamvas-pro-20-gt1901" width="763" height="430">
   <title id="title">KAMVAS Pro 20 GT1901</title>
-  <rect x="86" y="52" width="592" height="325"/>
+  <rect x="86" y="52" width="591" height="325"/>
   <g>
-    <rect id="ButtonA" class="A Button" x="14" y="72" width="33" height="21"/>
-    <text id="LabelA" class="A Label" x="68.5" y="84.5" style="text-anchor:start;">A</text>
-    <path style="fill:none" d="M 53.5,82.5 H 60.5" id="LeaderA" class="Leader A"/>
+    <rect id="ButtonA" class="A Button" x="15" y="72" width="33" height="21"/>
+    <text id="LabelA" class="A Label" x="69.5" y="84.5" style="text-anchor:start;">A</text>
+    <path style="fill:none" d="M 54.5,82.5 H 61.5" id="LeaderA" class="Leader A"/>
   </g>
   <g>
-    <rect id="ButtonB" class="B Button" x="14" y="95" width="33" height="19"/>
-    <text id="LabelB" class="B Label" x="68.5" y="106.5" style="text-anchor:start;">B</text>
-    <path style="fill:none" d="M 53.5,104.5 H 60.5" id="LeaderB" class="Leader B"/>
+    <rect id="ButtonB" class="B Button" x="15" y="95" width="33" height="19"/>
+    <text id="LabelB" class="B Label" x="69.5" y="106.5" style="text-anchor:start;">B</text>
+    <path style="fill:none" d="M 54.5,104.5 H 61.5" id="LeaderB" class="Leader B"/>
   </g>
   <g>
-    <rect id="ButtonC" class="C Button" x="14" y="116" width="33" height="19"/>
-    <text id="LabelC" class="C Label" x="68.5" y="127.5" style="text-anchor:start;">C</text>
-    <path style="fill:none" d="M 53.5,125.5 H 60.5" id="LeaderC" class="Leader C"/>
+    <rect id="ButtonC" class="C Button" x="15" y="117" width="33" height="19"/>
+    <text id="LabelC" class="C Label" x="69.5" y="128.5" style="text-anchor:start;">C</text>
+    <path style="fill:none" d="M 54.5,126.5 H 61.5" id="LeaderC" class="Leader C"/>
   </g>
   <g>
-    <rect id="ButtonD" class="D Button" x="14" y="137" width="33" height="19"/>
-    <text id="LabelD" class="D Label" x="68.5" y="148.5" style="text-anchor:start;">D</text>
-    <path style="fill:none" d="M 53.5,146.5 H 60.5" id="LeaderD" class="Leader D"/>
+    <rect id="ButtonD" class="D Button" x="15" y="139" width="33" height="19"/>
+    <text id="LabelD" class="D Label" x="69.5" y="150.5" style="text-anchor:start;">D</text>
+    <path style="fill:none" d="M 54.5,148.5 H 61.5" id="LeaderD" class="Leader D"/>
   </g>
   <g>
-    <rect id="ButtonE" class="E Button" x="14" y="277" width="33" height="18"/>
-    <text id="LabelE" class="E Label" x="68.5" y="288" style="text-anchor:start;">E</text>
-    <path style="fill:none" d="M 53.5,286.0 H 60.5" id="LeaderE" class="Leader E"/>
+    <rect id="ButtonE" class="E Button" x="14" y="278" width="33" height="18"/>
+    <text id="LabelE" class="E Label" x="68.5" y="289" style="text-anchor:start;">E</text>
+    <path style="fill:none" d="M 53.5,287.0 H 60.5" id="LeaderE" class="Leader E"/>
   </g>
   <g>
     <rect id="ButtonF" class="F Button" x="14" y="298" width="33" height="19"/>
@@ -34,53 +34,67 @@
     <path style="fill:none" d="M 53.5,307.5 H 60.5" id="LeaderF" class="Leader F"/>
   </g>
   <g>
-    <rect id="ButtonG" class="G Button" x="14" y="320" width="33" height="19"/>
-    <text id="LabelG" class="G Label" x="68.5" y="331.5" style="text-anchor:start;">G</text>
-    <path style="fill:none" d="M 53.5,329.5 H 60.5" id="LeaderG" class="Leader G"/>
+    <rect id="ButtonG" class="G Button" x="14" y="319" width="33" height="19"/>
+    <text id="LabelG" class="G Label" x="68.5" y="330.5" style="text-anchor:start;">G</text>
+    <path style="fill:none" d="M 53.5,328.5 H 60.5" id="LeaderG" class="Leader G"/>
   </g>
   <g>
-    <rect id="ButtonH" class="H Button" x="14" y="341" width="33" height="19"/>
-    <text id="LabelH" class="H Label" x="68.5" y="352.5" style="text-anchor:start;">H</text>
-    <path style="fill:none" d="M 53.5,350.5 H 60.5" id="LeaderH" class="Leader H"/>
+    <rect id="ButtonH" class="H Button" x="14" y="340" width="33" height="19"/>
+    <text id="LabelH" class="H Label" x="68.5" y="351.5" style="text-anchor:start;">H</text>
+    <path style="fill:none" d="M 53.5,349.5 H 60.5" id="LeaderH" class="Leader H"/>
   </g>
   <g>
     <rect id="ButtonI" class="I Button" x="719" y="71" width="33" height="21"/>
-    <text id="LabelI" class="I Label" x="773.5" y="83.5" style="text-anchor:start;">I</text>
-    <path style="fill:none" d="M 758.5,81.5 H 765.5" id="LeaderI" class="Leader I"/>
+    <text id="LabelI" class="I Label" x="693.5" y="83.5" style="text-anchor:start;">I</text>
+    <path style="fill:none" d="M 711.5,81.5 H 703.5" id="LeaderI" class="Leader I"/>
   </g>
   <g>
     <rect id="ButtonJ" class="J Button" x="719" y="94" width="33" height="19"/>
-    <text id="LabelJ" class="J Label" x="773.5" y="105.5" style="text-anchor:start;">J</text>
-    <path style="fill:none" d="M 758.5,103.5 H 765.5" id="LeaderJ" class="Leader J"/>
+    <text id="LabelJ" class="J Label" x="693.5" y="105.5" style="text-anchor:start;">J</text>
+    <path style="fill:none" d="M 711.5,103.5 H 703.5" id="LeaderJ" class="Leader J"/>
   </g>
   <g>
     <rect id="ButtonK" class="K Button" x="719" y="115" width="33" height="19"/>
-    <text id="LabelK" class="K Label" x="773.5" y="126.5" style="text-anchor:start;">K</text>
-    <path style="fill:none" d="M 758.5,124.5 H 765.5" id="LeaderK" class="Leader K"/>
+    <text id="LabelK" class="K Label" x="693.5" y="126.5" style="text-anchor:start;">K</text>
+    <path style="fill:none" d="M 711.5,124.5 H 703.5" id="LeaderK" class="Leader K"/>
   </g>
   <g>
     <rect id="ButtonL" class="L Button" x="719" y="136" width="33" height="21"/>
-    <text id="LabelL" class="L Label" x="773.5" y="148.5" style="text-anchor:start;">L</text>
-    <path style="fill:none" d="M 758.5,146.5 H 765.5" id="LeaderL" class="Leader L"/>
+    <text id="LabelL" class="L Label" x="693.5" y="148.5" style="text-anchor:start;">L</text>
+    <path style="fill:none" d="M 711.5,146.5 H 703.5" id="LeaderL" class="Leader L"/>
   </g>
   <g>
-    <rect id="ButtonM" class="M Button" x="718" y="275" width="33" height="21"/>
-    <text id="LabelM" class="M Label" x="772.5" y="287.5" style="text-anchor:start;">M</text>
-    <path style="fill:none" d="M 757.5,285.5 H 764.5" id="LeaderM" class="Leader M"/>
+    <rect id="ButtonM" class="M Button" x="719" y="276" width="33" height="21"/>
+    <text id="LabelM" class="M Label" x="693.5" y="288.5" style="text-anchor:start;">M</text>
+    <path style="fill:none" d="M 711.5,286.5 H 703.5" id="LeaderM" class="Leader M"/>
   </g>
   <g>
-    <rect id="ButtonN" class="N Button" x="718" y="299" width="33" height="19"/>
-    <text id="LabelN" class="N Label" x="772.5" y="310.5" style="text-anchor:start;">N</text>
-    <path style="fill:none" d="M 757.5,308.5 H 764.5" id="LeaderN" class="Leader N"/>
+    <rect id="ButtonN" class="N Button" x="719" y="299" width="33" height="19"/>
+    <text id="LabelN" class="N Label" x="693.5" y="310.5" style="text-anchor:start;">N</text>
+    <path style="fill:none" d="M 711.5,308.5 H 703.5" id="LeaderN" class="Leader N"/>
   </g>
   <g>
-    <rect id="ButtonO" class="O Button" x="718" y="321" width="33" height="19"/>
-    <text id="LabelO" class="O Label" x="772.5" y="332.5" style="text-anchor:start;">O</text>
-    <path style="fill:none" d="M 757.5,330.5 H 764.5" id="LeaderO" class="Leader O"/>
+    <rect id="ButtonO" class="O Button" x="719" y="320" width="33" height="19"/>
+    <text id="LabelO" class="O Label" x="693.5" y="331.5" style="text-anchor:start;">O</text>
+    <path style="fill:none" d="M 711.5,329.5 H 703.5" id="LeaderO" class="Leader O"/>
   </g>
   <g>
-    <rect id="ButtonP" class="P Button" x="718" y="343" width="33" height="21"/>
-    <text id="LabelP" class="P Label" x="772.5" y="355.5" style="text-anchor:start;">P</text>
-    <path style="fill:none" d="M 757.5,353.5 H 764.5" id="LeaderP" class="Leader P"/>
+    <rect id="ButtonP" class="P Button" x="719" y="341" width="33" height="21"/>
+    <text id="LabelP" class="P Label" x="693.5" y="353.5" style="text-anchor:start;">P</text>
+    <path style="fill:none" d="M 711.5,351.5 H 703.5" id="LeaderP" class="Leader P"/>
+  </g>
+  <g>
+    <rect id="Strip" class="Strip TouchStrip" x="16" y="172" width="28" height="94" rx="14.0" />
+    <path id="LeaderStripUp" class="StripUp Strip Leader" d="M 30.0,170.0 V 168.0 H 48.0" />
+    <text id="LabelStripUp" class="StripUp Strip Label" x="50" y="170">UP</text>
+    <path id="LeaderStripDown" class="StripDown Strip Leader" d="M 30.0,268.0 V 270.0 H 48.0" />
+    <text id="LabelStripDown" class="StripDown Strip Label" x="50" y="272">DOWN</text>
+  </g>
+  <g>
+    <rect id="Strip2" class="Strip TouchStrip" x="721" y="172" width="28" height="94" rx="14.0" />
+    <path id="LeaderStrip2Up" class="StripUp Strip Leader" d="M 735.0,170.0 V 168.0 H 718.0" />
+    <text id="LabelStrip2Up" class="StripUp Strip Label" x="705" y="170">UP</text>
+    <path id="LeaderStrip2Down" class="StripDown Strip Leader" d="M 735.0,268.0 V 270.0 H 718.0" />
+    <text id="LabelStrip2Down" class="StripDown Strip Label" x="690" y="272">DOWN</text>
   </g>
 </svg>
diff --git a/data/layouts/huion-kamvas-pro-22-gt-221.svg b/data/layouts/huion-kamvas-pro-22-gt-221.svg
index fdd7b969..0c80d72d 100644
--- a/data/layouts/huion-kamvas-pro-22-gt-221.svg
+++ b/data/layouts/huion-kamvas-pro-22-gt-221.svg
@@ -103,4 +103,18 @@
     <text id="LabelT" class="T Label" x="659.0" y="336" style="text-anchor:start;">T</text>
     <path style="fill:none" d="M 677.0,334.0 H 669.0" id="LeaderT" class="Leader T"/>
   </g>
+  <g>
+    <rect id="Strip" class="Strip TouchStrip" x="13" y="174" width="24" height="75" rx="12.0" />
+    <path id="LeaderStripUp" class="StripUp Strip Leader" d="M 25.0,172.0 V 170.0 H 41.0" />
+    <text id="LabelStripUp" class="StripUp Strip Label" x="43" y="172">UP</text>
+    <path id="LeaderStripDown" class="StripDown Strip Leader" d="M 25.0,251.0 V 253.0 H 41.0" />
+    <text id="LabelStripDown" class="StripDown Strip Label" x="43" y="255">DOWN</text>
+  </g>
+  <g>
+    <rect id="Strip2" class="Strip2 TouchStrip" x="690" y="174" width="24" height="75" rx="12.0" />
+    <path id="LeaderStrip2Up" class="Strip2Up Strip2 Leader" d="M 702.0,172.0 V 170.0 H 684.0" />
+    <text id="LabelStrip2Up" class="Strip2Up Strip2 Label" x="672" y="172">UP</text>
+    <path id="LeaderStrip2Down" class="Strip2Down Strip2 Leader" d="M 702.0,251.0 V 253.0 H 684.0" />
+    <text id="LabelStrip2Down" class="Strip2Down Strip2 Label" x="657" y="255">DOWN</text>
+  </g>
 </svg>
diff --git a/data/layouts/huion-kamvas-pro-studio-22.svg b/data/layouts/huion-kamvas-pro-studio-22.svg
deleted file mode 100644
index c591adb4..00000000
--- a/data/layouts/huion-kamvas-pro-studio-22.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" id="huion-kamvas-pro-studio-22" width="725" height="430">
-  <title id="title">KAMVAS Pro/Studio 22</title>
-  <rect x="72" y="48" width="582" height="327"/>
-  <g>
-    <rect id="ButtonA" class="A Button" x="10" y="82" width="28" height="14"/>
-    <text id="LabelA" class="A Label" x="62.0" y="91" style="text-anchor:start;">A</text>
-    <path style="fill:none" d="M 47.0,89.0 H 54.0" id="LeaderA" class="Leader A"/>
-  </g>
-  <g>
-    <rect id="ButtonB" class="B Button" x="10" y="100" width="28" height="14"/>
-    <text id="LabelB" class="B Label" x="62.0" y="109" style="text-anchor:start;">B</text>
-    <path style="fill:none" d="M 47.0,107.0 H 54.0" id="LeaderB" class="Leader B"/>
-  </g>
-  <g>
-    <rect id="ButtonC" class="C Button" x="10" y="117" width="28" height="14"/>
-    <text id="LabelC" class="C Label" x="62.0" y="126" style="text-anchor:start;">C</text>
-    <path style="fill:none" d="M 47.0,124.0 H 54.0" id="LeaderC" class="Leader C"/>
-  </g>
-  <g>
-    <rect id="ButtonD" class="D Button" x="10" y="134" width="28" height="14"/>
-    <text id="LabelD" class="D Label" x="62.0" y="143" style="text-anchor:start;">D</text>
-    <path style="fill:none" d="M 47.0,141.0 H 54.0" id="LeaderD" class="Leader D"/>
-  </g>
-  <g>
-    <rect id="ButtonE" class="E Button" x="10" y="152" width="28" height="14"/>
-    <text id="LabelE" class="E Label" x="62.0" y="161" style="text-anchor:start;">E</text>
-    <path style="fill:none" d="M 47.0,159.0 H 54.0" id="LeaderE" class="Leader E"/>
-  </g>
-  <g>
-    <rect id="ButtonF" class="F Button" x="10" y="257" width="28" height="14"/>
-    <text id="LabelF" class="F Label" x="62.0" y="266" style="text-anchor:start;">F</text>
-    <path style="fill:none" d="M 47.0,264.0 H 54.0" id="LeaderF" class="Leader F"/>
-  </g>
-  <g>
-    <rect id="ButtonG" class="G Button" x="10" y="275" width="28" height="14"/>
-    <text id="LabelG" class="G Label" x="62.0" y="284" style="text-anchor:start;">G</text>
-    <path style="fill:none" d="M 47.0,282.0 H 54.0" id="LeaderG" class="Leader G"/>
-  </g>
-  <g>
-    <rect id="ButtonH" class="H Button" x="10" y="292" width="28" height="14"/>
-    <text id="LabelH" class="H Label" x="62.0" y="301" style="text-anchor:start;">H</text>
-    <path style="fill:none" d="M 47.0,299.0 H 54.0" id="LeaderH" class="Leader H"/>
-  </g>
-  <g>
-    <rect id="ButtonI" class="I Button" x="10" y="309" width="28" height="14"/>
-    <text id="LabelI" class="I Label" x="62.0" y="318" style="text-anchor:start;">I</text>
-    <path style="fill:none" d="M 47.0,316.0 H 54.0" id="LeaderI" class="Leader I"/>
-  </g>
-  <g>
-    <rect id="ButtonJ" class="J Button" x="10" y="327" width="28" height="14"/>
-    <text id="LabelJ" class="J Label" x="62.0" y="336" style="text-anchor:start;">J</text>
-    <path style="fill:none" d="M 47.0,334.0 H 54.0" id="LeaderJ" class="Leader J"/>
-  </g>
-  <g>
-    <rect id="ButtonK" class="K Button" x="687" y="82" width="28" height="14"/>
-    <text id="LabelK" class="K Label" x="659.0" y="91" style="text-anchor:start;">K</text>
-    <path style="fill:none" d="M 677.0,89.0 H 669.0" id="LeaderK" class="Leader K"/>
-  </g>
-  <g>
-    <rect id="ButtonL" class="L Button" x="687" y="100" width="28" height="14"/>
-    <text id="LabelL" class="L Label" x="659.0" y="109" style="text-anchor:start;">L</text>
-    <path style="fill:none" d="M 677.0,107.0 H 669.0" id="LeaderL" class="Leader L"/>
-  </g>
-  <g>
-    <rect id="ButtonM" class="M Button" x="687" y="117" width="28" height="14"/>
-    <text id="LabelM" class="M Label" x="659.0" y="126" style="text-anchor:start;">M</text>
-    <path style="fill:none" d="M 677.0,124.0 H 669.0" id="LeaderM" class="Leader M"/>
-  </g>
-  <g>
-    <rect id="ButtonN" class="N Button" x="687" y="134" width="28" height="14"/>
-    <text id="LabelN" class="N Label" x="659.0" y="143" style="text-anchor:start;">N</text>
-    <path style="fill:none" d="M 677.0,141.0 H 669.0" id="LeaderN" class="Leader N"/>
-  </g>
-  <g>
-    <rect id="ButtonO" class="O Button" x="687" y="152" width="28" height="14"/>
-    <text id="LabelO" class="O Label" x="659.0" y="161" style="text-anchor:start;">O</text>
-    <path style="fill:none" d="M 677.0,159.0 H 669.0" id="LeaderO" class="Leader O"/>
-  </g>
-  <g>
-    <rect id="ButtonP" class="P Button" x="687" y="257" width="28" height="14"/>
-    <text id="LabelP" class="P Label" x="659.0" y="266" style="text-anchor:start;">P</text>
-    <path style="fill:none" d="M 677.0,264.0 H 669.0" id="LeaderP" class="Leader P"/>
-  </g>
-  <g>
-    <rect id="ButtonQ" class="Q Button" x="687" y="275" width="28" height="14"/>
-    <text id="LabelQ" class="Q Label" x="659.0" y="284" style="text-anchor:start;">Q</text>
-    <path style="fill:none" d="M 677.0,282.0 H 669.0" id="LeaderQ" class="Leader Q"/>
-  </g>
-  <g>
-    <rect id="ButtonR" class="R Button" x="687" y="292" width="28" height="14"/>
-    <text id="LabelR" class="R Label" x="659.0" y="301" style="text-anchor:start;">R</text>
-    <path style="fill:none" d="M 677.0,299.0 H 669.0" id="LeaderR" class="Leader R"/>
-  </g>
-  <g>
-    <rect id="ButtonS" class="S Button" x="687" y="309" width="28" height="14"/>
-    <text id="LabelS" class="S Label" x="659.0" y="318" style="text-anchor:start;">S</text>
-    <path style="fill:none" d="M 677.0,316.0 H 669.0" id="LeaderS" class="Leader S"/>
-  </g>
-  <g>
-    <rect id="ButtonT" class="T Button" x="687" y="327" width="28" height="14"/>
-    <text id="LabelT" class="T Label" x="659.0" y="336" style="text-anchor:start;">T</text>
-    <path style="fill:none" d="M 677.0,334.0 H 669.0" id="LeaderT" class="Leader T"/>
-  </g>
-</svg>