diff --git a/examples/uhk.key-design.mouse-layer.svg b/examples/uhk.key-design.mouse-layer.svg
index a82028c8..bf19ecfb 100644
--- a/examples/uhk.key-design.mouse-layer.svg
+++ b/examples/uhk.key-design.mouse-layer.svg
@@ -49,9 +49,9 @@
      inkscape:window-height="1144"
      id="namedview226"
      showgrid="false"
-     inkscape:zoom="1.4585257"
-     inkscape:cx="512.161"
-     inkscape:cy="235.66905"
+     inkscape:zoom="1.4585077"
+     inkscape:cx="512.16732"
+     inkscape:cy="235.68307"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
@@ -899,142 +899,6 @@
      id="path4917-04"
      inkscape:connector-curvature="0"
      sodipodi:nodetypes="ccccccccccccccc" />
-  <g
-     id="g4447"
-     transform="matrix(0,0.04974319,-0.04974319,0,501.47717,195.70441)"
-     style="fill:#ffffff;fill-opacity:1">
-    <g
-       id="g4403"
-       style="fill:#ffffff;fill-opacity:1">
-      <g
-         id="g4405"
-         style="fill:#ffffff;fill-opacity:1">
-        <path
-           id="path4407"
-           d="M 165.304,142.468 277.517,30.267 c 1.902,-1.903 2.847,-4.093 2.847,-6.567 0,-2.475 -0.951,-4.665 -2.847,-6.567 L 263.239,2.857 C 261.337,0.955 259.146,0 256.676,0 c -2.478,0 -4.665,0.955 -6.571,2.857 L 117.057,135.9 c -1.903,1.903 -2.853,4.093 -2.853,6.567 0,2.475 0.95,4.664 2.853,6.567 l 133.048,133.043 c 1.903,1.906 4.086,2.851 6.564,2.851 2.478,0 4.66,-0.947 6.563,-2.851 l 14.277,-14.267 c 1.902,-1.903 2.851,-4.094 2.851,-6.57 0,-2.472 -0.948,-4.661 -2.851,-6.564 L 165.304,142.468 Z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1" />
-        <path
-           id="path4409"
-           d="M 55.668,142.468 167.87,30.267 c 1.903,-1.903 2.851,-4.093 2.851,-6.567 0,-2.475 -0.947,-4.665 -2.851,-6.567 L 153.6,2.857 C 151.697,0.955 149.507,0 147.036,0 c -2.478,0 -4.668,0.955 -6.57,2.857 L 7.417,135.9 c -1.903,1.903 -2.853,4.093 -2.853,6.567 0,2.475 0.95,4.664 2.853,6.567 l 133.048,133.043 c 1.902,1.906 4.09,2.851 6.57,2.851 2.471,0 4.661,-0.947 6.563,-2.851 l 14.271,-14.267 c 1.903,-1.903 2.851,-4.094 2.851,-6.57 0,-2.472 -0.947,-4.661 -2.851,-6.564 L 55.668,142.468 Z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1" />
-      </g>
-    </g>
-    <g
-       id="g4411"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4413"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4415"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4417"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4419"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4421"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4423"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4425"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4427"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4429"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4431"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4433"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4435"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4437"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4439"
-       style="fill:#ffffff;fill-opacity:1" />
-  </g>
-  <g
-     id="g4447-3"
-     transform="matrix(0,-0.04974319,-0.04974319,0,519.052,277.20046)"
-     style="overflow:visible;fill:#ffffff;fill-opacity:1">
-    <g
-       id="g4403-6"
-       style="fill:#ffffff;fill-opacity:1">
-      <g
-         id="g4405-5"
-         style="fill:#ffffff;fill-opacity:1">
-        <path
-           id="path4407-9"
-           d="M 165.304,142.468 277.517,30.267 c 1.902,-1.903 2.847,-4.093 2.847,-6.567 0,-2.475 -0.951,-4.665 -2.847,-6.567 L 263.239,2.857 C 261.337,0.955 259.146,0 256.676,0 c -2.478,0 -4.665,0.955 -6.571,2.857 L 117.057,135.9 c -1.903,1.903 -2.853,4.093 -2.853,6.567 0,2.475 0.95,4.664 2.853,6.567 l 133.048,133.043 c 1.903,1.906 4.086,2.851 6.564,2.851 2.478,0 4.66,-0.947 6.563,-2.851 l 14.277,-14.267 c 1.902,-1.903 2.851,-4.094 2.851,-6.57 0,-2.472 -0.948,-4.661 -2.851,-6.564 L 165.304,142.468 Z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1" />
-        <path
-           id="path4409-4"
-           d="M 55.668,142.468 167.87,30.267 c 1.903,-1.903 2.851,-4.093 2.851,-6.567 0,-2.475 -0.947,-4.665 -2.851,-6.567 L 153.6,2.857 C 151.697,0.955 149.507,0 147.036,0 c -2.478,0 -4.668,0.955 -6.57,2.857 L 7.417,135.9 c -1.903,1.903 -2.853,4.093 -2.853,6.567 0,2.475 0.95,4.664 2.853,6.567 l 133.048,133.043 c 1.902,1.906 4.09,2.851 6.57,2.851 2.471,0 4.661,-0.947 6.563,-2.851 l 14.271,-14.267 c 1.903,-1.903 2.851,-4.094 2.851,-6.57 0,-2.472 -0.947,-4.661 -2.851,-6.564 L 55.668,142.468 Z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1" />
-      </g>
-    </g>
-    <g
-       id="g4411-0"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4413-7"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4415-1"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4417-6"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4419-7"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4421-4"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4423-5"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4425-2"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4427-9"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4429-4"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4431-0"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4433-2"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4435-7"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4437-7"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4439-6"
-       style="fill:#ffffff;fill-opacity:1" />
-  </g>
   <g
      id="g4447-9"
      transform="matrix(0.04974319,0,0,0.04974319,554.62675,195.70441)"
@@ -1688,7 +1552,7 @@
          sodipodi:role="line">S</tspan></text>
   </g>
   <g
-     id="g4948"
+     id="g4518"
      transform="translate(-67.322846,-6.2988249e-8)">
     <text
        sodipodi:linespacing="125%"
@@ -1718,4 +1582,14 @@
        d="m 247.72069,134.00345 0,-0.5361 2.49666,0 2.49664,0 0,0.5361 0,0.5361 -2.49664,0 -2.49666,0 0,-0.5361 z m -1.56231,5.31495 -2.38946,-4.77885 -1.65421,0 -1.65421,0 0,-0.5361 0,-0.5361 2.08308,0 2.08306,0 2.38949,4.77886 2.38947,4.77888 1.65421,0 1.65418,0 0,0.53608 0,0.5361 -2.08307,0 -2.08307,0 -2.38947,-4.77887 z"
        inkscape:connector-curvature="0" />
   </g>
+  <path
+     id="path4521"
+     d="m 491.39056,209.79103 6,0 0,1 -6,0 z m 0,-2 6,0 0,1 -6,0 z m 0,-2 6,0 0,1 -6,0 z m 3,-11 7,7 -4,0 0,3 -6,0 0,-3 -4,0 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-opacity:1" />
+  <path
+     id="path4532"
+     d="m 508.96539,262.11384 6,0 0,1 -6,0 z m 0,2 6,0 0,1 -6,0 z m 0,2 6,0 0,1 -6,0 z m 3,12 7,-7 -4,0 0,-3 -6,0 0,3 -4,0 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-opacity:1" />
 </svg>
diff --git a/examples/uhk.key-design.mouse-layer.with_alignments.svg b/examples/uhk.key-design.mouse-layer.with_alignments.svg
index 405f09c3..689dd309 100644
--- a/examples/uhk.key-design.mouse-layer.with_alignments.svg
+++ b/examples/uhk.key-design.mouse-layer.with_alignments.svg
@@ -49,9 +49,9 @@
      inkscape:window-height="1144"
      id="namedview226"
      showgrid="false"
-     inkscape:zoom="1.4585257"
-     inkscape:cx="415.14523"
-     inkscape:cy="235.66905"
+     inkscape:zoom="1.4585077"
+     inkscape:cx="512.16732"
+     inkscape:cy="235.68307"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
@@ -1096,74 +1096,6 @@
      id="path4917-04"
      inkscape:connector-curvature="0"
      sodipodi:nodetypes="ccccccccccccccc" />
-  <g
-     id="g4447"
-     transform="matrix(0,0.04974319,-0.04974319,0,501.47717,195.70441)"
-     style="fill:#ffffff;fill-opacity:1">
-    <g
-       id="g4403"
-       style="fill:#ffffff;fill-opacity:1">
-      <g
-         id="g4405"
-         style="fill:#ffffff;fill-opacity:1">
-        <path
-           id="path4407"
-           d="M 165.304,142.468 277.517,30.267 c 1.902,-1.903 2.847,-4.093 2.847,-6.567 0,-2.475 -0.951,-4.665 -2.847,-6.567 L 263.239,2.857 C 261.337,0.955 259.146,0 256.676,0 c -2.478,0 -4.665,0.955 -6.571,2.857 L 117.057,135.9 c -1.903,1.903 -2.853,4.093 -2.853,6.567 0,2.475 0.95,4.664 2.853,6.567 l 133.048,133.043 c 1.903,1.906 4.086,2.851 6.564,2.851 2.478,0 4.66,-0.947 6.563,-2.851 l 14.277,-14.267 c 1.902,-1.903 2.851,-4.094 2.851,-6.57 0,-2.472 -0.948,-4.661 -2.851,-6.564 L 165.304,142.468 Z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1" />
-        <path
-           id="path4409"
-           d="M 55.668,142.468 167.87,30.267 c 1.903,-1.903 2.851,-4.093 2.851,-6.567 0,-2.475 -0.947,-4.665 -2.851,-6.567 L 153.6,2.857 C 151.697,0.955 149.507,0 147.036,0 c -2.478,0 -4.668,0.955 -6.57,2.857 L 7.417,135.9 c -1.903,1.903 -2.853,4.093 -2.853,6.567 0,2.475 0.95,4.664 2.853,6.567 l 133.048,133.043 c 1.902,1.906 4.09,2.851 6.57,2.851 2.471,0 4.661,-0.947 6.563,-2.851 l 14.271,-14.267 c 1.903,-1.903 2.851,-4.094 2.851,-6.57 0,-2.472 -0.947,-4.661 -2.851,-6.564 L 55.668,142.468 Z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1" />
-      </g>
-    </g>
-    <g
-       id="g4411"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4413"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4415"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4417"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4419"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4421"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4423"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4425"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4427"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4429"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4431"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4433"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4435"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4437"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4439"
-       style="fill:#ffffff;fill-opacity:1" />
-  </g>
   <g
      transform="translate(-117.07086,67.322815)"
      style="overflow:visible"
@@ -1205,74 +1137,6 @@
        rx="3.5433099"
        ry="3.5433097" />
   </g>
-  <g
-     id="g4447-3"
-     transform="matrix(0,-0.04974319,-0.04974319,0,519.052,277.20046)"
-     style="overflow:visible;fill:#ffffff;fill-opacity:1">
-    <g
-       id="g4403-6"
-       style="fill:#ffffff;fill-opacity:1">
-      <g
-         id="g4405-5"
-         style="fill:#ffffff;fill-opacity:1">
-        <path
-           id="path4407-9"
-           d="M 165.304,142.468 277.517,30.267 c 1.902,-1.903 2.847,-4.093 2.847,-6.567 0,-2.475 -0.951,-4.665 -2.847,-6.567 L 263.239,2.857 C 261.337,0.955 259.146,0 256.676,0 c -2.478,0 -4.665,0.955 -6.571,2.857 L 117.057,135.9 c -1.903,1.903 -2.853,4.093 -2.853,6.567 0,2.475 0.95,4.664 2.853,6.567 l 133.048,133.043 c 1.903,1.906 4.086,2.851 6.564,2.851 2.478,0 4.66,-0.947 6.563,-2.851 l 14.277,-14.267 c 1.902,-1.903 2.851,-4.094 2.851,-6.57 0,-2.472 -0.948,-4.661 -2.851,-6.564 L 165.304,142.468 Z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1" />
-        <path
-           id="path4409-4"
-           d="M 55.668,142.468 167.87,30.267 c 1.903,-1.903 2.851,-4.093 2.851,-6.567 0,-2.475 -0.947,-4.665 -2.851,-6.567 L 153.6,2.857 C 151.697,0.955 149.507,0 147.036,0 c -2.478,0 -4.668,0.955 -6.57,2.857 L 7.417,135.9 c -1.903,1.903 -2.853,4.093 -2.853,6.567 0,2.475 0.95,4.664 2.853,6.567 l 133.048,133.043 c 1.902,1.906 4.09,2.851 6.57,2.851 2.471,0 4.661,-0.947 6.563,-2.851 l 14.271,-14.267 c 1.903,-1.903 2.851,-4.094 2.851,-6.57 0,-2.472 -0.947,-4.661 -2.851,-6.564 L 55.668,142.468 Z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1" />
-      </g>
-    </g>
-    <g
-       id="g4411-0"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4413-7"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4415-1"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4417-6"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4419-7"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4421-4"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4423-5"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4425-2"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4427-9"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4429-4"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4431-0"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4433-2"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4435-7"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4437-7"
-       style="fill:#ffffff;fill-opacity:1" />
-    <g
-       id="g4439-6"
-       style="fill:#ffffff;fill-opacity:1" />
-  </g>
   <g
      transform="translate(-67.322876,0)"
      style="overflow:visible"
@@ -2424,4 +2288,14 @@
        d="m 247.72069,134.00345 0,-0.5361 2.49666,0 2.49664,0 0,0.5361 0,0.5361 -2.49664,0 -2.49666,0 0,-0.5361 z m -1.56231,5.31495 -2.38946,-4.77885 -1.65421,0 -1.65421,0 0,-0.5361 0,-0.5361 2.08308,0 2.08306,0 2.38949,4.77886 2.38947,4.77888 1.65421,0 1.65418,0 0,0.53608 0,0.5361 -2.08307,0 -2.08307,0 -2.38947,-4.77887 z"
        inkscape:connector-curvature="0" />
   </g>
+  <path
+     id="path4521"
+     d="m 491.39056,209.79103 6,0 0,1 -6,0 z m 0,-2 6,0 0,1 -6,0 z m 0,-2 6,0 0,1 -6,0 z m 3,-11 7,7 -4,0 0,3 -6,0 0,-3 -4,0 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-opacity:1" />
+  <path
+     id="path4532"
+     d="m 508.96539,262.11384 6,0 0,1 -6,0 z m 0,2 6,0 0,1 -6,0 z m 0,2 6,0 0,1 -6,0 z m 3,12 7,-7 -4,0 0,-3 -6,0 0,3 -4,0 z"
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-opacity:1" />
 </svg>