diff --git a/plugin.json b/plugin.json
index f907252..a8004c9 100644
--- a/plugin.json
+++ b/plugin.json
@@ -1,7 +1,7 @@
 {
   "slug": "CatroModulo",
   "name": "Catro/Modulo",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "license": "BSD-3-Clause",
   "brand": "catronomix",
   "author": "catronomix",
diff --git a/res/CM-1.svg b/res/CM-1.svg
index 4374e48..15cc92e 100644
--- a/res/CM-1.svg
+++ b/res/CM-1.svg
@@ -66,8 +66,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.6394021"
-     inkscape:cx="25.73249"
-     inkscape:cy="340.91672"
+     inkscape:cx="208.93215"
+     inkscape:cy="104.79003"
      inkscape:document-units="mm"
      inkscape:current-layer="layer3"
      showgrid="false"
@@ -76,8 +76,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-width="1600"
+     inkscape:window-height="877"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -88,7 +88,7 @@
      inkscape:object-paths="false"
      inkscape:snap-bbox-edge-midpoints="true"
      inkscape:bbox-paths="false"
-     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-bbox-midpoints="true"
      inkscape:snap-intersection-paths="false"
      inkscape:snap-smooth-nodes="false"
      inkscape:snap-midpoints="false"
@@ -124,7 +124,7 @@
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="rect817"
-         d="M 0,-105.66934 C 14.31816,-64.122725 28.371477,22.830661 28.371474,22.830658 L 0,22.830657 Z"
+         d="M 0,-105.66934 C 14.31816,-64.122725 41.546077,22.830661 41.546074,22.830658 L 0,22.830657 Z"
          style="display:inline;opacity:1;vector-effect:none;fill:#93bfa5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.53800601;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
       <path
          sodipodi:nodetypes="cccc"
@@ -136,15 +136,21 @@
          sodipodi:nodetypes="ccccc"
          inkscape:connector-curvature="0"
          id="path860"
-         d="m 0,-105.66934 55.884812,74.557325 v 53.942672 l -27.513338,1e-6 z"
+         d="m 0,-105.66934 55.884812,74.557325 v 53.942672 l -14.645124,1e-6 z"
          style="display:inline;fill:#adccb9;fill-opacity:1;stroke:none;stroke-width:0.29307353px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
+    <path
+       style="display:inline;opacity:1;fill:#759783;fill-opacity:1;stroke:#759783;stroke-width:2.16499996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+       d="M 86.196273,8.0634623 79.631718,9.7701247"
+       id="path3915-0-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
     <g
        id="g2029"
        transform="matrix(1.2780771,0,0,1.2780771,10,-104.58118)">
       <g
          style="display:inline;stroke:#b9d4c3;stroke-opacity:1"
-         transform="translate(8.7833854,-195.54287)"
+         transform="translate(25.344722,-195.54287)"
          id="g6416">
         <path
            inkscape:connector-curvature="0"
@@ -174,7 +180,7 @@
       </g>
       <g
          style="display:inline;fill:#96c9ab;fill-opacity:1;stroke:#86b89b;stroke-opacity:1"
-         transform="translate(10.243604,-195.58576)"
+         transform="translate(26.80494,-195.58576)"
          id="g6409">
         <path
            inkscape:connector-curvature="0"
@@ -211,93 +217,15 @@
          sodipodi:nodetypes="ccc"
          inkscape:connector-curvature="0"
          id="path4640"
-         d="m 29.256849,93.40314 c 3.662894,-6.81863 21.012798,-5.019523 30.081846,2.11924 0,0 5.54873,0.0403 8.356749,0.0403"
-         style="opacity:1;fill:#e49797;fill-opacity:1;stroke:#c06969;stroke-width:0.65536892;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         d="m 45.818187,93.40314 13.520508,2.11924 c 2.976296,0.339297 5.54873,0.0403 8.356749,0.0403"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#c06969;stroke-width:0.65536892;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path4640-8"
-         d="m -7.8242541,96.263447 35.8185451,0.004"
+         d="m -7.8242541,96.263447 52.3798831,0.004"
          style="opacity:1;fill:#29e376;fill-opacity:1;stroke:#c06969;stroke-width:0.681355;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
-    <g
-       aria-label="mix"
-       transform="matrix(1.271153,0.13285739,-0.13285739,1.271153,7.25,-107.41934)"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.09569788px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:0px;word-spacing:0px;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.2110703"
-       id="text2033">
-      <path
-         d="m 60.331648,88.781169 v 0.08767 q 0.07558,-0.07407 0.136041,-0.101275 0.06197,-0.02872 0.142088,-0.02872 0.06802,0 0.13453,0.03325 0.06651,0.03325 0.129995,0.09976 0.08011,-0.06651 0.161738,-0.09825 0.08314,-0.03325 0.169296,-0.03325 0.172319,0 0.279641,0.09221 0.142088,0.120926 0.142088,0.31743 v 0.693812 q 0.09674,0 0.143599,0.04384 0.04686,0.04384 0.04686,0.111856 0,0.06802 -0.04686,0.111857 -0.04686,0.04232 -0.158715,0.04232 h -0.294757 v -0.97799 q 0,-0.07104 -0.0257,-0.09825 -0.0257,-0.02721 -0.0786,-0.02721 -0.05139,0 -0.09523,0.02721 -0.05593,0.03779 -0.136041,0.142088 v 0.624279 q 0.09674,0 0.143599,0.04384 0.04686,0.04384 0.04686,0.111856 0,0.06802 -0.04686,0.111857 -0.04686,0.04232 -0.158715,0.04232 h -0.294753 v -0.97799 q 0,-0.06953 -0.02721,-0.09674 -0.0257,-0.02872 -0.0786,-0.02872 -0.05442,0 -0.107322,0.03477 -0.05291,0.03325 -0.126972,0.13453 v 0.624279 q 0.09674,0 0.143599,0.04384 0.04837,0.04384 0.04837,0.111856 0,0.06802 -0.04837,0.111857 -0.04686,0.04232 -0.158715,0.04232 h -0.27964 q -0.111857,0 -0.158715,-0.04232 -0.04837,-0.04384 -0.04837,-0.113368 0,-0.06802 0.04686,-0.110345 0.04686,-0.04384 0.145111,-0.04384 v -0.752763 q -0.09825,0 -0.145111,-0.04384 -0.04686,-0.04384 -0.04686,-0.111857 0,-0.06802 0.04837,-0.110344 0.04686,-0.04384 0.158715,-0.04384 z"
-         style="fill:#c63434;fill-opacity:1;stroke-width:0.2110703"
-         id="path6721"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 62.77737,88.193168 v 0.328011 h -0.368823 v -0.328011 z m 0.04232,0.588001 v 1.062635 h 0.371847 q 0.111856,0 0.158715,0.04384 0.04837,0.04232 0.04837,0.111856 0,0.06802 -0.04837,0.111857 -0.04686,0.04232 -0.158715,0.04232 h -1.053565 q -0.111857,0 -0.160227,-0.04232 -0.04686,-0.04384 -0.04686,-0.113368 0,-0.06802 0.04686,-0.110345 0.04837,-0.04384 0.160227,-0.04384 h 0.371846 v -0.752763 h -0.249409 q -0.110345,0 -0.158715,-0.04232 -0.04837,-0.04384 -0.04837,-0.113368 0,-0.06802 0.04686,-0.110344 0.04837,-0.04384 0.160227,-0.04384 z"
-         style="fill:#c63434;fill-opacity:1;stroke-width:0.2110703"
-         id="path6723"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 64.754506,89.440214 0.470098,0.40359 q 0.08465,0.0045 0.126972,0.04837 0.04232,0.04232 0.04232,0.107321 0,0.06802 -0.04837,0.111857 -0.04686,0.04232 -0.158715,0.04232 h -0.352196 q -0.111856,0 -0.160227,-0.04232 -0.04686,-0.04384 -0.04686,-0.11488 0,-0.05442 0.03325,-0.09523 0.03477,-0.04232 0.09372,-0.05744 l -0.231271,-0.199528 -0.235805,0.199528 q 0.07104,0.01814 0.101275,0.05593 0.03174,0.03779 0.03174,0.09674 0,0.07104 -0.04686,0.11488 -0.04686,0.04232 -0.158715,0.04232 h -0.349173 q -0.111857,0 -0.160227,-0.04232 -0.04686,-0.04384 -0.04686,-0.113368 0,-0.06349 0.04232,-0.10581 0.04232,-0.04384 0.126972,-0.04837 l 0.459518,-0.405102 -0.406613,-0.347661 q -0.08011,-0.006 -0.122437,-0.04837 -0.04081,-0.04384 -0.04081,-0.107322 0,-0.06802 0.04686,-0.110344 0.04837,-0.04384 0.160227,-0.04384 h 0.290222 q 0.111856,0 0.158715,0.04384 0.04837,0.04232 0.04837,0.108833 0,0.08918 -0.08465,0.145111 l 0.187435,0.155691 0.184411,-0.158715 q -0.08314,-0.05895 -0.08314,-0.136041 0,-0.07255 0.04686,-0.114879 0.04837,-0.04384 0.160226,-0.04384 h 0.287199 q 0.111856,0 0.158715,0.04384 0.04837,0.04232 0.04837,0.111856 0,0.06197 -0.04232,0.10581 -0.04081,0.04232 -0.122437,0.04837 z"
-         style="fill:#c63434;fill-opacity:1;stroke-width:0.2110703"
-         id="path6725"
-         inkscape:connector-curvature="0" />
-    </g>
-    <circle
-       style="opacity:1;fill:#c06969;fill-opacity:1;stroke:none;stroke-width:1.3894155;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       id="path6660"
-       cx="67.342636"
-       cy="13.376801"
-       r="3.7769082" />
-    <path
-       style="fill:none;stroke:#c06969;stroke-width:0.46696058;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 94.762027,-89.946464 V 2.0687123 l -0.03395,8.9603467 c 0,0.391498 -0.283208,1.046832 -0.597302,1.361553 l -7.930778,5.164681"
-       id="path12858"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <g
-       style="fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(-0.29948614,0,0,1.2781623,96.464291,-105.67346)"
-       id="g4762">
-      <path
-         style="fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 5.383326,12.463918 H 37.820119"
-         id="path4746"
-         inkscape:connector-curvature="0" />
-      <path
-         style="display:inline;fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 5.383326,84.31641 H 37.820118"
-         id="path4748"
-         inkscape:connector-curvature="0" />
-      <path
-         style="display:inline;fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 5.383326,22.728566 H 37.820118"
-         id="path4750"
-         inkscape:connector-curvature="0" />
-      <path
-         style="display:inline;fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 5.383326,32.993196 H 37.820118"
-         id="path4752"
-         inkscape:connector-curvature="0" />
-      <path
-         style="display:inline;fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 5.383326,43.257841 H 37.820118"
-         id="path4754"
-         inkscape:connector-curvature="0" />
-      <path
-         style="display:inline;fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 5.383326,53.522484 H 37.820118"
-         id="path4756"
-         inkscape:connector-curvature="0" />
-      <path
-         style="display:inline;fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 5.383326,63.787127 H 37.820118"
-         id="path4758"
-         inkscape:connector-curvature="0" />
-      <path
-         style="display:inline;fill:none;stroke:#c06969;stroke-width:0.45902568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 5.383326,74.051767 H 37.820118"
-         id="path4760"
-         inkscape:connector-curvature="0" />
-    </g>
     <g
        transform="translate(40,39.28327)"
        id="g9440">
@@ -468,7 +396,7 @@
     </g>
     <path
        style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:0.86500001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 45.815373,18.470751 1.613646,-3.660807"
+       d="m 66.982041,18.470751 1.613646,-3.660807"
        id="path3915"
        inkscape:connector-curvature="0" />
     <g
@@ -556,12 +484,12 @@
        id="text1796"
        transform="translate(4.6819062,-1.2499947)">
       <path
-         d="m 69.020226,-99.146198 v 0.49154 h 0.179939 q 0.108255,0 0.153606,0.04096 0.04681,0.04242 0.04681,0.109718 0,0.06583 -0.04681,0.106793 -0.04535,0.04242 -0.153606,0.04242 h -0.531039 q -0.108256,0 -0.155069,-0.04242 -0.04535,-0.04096 -0.04535,-0.106793 0,-0.06729 0.04681,-0.109718 0.04681,-0.04096 0.153606,-0.04096 h 0.0512 v -1.354662 h -0.0512 q -0.108256,0 -0.155069,-0.041 -0.04535,-0.0424 -0.04535,-0.10972 0,-0.0658 0.04535,-0.10679 0.04681,-0.0424 0.155069,-0.0424 h 0.3511 v 0.10241 q 0.10533,-0.0717 0.217974,-0.1068 0.112645,-0.0351 0.231141,-0.0351 0.307213,0 0.523724,0.2092 0.216512,0.207736 0.216512,0.476913 0,0.296972 -0.256011,0.490077 -0.213585,0.16092 -0.481299,0.16092 -0.11557,0 -0.228215,-0.03365 -0.112644,-0.03365 -0.223826,-0.100941 z m 0.889453,-0.514946 q 0,-0.06291 -0.04974,-0.159458 -0.04974,-0.09802 -0.153606,-0.162384 -0.102405,-0.06583 -0.241382,-0.06583 -0.223826,0 -0.355488,0.168622 -0.08924,0.115571 -0.08924,0.222363 0,0.11996 0.127274,0.234067 0.128736,0.112645 0.317452,0.112645 0.19018,0 0.317453,-0.112645 0.127274,-0.112645 0.127274,-0.236992 z"
+         d="m 69.020226,-99.146198 v 0.49154 h 0.179939 q 0.108255,0 0.153606,0.04096 0.04681,0.04242 0.04681,0.109718 0,0.06583 -0.04681,0.106793 -0.04535,0.04242 -0.153606,0.04242 h -0.531039 q -0.108256,0 -0.155069,-0.04242 -0.04535,-0.04096 -0.04535,-0.106793 0,-0.06729 0.04681,-0.109718 0.04681,-0.04096 0.153606,-0.04096 h 0.0512 v -1.354662 h -0.0512 q -0.108256,0 -0.155069,-0.041 -0.04535,-0.0424 -0.04535,-0.10972 0,-0.0658 0.04535,-0.10679 0.04681,-0.0424 0.155069,-0.0424 h 0.3511 v 0.10241 q 0.10533,-0.0717 0.217974,-0.1068 0.112645,-0.0351 0.231141,-0.0351 0.307213,0 0.523724,0.2092 0.216512,0.207736 0.216512,0.476913 0,0.296972 -0.256011,0.490077 -0.213585,0.16092 -0.481299,0.16092 -0.11557,0 -0.228215,-0.03365 -0.112644,-0.03365 -0.223826,-0.100941 z m 0.889453,-0.514946 q 0,-0.06291 -0.04974,-0.159458 -0.04974,-0.09802 -0.153606,-0.162384 -0.102405,-0.06583 -0.241382,-0.06583 -0.223826,0 -0.355488,0.168686 -0.08924,0.115571 -0.08924,0.222363 0,0.11996 0.127274,0.234067 0.128736,0.112645 0.317452,0.112645 0.19018,0 0.317453,-0.112645 0.127274,-0.112645 0.127274,-0.236992 z"
          style="fill:#c06969;fill-opacity:1;stroke-width:0.17284918"
          id="path1798"
          inkscape:connector-curvature="0" />
       <path
-         d="m 70.879593,-100.87829 v 0.63929 q 0.09363,-0.0556 0.188716,-0.0819 0.09655,-0.0278 0.194568,-0.0278 0.155069,0 0.276491,0.0527 0.121422,0.0527 0.200419,0.16677 0.08046,0.11265 0.08046,0.285271 v 0.563223 q 0.114107,0 0.149217,0.02194 0.07022,0.04535 0.07022,0.128736 0,0.06583 -0.04535,0.108256 -0.04535,0.04096 -0.153606,0.04096 h -0.342323 q -0.106793,0 -0.153606,-0.04096 -0.04535,-0.04242 -0.04535,-0.109719 0,-0.08192 0.07022,-0.127273 0.03657,-0.02341 0.149218,-0.02194 v -0.542742 q 0,-0.115571 -0.05267,-0.162384 -0.06876,-0.06291 -0.203345,-0.06291 -0.09948,0 -0.177013,0.0395 -0.07607,0.03804 -0.206271,0.166582 v 0.56176 q 0.11557,0 0.149217,0.02194 0.07168,0.04535 0.07168,0.128736 0,0.06583 -0.04681,0.108256 -0.04535,0.04096 -0.153607,0.04096 h -0.340859 q -0.108256,0 -0.155069,-0.04096 -0.04535,-0.04242 -0.04535,-0.109719 0,-0.08192 0.07168,-0.127273 0.03511,-0.02341 0.149218,-0.02194 v -1.297412 h -0.0512 q -0.108256,0 -0.155069,-0.041 -0.04535,-0.0424 -0.04535,-0.10972 0,-0.0658 0.04535,-0.1068 0.04681,-0.0424 0.155069,-0.0424 z"
+         d="m 70.879593,-100.87829 v 0.63929 q 0.09363,-0.0556 0.188716,-0.0819 0.09655,-0.0278 0.194568,-0.0278 0.155069,0 0.276491,0.0527 0.121422,0.0527 0.200419,0.16677 0.08046,0.11265 0.08046,0.285271 v 0.563223 q 0.114107,0 0.149217,0.02194 0.07022,0.04535 0.07022,0.128736 0,0.06583 -0.04535,0.108256 -0.04535,0.04096 -0.153606,0.04096 h -0.342323 q -0.106793,0 -0.153606,-0.04096 -0.04535,-0.04242 -0.04535,-0.109719 0,-0.08192 0.07022,-0.127273 0.03657,-0.02341 0.149218,-0.02194 v -0.542742 q 0,-0.115571 -0.05267,-0.162384 -0.06876,-0.06291 -0.203345,-0.06291 -0.09948,0 -0.177013,0.0395 -0.07607,0.03804 -0.206271,0.16655 v 0.56176 q 0.11557,0 0.149217,0.02194 0.07168,0.04535 0.07168,0.128736 0,0.06583 -0.04681,0.108256 -0.04535,0.04096 -0.153607,0.04096 h -0.340859 q -0.108256,0 -0.155069,-0.04096 -0.04535,-0.04242 -0.04535,-0.109719 0,-0.08192 0.07168,-0.127273 0.03511,-0.02341 0.149218,-0.02194 v -1.29738 h -0.0512 q -0.108256,0 -0.155069,-0.041 -0.04535,-0.0424 -0.04535,-0.10972 0,-0.0658 0.04535,-0.1068 0.04681,-0.0424 0.155069,-0.0424 z"
          style="fill:#c06969;fill-opacity:1;stroke-width:0.17284918"
          id="path1800"
          inkscape:connector-curvature="0" />
@@ -674,6 +602,74 @@
          id="path6927"
          inkscape:connector-curvature="0" />
     </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       x="-17.914305"
+       y="1.3657678"
+       id="text1623"><tspan
+         sodipodi:role="line"
+         id="tspan1621"
+         x="-17.914305"
+         y="11.021263"
+         style="stroke-width:0.26458332" /></text>
+    <path
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.14498055;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+       d="m 30.61921,13.015991 h 4.222"
+       id="path3915-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       aria-label="lock"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.13942432px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New';letter-spacing:0px;word-spacing:0px;fill:#c06969;fill-opacity:1;stroke:none;stroke-width:0.1784856"
+       id="text1702"
+       transform="translate(0,1.5875)">
+      <path
+         d="m 35.751324,14.221695 v 1.395813 h 0.314442 q 0.09459,0 0.134213,0.03707 0.0409,0.03579 0.0409,0.09459 0,0.05752 -0.0409,0.09459 -0.03963,0.03579 -0.134213,0.03579 h -0.890918 q -0.09459,0 -0.135491,-0.03579 -0.03962,-0.03707 -0.03962,-0.09587 0,-0.05752 0.03962,-0.09331 0.0409,-0.03707 0.135491,-0.03707 h 0.314442 v -1.133779 h -0.210906 q -0.09331,0 -0.134213,-0.03579 -0.0409,-0.03707 -0.0409,-0.09587 0,-0.05752 0.03963,-0.09331 0.0409,-0.03707 0.135491,-0.03707 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.61778903px;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';fill:#c06969;fill-opacity:1;stroke-width:0.1784856"
+         id="path3289"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 37.870609,15.320961 q 0,0.15083 -0.08436,0.292712 -0.08308,0.140604 -0.249252,0.224966 -0.16489,0.08308 -0.345119,0.08308 -0.17895,0 -0.342562,-0.08181 -0.163612,-0.08309 -0.249252,-0.224967 -0.08564,-0.141882 -0.08564,-0.296546 0,-0.157221 0.08692,-0.30805 0.08692,-0.152108 0.249252,-0.239027 0.163612,-0.08692 0.341284,-0.08692 0.178951,0 0.343841,0.08948 0.166168,0.0882 0.25053,0.239027 0.08436,0.149551 0.08436,0.30805 z m -0.262035,0.0013 q 0,-0.126544 -0.09075,-0.232636 -0.123987,-0.14316 -0.325946,-0.14316 -0.177672,0 -0.296546,0.113761 -0.118874,0.113761 -0.118874,0.263313 0,0.122709 0.120152,0.230079 0.120153,0.106092 0.295268,0.106092 0.176394,0 0.296547,-0.106092 0.120152,-0.10737 0.120152,-0.231357 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.61778903px;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';fill:#c06969;fill-opacity:1;stroke-width:0.1784856"
+         id="path3291"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 39.167999,14.766215 q 0.04729,-0.04474 0.09714,-0.04474 0.05624,0 0.09203,0.0409 0.03707,0.03962 0.03707,0.132935 v 0.168725 q 0,0.09459 -0.03707,0.134213 -0.03579,0.03962 -0.09459,0.03962 -0.05369,0 -0.09075,-0.03068 -0.02684,-0.02301 -0.04218,-0.09331 -0.01534,-0.07158 -0.07414,-0.106092 -0.103535,-0.06135 -0.264591,-0.06135 -0.185341,0 -0.297824,0.108648 -0.111205,0.108649 -0.111205,0.274817 0,0.153386 0.10737,0.242861 0.10737,0.0882 0.356623,0.0882 0.163611,0 0.267147,-0.03323 0.06135,-0.02045 0.116318,-0.06902 0.05496,-0.04985 0.0997,-0.04985 0.05369,0 0.09203,0.03963 0.03963,0.03962 0.03963,0.09331 0,0.08692 -0.118874,0.16489 -0.176394,0.116318 -0.5164,0.116318 -0.305494,0 -0.475497,-0.126544 -0.230079,-0.170003 -0.230079,-0.465271 0,-0.279929 0.18662,-0.462715 0.18662,-0.184063 0.487001,-0.184063 0.108648,0 0.201958,0.02045 0.09331,0.02045 0.172559,0.06135 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.61778903px;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';fill:#c06969;fill-opacity:1;stroke-width:0.1784856"
+         id="path3293"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 40.113881,15.44367 v 0.435872 h -0.306773 q -0.09459,0 -0.135491,-0.03579 -0.03962,-0.03707 -0.03962,-0.09587 0,-0.05752 0.0409,-0.09331 0.0409,-0.03707 0.134212,-0.03707 h 0.04474 v -1.133779 h -0.04474 q -0.09459,0 -0.135491,-0.03579 -0.03962,-0.03707 -0.03962,-0.09587 0,-0.05752 0.03962,-0.09331 0.0409,-0.03707 0.135491,-0.03707 h 0.306773 v 0.883248 l 0.204514,-0.16489 q -0.03196,-0.05496 -0.03196,-0.08948 0,-0.0588 0.03963,-0.09459 0.03962,-0.03707 0.134212,-0.03707 h 0.299103 q 0.09459,0 0.134213,0.03707 0.0409,0.03579 0.0409,0.09459 0,0.05752 -0.0409,0.09459 -0.03963,0.03579 -0.134213,0.03579 h -0.07286 l -0.318276,0.258199 0.428203,0.378353 h 0.07669 q 0.09459,0 0.134212,0.03707 0.0409,0.03579 0.0409,0.09459 0,0.05752 -0.0409,0.09459 -0.03962,0.03579 -0.134212,0.03579 h -0.30166 q -0.09459,0 -0.135491,-0.03579 -0.03962,-0.03707 -0.03962,-0.09587 0,-0.04985 0.04346,-0.09842 l -0.277373,-0.245417 z"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.61778903px;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';fill:#c06969;fill-opacity:1;stroke-width:0.1784856"
+         id="path3295"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       aria-label="pause"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.46944451px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';opacity:1;fill:#c06969;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="text1766">
+      <path
+         d="M 74.912247,4.9687508 V 5.373894 h 0.148311 q 0.08923,0 0.126607,0.033762 0.03859,0.034968 0.03859,0.090434 0,0.05426 -0.03859,0.088022 -0.03738,0.034968 -0.126607,0.034968 h -0.437699 q -0.08923,0 -0.127813,-0.034968 -0.03738,-0.033762 -0.03738,-0.088022 0,-0.055466 0.03858,-0.090434 0.03858,-0.033762 0.126608,-0.033762 h 0.0422 V 4.2573385 h -0.0422 q -0.08923,0 -0.127813,-0.033762 -0.03738,-0.034968 -0.03738,-0.090434 0,-0.05426 0.03738,-0.088022 0.03858,-0.034968 0.127813,-0.034968 h 0.289388 v 0.084405 q 0.08682,-0.059083 0.179661,-0.088022 0.09285,-0.028939 0.190514,-0.028939 0.253215,0 0.431671,0.172427 0.178456,0.1712213 0.178456,0.3930854 0,0.2447741 -0.211012,0.4039375 -0.176045,0.1326362 -0.396703,0.1326362 -0.09526,0 -0.188102,-0.027733 -0.09285,-0.027733 -0.184485,-0.083199 z M 75.645363,4.544315 q 0,-0.051849 -0.041,-0.1314304 -0.041,-0.080787 -0.126607,-0.133842 -0.08441,-0.05426 -0.198954,-0.05426 -0.184485,0 -0.293005,0.1386651 -0.07355,0.095257 -0.07355,0.1832791 0,0.098874 0.104903,0.1929253 0.106109,0.092845 0.261655,0.092845 0.156752,0 0.261655,-0.092845 0.104903,-0.092845 0.104903,-0.1953369 z"
+         style="font-size:2.46944451px;stroke-width:2"
+         id="path1228" />
+      <path
+         d="m 76.922288,5.1050043 v -0.057878 q -0.09285,0.049437 -0.204983,0.073553 -0.112138,0.025321 -0.203778,0.025321 -0.198954,0 -0.32315,-0.1049031 -0.124196,-0.106109 -0.124196,-0.233922 0,-0.1555461 0.157958,-0.2881822 0.159163,-0.133842 0.438905,-0.133842 0.112138,0 0.259244,0.024116 v -0.059083 q 0,-0.055466 -0.04823,-0.090434 -0.04702,-0.034968 -0.180867,-0.034968 -0.109726,0 -0.284565,0.043408 -0.06511,0.015675 -0.101286,0.015675 -0.04944,0 -0.08441,-0.034968 -0.03376,-0.036174 -0.03376,-0.09164 0,-0.03135 0.01206,-0.05426 0.01206,-0.02291 0.03376,-0.036174 0.0217,-0.014469 0.09043,-0.033762 0.09164,-0.025321 0.186896,-0.039791 0.09526,-0.015675 0.172427,-0.015675 0.230305,0 0.356912,0.10008 0.127813,0.098874 0.127813,0.2713013 v 0.5088406 h 0.0422 q 0.08923,0 0.126607,0.034968 0.03858,0.033762 0.03858,0.089228 0,0.05426 -0.03858,0.089228 -0.03738,0.033762 -0.126607,0.033762 z m 0,-0.4425225 q -0.148312,-0.028939 -0.273713,-0.028939 -0.150723,0 -0.259244,0.073553 -0.06752,0.047026 -0.06752,0.095257 0,0.034968 0.03256,0.056672 0.06029,0.039791 0.165192,0.039791 0.08923,0 0.201366,-0.034968 0.113344,-0.034968 0.201366,-0.095257 z"
+         style="font-size:2.46944451px;stroke-width:2"
+         id="path1230" />
+      <path
+         d="m 78.705641,4.0101529 v 0.8476658 q 0.07838,0 0.115756,0.034968 0.03738,0.034968 0.03738,0.089228 0,0.05426 -0.03859,0.089228 -0.03738,0.033762 -0.126607,0.033762 h -0.235128 v -0.056672 q -0.106109,0.048231 -0.202572,0.072347 -0.09646,0.024116 -0.183279,0.024116 -0.121784,0 -0.211012,-0.050643 -0.08923,-0.051849 -0.141077,-0.1422825 -0.03738,-0.065112 -0.03738,-0.1627808 V 4.2573385 h -0.0422 q -0.08923,0 -0.127813,-0.033762 -0.03738,-0.034968 -0.03738,-0.090434 0,-0.05426 0.03738,-0.088022 0.03858,-0.034968 0.127813,-0.034968 h 0.289388 v 0.7355279 q 0,0.078376 0.03738,0.1157553 0.03858,0.036174 0.116961,0.036174 0.07476,0 0.160369,-0.028939 0.08682,-0.030145 0.213424,-0.1073148 V 4.2573385 h -0.08923 q -0.08923,0 -0.127813,-0.033762 -0.03738,-0.034968 -0.03738,-0.090434 0,-0.05426 0.03738,-0.088022 0.03858,-0.034968 0.127813,-0.034968 z"
+         style="font-size:2.46944451px;stroke-width:2"
+         id="path1232" />
+      <path
+         d="m 79.928306,4.299541 q -0.06029,-0.037379 -0.126607,-0.055466 -0.06632,-0.019293 -0.138665,-0.019293 -0.143489,0 -0.227894,0.047026 -0.03738,0.020498 -0.03738,0.044614 0,0.027733 0.05064,0.05426 0.03858,0.019292 0.172427,0.037379 0.24598,0.033762 0.342443,0.067524 0.126607,0.044614 0.195337,0.1326362 0.06873,0.088022 0.06873,0.1856907 0,0.1326362 -0.116961,0.2218641 -0.167604,0.1290189 -0.435288,0.1290189 -0.107314,0 -0.198954,-0.019293 -0.09043,-0.018087 -0.166398,-0.05426 -0.01809,0.015675 -0.03858,0.024116 -0.0205,0.00844 -0.0422,0.00844 -0.05788,0 -0.09284,-0.037379 -0.03376,-0.038585 -0.03376,-0.127813 v -0.083199 q 0,-0.089228 0.03376,-0.1266072 0.03497,-0.038585 0.09043,-0.038585 0.04461,0 0.07476,0.025322 0.03014,0.024116 0.04703,0.084405 0.05667,0.048231 0.136254,0.073553 0.07958,0.024116 0.183279,0.024116 0.170015,0 0.264066,-0.053055 0.04461,-0.026527 0.04461,-0.055466 0,-0.048231 -0.06391,-0.079582 -0.06391,-0.03135 -0.264067,-0.053054 -0.297828,-0.03135 -0.397908,-0.1205784 -0.10008,-0.088022 -0.10008,-0.217041 0,-0.1326362 0.112137,-0.2206584 0.151929,-0.1205783 0.397909,-0.1205783 0.08561,0 0.163987,0.016881 0.07958,0.015675 0.151928,0.049437 0.02291,-0.016881 0.0422,-0.025321 0.0205,-0.00844 0.03738,-0.00844 0.05064,0 0.08441,0.038585 0.03376,0.037379 0.03376,0.1266073 v 0.060289 q 0,0.080787 -0.01929,0.1097263 -0.03858,0.055466 -0.104903,0.055466 -0.04461,0 -0.07838,-0.027733 -0.03376,-0.027733 -0.04341,-0.073553 z"
+         style="font-size:2.46944451px;stroke-width:2"
+         id="path1234" />
+      <path
+         d="m 81.762302,4.6829801 h -1.014064 q 0.03859,0.096463 0.136254,0.1555461 0.09887,0.059083 0.266478,0.059083 0.137459,0 0.365353,-0.059083 0.09405,-0.024116 0.130224,-0.024116 0.04944,0 0.0832,0.034968 0.03376,0.034968 0.03376,0.088022 0,0.048231 -0.03617,0.081993 -0.04823,0.044614 -0.235128,0.085611 -0.186897,0.039791 -0.359324,0.039791 -0.296622,0 -0.475078,-0.1676039 -0.17725,-0.1676039 -0.17725,-0.412378 0,-0.2604492 0.191719,-0.42323 0.192925,-0.1639865 0.443728,-0.1639865 0.150723,0 0.276125,0.053054 0.126607,0.053054 0.188102,0.1145494 0.08682,0.089228 0.143488,0.2206584 0.03859,0.09164 0.03859,0.2122178 z M 81.48859,4.4357945 q -0.05667,-0.106109 -0.148312,-0.1579576 -0.09164,-0.053055 -0.218247,-0.053055 -0.125401,0 -0.217041,0.053055 -0.09164,0.051849 -0.149517,0.1579576 z"
+         style="font-size:2.46944451px;stroke-width:2"
+         id="path1236" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -688,7 +684,7 @@
        inkscape:tile-cy="15.577987"
        inkscape:tile-cx="45.647267"
        sodipodi:nodetypes="ccccscc"
-       style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 6.1513878,15.92679 C 13.259097,9.801101 19.094368,11.342131 25.689647,15.759187 c 8.301335,6.798066 12.275922,6.098679 20.689643,0 6.831173,-3.99296 7.107524,-3.898148 10.171505,-3.898148 4.125986,0 7.256656,3.765907 10.906314,3.765907 3.139172,0 5.526848,-2.499058 9.640482,-2.499058 3.726905,0 9.549482,2.868041 9.549482,2.868041"
        id="path1932"
        inkscape:connector-curvature="0" />
@@ -696,7 +692,7 @@
        inkscape:connector-curvature="0"
        id="path2113"
        d="m 6.1513878,29.0251 c 7.1077092,-6.125689 12.9429802,-4.584659 19.5382592,-0.167603 8.301335,6.798066 12.275922,6.098679 20.689643,0 6.831173,-3.99296 7.107524,-3.898148 10.171505,-3.898148 4.125986,0 7.256656,3.765907 10.906314,3.765907 3.139172,0 5.526848,-2.499058 9.640482,-2.499058 3.726905,0 9.549482,2.868041 9.549482,2.868041"
-       style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        sodipodi:nodetypes="ccccscc"
        inkscape:tile-cx="45.647267"
        inkscape:tile-cy="15.577987"
@@ -708,7 +704,7 @@
        inkscape:connector-curvature="0"
        id="path2099"
        d="m 6.1513878,42.12341 c 7.1077092,-6.125689 12.9429802,-4.584659 19.5382592,-0.167603 8.301335,6.798066 12.275922,6.098679 20.689643,0 6.831173,-3.99296 7.107524,-3.898148 10.171505,-3.898148 4.125986,0 7.256656,3.765907 10.906314,3.765907 3.139172,0 5.526848,-2.499058 9.640482,-2.499058 3.726905,0 9.549482,2.868041 9.549482,2.868041"
-       style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        sodipodi:nodetypes="ccccscc"
        inkscape:tile-cx="45.647267"
        inkscape:tile-cy="15.577987"
@@ -720,7 +716,7 @@
        inkscape:connector-curvature="0"
        id="path2085"
        d="m 6.1513878,55.22172 c 7.1077092,-6.125689 12.9429802,-4.584659 19.5382592,-0.167603 8.301335,6.798066 12.275922,6.098679 20.689643,0 6.831173,-3.99296 7.107524,-3.898148 10.171505,-3.898148 4.125986,0 7.256656,3.765907 10.906314,3.765907 3.139172,0 5.526848,-2.499058 9.640482,-2.499058 3.726905,0 9.549482,2.868041 9.549482,2.868041"
-       style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        sodipodi:nodetypes="ccccscc"
        inkscape:tile-cx="45.647267"
        inkscape:tile-cy="15.577987"
@@ -732,7 +728,7 @@
        inkscape:connector-curvature="0"
        id="path2071"
        d="m 6.1513878,68.32003 c 7.1077092,-6.125689 12.9429802,-4.584659 19.5382592,-0.167603 8.301335,6.798066 12.275922,6.098679 20.689643,0 6.831173,-3.99296 7.107524,-3.898148 10.171505,-3.898148 4.125986,0 7.256656,3.765907 10.906314,3.765907 3.139172,0 5.526848,-2.499058 9.640482,-2.499058 3.726905,0 9.549482,2.868041 9.549482,2.868041"
-       style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        sodipodi:nodetypes="ccccscc"
        inkscape:tile-cx="45.647267"
        inkscape:tile-cy="15.577987"
@@ -744,7 +740,7 @@
        inkscape:connector-curvature="0"
        id="path2057"
        d="m 6.1513878,81.41834 c 7.1077092,-6.125689 12.9429802,-4.584659 19.5382592,-0.167603 8.301335,6.798066 12.275922,6.098679 20.689643,0 6.831173,-3.99296 7.107524,-3.898148 10.171505,-3.898148 4.125986,0 7.256656,3.765907 10.906314,3.765907 3.139172,0 5.526848,-2.499058 9.640482,-2.499058 3.726905,0 9.549482,2.868041 9.549482,2.868041"
-       style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        sodipodi:nodetypes="ccccscc"
        inkscape:tile-cx="45.647267"
        inkscape:tile-cy="15.577987"
@@ -756,7 +752,7 @@
        inkscape:connector-curvature="0"
        id="path2043"
        d="m 6.1513878,94.51666 c 7.1077092,-6.125689 12.9429802,-4.584659 19.5382592,-0.167603 8.301335,6.798063 12.275922,6.098683 20.689643,0 6.831173,-3.99296 7.107524,-3.898148 10.171505,-3.898148 4.125986,0 7.256656,3.765907 10.906314,3.765907 3.139172,0 5.526848,-2.499058 9.640482,-2.499058 3.726905,0 9.549482,2.868041 9.549482,2.868041"
-       style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        sodipodi:nodetypes="ccccscc"
        inkscape:tile-cx="45.647267"
        inkscape:tile-cy="15.577987"
@@ -768,7 +764,7 @@
        inkscape:connector-curvature="0"
        id="path2029"
        d="m 6.1513878,107.61497 c 7.1077092,-6.12569 12.9429802,-4.58466 19.5382592,-0.1676 8.301335,6.79806 12.275922,6.09868 20.689643,0 6.831173,-3.99296 7.107524,-3.89815 10.171505,-3.89815 4.125986,0 7.256656,3.76591 10.906314,3.76591 3.139172,0 5.526848,-2.49906 9.640482,-2.49906 3.726905,0 9.549482,2.86804 9.549482,2.86804"
-       style="fill:none;fill-opacity:1;stroke:#c06969;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:none;fill-opacity:1;stroke:#c63434;stroke-width:1.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        sodipodi:nodetypes="ccccscc"
        inkscape:tile-cx="45.647267"
        inkscape:tile-cy="15.577987"
@@ -1820,6 +1816,64 @@
            sodipodi:nodetypes="sssss" />
       </g>
     </g>
+    <g
+       style="display:inline;enable-background:new"
+       inkscape:label="Layer 1"
+       id="g5750-9"
+       transform="translate(0.56068463,-45.870647)">
+      <g
+         style="display:inline"
+         id="g5748-8"
+         transform="matrix(0.91529301,0,0,0.91525397,19.167296,-8.5740492)">
+        <circle
+           cy="70.250549"
+           cx="65.37516"
+           id="circle5732-8"
+           style="fill:#759783;fill-opacity:1;stroke:#4c6f75;stroke-width:0.52100003;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           r="4.1097784" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path5734-2"
+           d="m 67.802149,72.925312 c -1.686708,1.518835 -3.962214,1.76204 -5.48105,0.07533 -1.518836,-1.68671 -1.101791,-3.906025 0.584918,-5.424861 1.686709,-1.518835 -0.701673,2.522557 0.817163,4.209267 1.518835,1.686707 5.765677,-0.378574 4.078969,1.140261 z"
+           style="fill:#a9beb2;fill-opacity:1;stroke:#415e66;stroke-width:0.52100003;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <circle
+           cy="70.250549"
+           cx="65.37516"
+           id="circle5736-0"
+           style="fill:#759783;fill-opacity:1;stroke:none;stroke-width:0.49072546;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           r="3.8709648" />
+        <path
+           style="fill:#c6d4cc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2704879"
+           d="m 62.391046,70.246857 c 0.0084,1.596501 1.282705,2.8718 2.878162,2.879206 1.589116,-0.0053 2.874989,-1.28798 2.872876,-2.879206 -0.0011,-1.587009 -1.285874,-2.867604 -2.872876,-2.871821 -1.593344,0.0062 -2.866539,1.277406 -2.878162,2.871821"
+           id="path5738-4"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path5740-5"
+           d="m 62.885971,70.248098 c 0.0065,1.321904 1.061139,2.376476 2.383055,2.383023 1.315353,-0.005 2.379776,-1.066038 2.378133,-2.383023 0,-1.315348 -1.064419,-2.374878 -2.378133,-2.378151 -1.318633,0.0048 -2.373213,1.05785 -2.383055,2.378151"
+           style="fill:#405e63;fill-opacity:1;fill-rule:nonzero;stroke:#0f1511;stroke-width:0.20877486;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path5742-5"
+           d="m 97.224741,1.7842588 c 0,1.7787814 -1.066034,0.8036297 -1.549788,0.8036297 -0.483753,0 -1.145314,1.23196 -1.145314,-0.8974636 0,-0.163852 0.779249,-0.4399002 1.275941,-0.4399002 0.743027,0 1.419161,0.3698821 1.419161,0.5337341 z"
+           style="fill:#395259;fill-opacity:1;stroke:none;stroke-width:0.20836374;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+           transform="rotate(45)" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.29460451"
+           d="m 63.596182,70.248825 c 0.0046,0.927536 0.744565,1.667493 1.67211,1.672086 0.92294,-0.0033 1.66981,-0.747999 1.668657,-1.672086 0,-0.922936 -0.746867,-1.666375 -1.668657,-1.668671 -0.925241,0.0033 -1.665205,0.742261 -1.67211,1.668671"
+           id="path5744-3"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path5746-9"
+           d="m 96.491704,5.4991469 c 0,0.1245072 -0.297993,0.2254403 -0.665586,0.2254401 -0.367592,0 -0.665585,-0.100933 -0.665585,-0.2254401 0,-0.1245071 0.316559,-0.1326095 0.684151,-0.1326095 0.367593,-2e-7 0.64702,0.0081 0.64702,0.1326095 z"
+           style="fill:#5b7a7e;fill-opacity:1;stroke:none;stroke-width:0.15833059;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+           transform="rotate(45)" />
+      </g>
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -2283,55 +2337,6 @@
            transform="rotate(45)" />
       </g>
     </g>
-    <g
-       id="g4620"
-       transform="matrix(0.26458331,0,0,0.26458331,30.436494,-76.176403)">
-      <g
-         inkscape:label="Layer 1"
-         id="g4595"
-         transform="matrix(3.7795279,0,0,3.7795279,-790.55226,-672.13039)">
-        <g
-           style="display:inline"
-           id="g4593"
-           transform="matrix(0.91466439,0,0,0.91466439,186.27674,203.12835)">
-          <circle
-             r="3.7675669"
-             cy="70.250549"
-             cx="65.37516"
-             id="circle4577"
-             style="fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.57830459;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
-          <path
-             style="fill:#c6d4cc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2704879"
-             d="m 62.391046,70.246857 c 0.0084,1.596501 1.282705,2.8718 2.878162,2.879206 1.589116,-0.0053 2.874989,-1.28798 2.872876,-2.879206 -0.0011,-1.587009 -1.285874,-2.867604 -2.872876,-2.871821 -1.593344,0.0062 -2.866539,1.277406 -2.878162,2.871821"
-             id="path4583"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4585"
-             d="m 62.885971,70.248098 c 0.0065,1.321904 1.061139,2.376476 2.383055,2.383023 1.315353,-0.005 2.379776,-1.066038 2.378133,-2.383023 0,-1.315348 -1.064419,-2.374878 -2.378133,-2.378151 -1.318633,0.0048 -2.373213,1.05785 -2.383055,2.378151"
-             style="fill:#c63434;fill-opacity:1;fill-rule:nonzero;stroke:#0f1511;stroke-width:0.20877486;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="sssss"
-             inkscape:connector-curvature="0"
-             id="path4587"
-             d="m 97.224741,1.7842588 c 0,1.7787814 -1.066034,0.8036297 -1.549788,0.8036297 -0.483753,0 -1.145314,1.23196 -1.145314,-0.8974636 0,-0.163852 0.779249,-0.4399002 1.275941,-0.4399002 0.743027,0 1.419161,0.3698821 1.419161,0.5337341 z"
-             style="fill:#a62c2c;fill-opacity:1;stroke:none;stroke-width:0.20836374;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-             transform="rotate(45)" />
-          <path
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.29460451"
-             d="m 63.596182,70.248825 c 0.0046,0.927536 0.744565,1.667493 1.67211,1.672086 0.92294,-0.0033 1.66981,-0.747999 1.668657,-1.672086 0,-0.922936 -0.746867,-1.666375 -1.668657,-1.668671 -0.925241,0.0033 -1.665205,0.742261 -1.67211,1.668671"
-             id="path4589"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="sssss"
-             inkscape:connector-curvature="0"
-             id="path4591"
-             d="m 96.491704,5.4991469 c 0,0.1245072 -0.297993,0.2254403 -0.665586,0.2254401 -0.367592,0 -0.665585,-0.100933 -0.665585,-0.2254401 0,-0.1245071 0.316559,-0.1326095 0.684151,-0.1326095 0.367593,-2e-7 0.64702,0.0081 0.64702,0.1326095 z"
-             style="fill:#d47777;fill-opacity:1;stroke:none;stroke-width:0.15833059;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-             transform="rotate(45)" />
-        </g>
-      </g>
-    </g>
     <g
        style="display:inline"
        id="g1623"
@@ -2343,5 +2348,24 @@
          id="circle1607"
          inkscape:connector-curvature="0" />
     </g>
+    <rect
+       y="-42.013874"
+       x="10.568684"
+       height="7.9797564"
+       width="4.7113538"
+       id="rect4901-0"
+       style="display:inline;opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:2.04510212;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal;enable-background:new"
+       transform="rotate(90)" />
+    <g
+       style="display:inline;enable-background:new"
+       id="g1623-2"
+       transform="matrix(0.91529302,0,0,0.91525397,16.754107,-54.445162)">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#c06969;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.80229616;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 26.037109,433.45703 c -8.339007,0 -15.121093,6.77463 -15.121093,15.11328 0,8.33865 6.782086,15.1211 15.121093,15.1211 0.614322,0 9.624956,-0.0387 10.615235,-0.043 -7.946241,-0.44088 -14.279297,-7.02381 -14.279297,-15.07813 0,-8.26541 6.666038,-14.98399 14.904297,-15.10156 -1.196877,-0.001 -10.624626,-0.0117 -11.240235,-0.0117 z"
+         transform="matrix(0.28906954,0,0,0.28908187,57.848511,-59.423775)"
+         id="circle1607-4"
+         inkscape:connector-curvature="0" />
+    </g>
   </g>
 </svg>
diff --git a/res/CM-4.svg b/res/CM-4.svg
index 9918660..8024a5c 100644
--- a/res/CM-4.svg
+++ b/res/CM-4.svg
@@ -64,24 +64,24 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4535161"
-     inkscape:cx="-127.97237"
-     inkscape:cy="250.00494"
+     inkscape:zoom="4.1111644"
+     inkscape:cx="-4.2123814"
+     inkscape:cy="287.46929"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer6"
+     inkscape:current-layer="layer1"
      showgrid="false"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
      units="px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-width="1600"
+     inkscape:window-height="877"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
+     inkscape:bbox-nodes="false"
      inkscape:object-nodes="true"
      inkscape:snap-page="true"
      inkscape:object-paths="false"
@@ -343,20 +343,30 @@
       <path
          d="m 15.628468,-89.445026 q -0.08675,-0.05378 -0.182169,-0.07981 -0.09542,-0.02776 -0.199518,-0.02776 -0.206458,0 -0.327903,0.06766 -0.05378,0.02949 -0.05378,0.06419 0,0.0399 0.07287,0.07807 0.05552,0.02776 0.248096,0.05378 0.353928,0.04858 0.492723,0.09716 0.182168,0.06419 0.28106,0.190843 0.09889,0.126651 0.09889,0.267181 0,0.190843 -0.168289,0.319228 -0.241156,0.185639 -0.626313,0.185639 -0.154409,0 -0.286265,-0.02776 -0.13012,-0.02602 -0.239421,-0.07807 -0.02602,0.02255 -0.05552,0.0347 -0.02949,0.01214 -0.06072,0.01214 -0.08328,0 -0.13359,-0.05378 -0.04858,-0.05552 -0.04858,-0.183904 v -0.11971 q 0,-0.128386 0.04858,-0.182169 0.05031,-0.05552 0.13012,-0.05552 0.06419,0 0.107566,0.03643 0.04337,0.0347 0.06766,0.121445 0.08154,0.0694 0.196048,0.105832 0.114506,0.0347 0.263711,0.0347 0.244626,0 0.379951,-0.07634 0.06419,-0.03817 0.06419,-0.07981 0,-0.0694 -0.09195,-0.114506 -0.09195,-0.04511 -0.379951,-0.07634 -0.42853,-0.04511 -0.57253,-0.173494 -0.144,-0.126651 -0.144,-0.312289 0,-0.190844 0.161349,-0.317494 0.218603,-0.173494 0.57253,-0.173494 0.123181,0 0.235952,0.02429 0.114506,0.02255 0.218602,0.07113 0.03296,-0.02429 0.06072,-0.03643 0.02949,-0.01215 0.05378,-0.01215 0.07287,0 0.121446,0.05552 0.04858,0.05378 0.04858,0.182169 v 0.08675 q 0,0.116241 -0.02776,0.157879 -0.05552,0.07981 -0.15094,0.07981 -0.06419,0 -0.112771,-0.0399 -0.04858,-0.0399 -0.06246,-0.105831 z"
          style="fill:#c06969;fill-opacity:1;stroke-width:0.29609624"
-         id="path2246" />
+         id="path2246"
+         inkscape:connector-curvature="0" />
       <path
          d="m 17.014684,-89.861412 v 0.119711 q 0.09716,-0.08328 0.213397,-0.124915 0.117976,-0.04164 0.255036,-0.04164 0.315759,0 0.499663,0.196048 0.145735,0.156145 0.145735,0.409446 v 0.661011 q 0.112771,0 0.166554,0.05031 0.05378,0.04858 0.05378,0.128385 0,0.07807 -0.05552,0.128386 -0.05378,0.04858 -0.182169,0.04858 h -0.320963 q -0.128386,0 -0.183904,-0.04858 -0.05378,-0.05031 -0.05378,-0.130121 0,-0.07807 0.05378,-0.12665 0.05378,-0.05031 0.166554,-0.05031 v -0.671421 q 0,-0.116241 -0.06246,-0.170024 -0.08154,-0.0694 -0.244626,-0.0694 -0.123181,0 -0.216867,0.04858 -0.09195,0.04684 -0.234217,0.201253 v 0.661011 q 0.13706,0 0.176964,0.02603 0.08501,0.05205 0.08501,0.152674 0,0.07807 -0.05552,0.128386 -0.05378,0.04858 -0.182169,0.04858 h -0.404241 q -0.128385,0 -0.183903,-0.04858 -0.05378,-0.05031 -0.05378,-0.130121 0,-0.09716 0.08328,-0.150939 0.04164,-0.02603 0.178698,-0.02603 v -0.863999 q -0.112771,0 -0.166554,-0.05031 -0.05378,-0.05031 -0.05378,-0.128386 0,-0.07807 0.05378,-0.12665 0.05552,-0.05031 0.183904,-0.05031 z"
          style="fill:#c06969;fill-opacity:1;stroke-width:0.29609624"
-         id="path2248" />
+         id="path2248"
+         inkscape:connector-curvature="0" />
       <path
          d="m 19.825285,-88.286087 v -0.08328 q -0.13359,0.07113 -0.29494,0.105831 -0.161349,0.03643 -0.293204,0.03643 -0.286265,0 -0.464964,-0.15094 -0.178699,-0.152674 -0.178699,-0.336578 0,-0.223807 0.227277,-0.41465 0.229012,-0.192579 0.631518,-0.192579 0.161349,0 0.373012,0.0347 v -0.08501 q 0,-0.07981 -0.0694,-0.13012 -0.06766,-0.05031 -0.26024,-0.05031 -0.15788,0 -0.409446,0.06246 -0.09369,0.02255 -0.145735,0.02255 -0.07113,0 -0.121446,-0.05031 -0.04858,-0.05205 -0.04858,-0.131855 0,-0.04511 0.01735,-0.07807 0.01735,-0.03296 0.04858,-0.05205 0.03123,-0.02082 0.13012,-0.04858 0.131856,-0.03643 0.268916,-0.05725 0.13706,-0.02255 0.248096,-0.02255 0.331373,0 0.513542,0.144 0.183903,0.142265 0.183903,0.390361 v 0.732144 h 0.06072 q 0.128386,0 0.182169,0.05031 0.05552,0.04858 0.05552,0.128385 0,0.07807 -0.05552,0.128386 -0.05378,0.04858 -0.182169,0.04858 z m 0,-0.636723 q -0.213397,-0.04164 -0.393831,-0.04164 -0.216868,0 -0.373012,0.105831 -0.09716,0.06766 -0.09716,0.13706 0,0.05031 0.04684,0.08154 0.08675,0.05725 0.237686,0.05725 0.128386,0 0.289735,-0.05031 0.163084,-0.05031 0.289735,-0.13706 z"
          style="fill:#c06969;fill-opacity:1;stroke-width:0.29609624"
-         id="path2250" />
+         id="path2250"
+         inkscape:connector-curvature="0" />
       <path
          d="m 21.194152,-88.482135 v 0.582939 h 0.213397 q 0.128386,0 0.182169,0.04858 0.05552,0.05031 0.05552,0.13012 0,0.07807 -0.05552,0.126651 -0.05378,0.05031 -0.182169,0.05031 h -0.629782 q -0.128386,0 -0.183904,-0.05031 -0.05378,-0.04858 -0.05378,-0.126651 0,-0.07981 0.05552,-0.13012 0.05552,-0.04858 0.182169,-0.04858 h 0.06072 v -1.606553 h -0.06072 q -0.128386,0 -0.183904,-0.04858 -0.05378,-0.05031 -0.05378,-0.130121 0,-0.07807 0.05378,-0.12665 0.05552,-0.05031 0.183904,-0.05031 h 0.416385 v 0.121446 q 0.124916,-0.08501 0.258506,-0.12665 0.13359,-0.04164 0.27412,-0.04164 0.364337,0 0.621108,0.248096 0.256771,0.246362 0.256771,0.56559 0,0.352193 -0.303614,0.581205 -0.253301,0.190843 -0.570795,0.190843 -0.13706,0 -0.27065,-0.0399 -0.133591,-0.0399 -0.265446,-0.119711 z m 1.054843,-0.610699 q 0,-0.0746 -0.05899,-0.189108 -0.05899,-0.116241 -0.182169,-0.192578 -0.121445,-0.07807 -0.286265,-0.07807 -0.265445,0 -0.42159,0.199518 -0.105831,0.13706 -0.105831,0.26371 0,0.142265 0.15094,0.27759 0.152674,0.133591 0.376481,0.133591 0.225542,0 0.376482,-0.133591 0.15094,-0.13359 0.15094,-0.28106 z"
          style="fill:#c06969;fill-opacity:1;stroke-width:0.29609624"
-         id="path2252" />
+         id="path2252"
+         inkscape:connector-curvature="0" />
     </g>
+    <path
+       style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.91571969;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12.274186,-53.200131 1.758682,1.469788 -2.214301,1.329701 -0.418427,-0.343252 z"
+       id="rect4322"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -539,78 +549,6 @@
          x="5.3679876"
          y="-14.025749"
          style="stroke-width:0.26458332" /></text>
-    <g
-       style="display:inline"
-       transform="translate(-72.376696,-114.69478)"
-       id="layer1-2"
-       inkscape:label="Layer 1">
-      <g
-         transform="matrix(0.91529301,0,0,0.91525397,19.167296,-8.5740492)"
-         id="g3117"
-         style="display:inline">
-        <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#4c6f75;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.52100003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-           d="m 65.375,65.880859 c -2.410553,0 -4.371094,1.958588 -4.371094,4.369141 0,2.410553 1.960541,4.371094 4.371094,4.371094 2.410553,0 4.371094,-1.960541 4.371094,-4.371094 0,-2.410553 -1.960541,-4.369141 -4.371094,-4.369141 z m 0,3.251014 c 2.128983,0 1.118243,-1.010856 1.118243,1.118127 0,2.128983 3.742106,1.118127 1.613123,1.118127 -2.128983,0 -3.849609,1.010856 -3.849609,-1.118127 0,-2.128983 -1.01074,-1.118127 1.118243,-1.118127 z"
-           id="path2460-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ssssssssss" />
-        <path
-           style="fill:#415e66;fill-opacity:1;stroke:#415e66;stroke-width:0.49793404;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 67.609568,72.894379 c -1.610001,1.453425 -3.782022,1.686155 -5.231786,0.07209 -1.449763,-1.614071 -1.051683,-3.73781 0.558318,-5.191235 1.610001,-1.453425 -0.669764,2.41392 0.78,4.027991 1.449762,1.614067 5.503468,-0.36227 3.893468,1.091154 z"
-           id="path2460-3-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssss" />
-        <g
-           id="g5877"
-           transform="matrix(0.93315845,0,0,0.93315845,4.3697768,4.6956551)">
-          <circle
-             cy="70.250549"
-             cx="65.37516"
-             id="path2460-30-1"
-             style="fill:#cdbc3f;fill-opacity:1;stroke:none;stroke-width:0.49072546;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             r="3.8709648" />
-          <path
-             inkscape:connector-curvature="0"
-             id="circle2363"
-             d="m 62.890073,70.506795 a 3.2297315,3.2297316 0 0 0 -1.342028,0.296422 3.8709646,3.8709647 0 0 0 3.827349,3.318229 3.8709646,3.8709647 0 0 0 0.728884,-0.07227 3.2297315,3.2297316 0 0 0 0.01524,-0.312228 3.2297315,3.2297316 0 0 0 -3.229449,-3.230152 z"
-             style="fill:#b6a84b;fill-opacity:1;stroke:none;stroke-width:0.49072543;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             inkscape:connector-curvature="0"
-             id="circle2371"
-             d="m 69.224761,69.880074 -7.703252,0.0271 a 3.8709646,3.8709647 0 0 0 -0.01524,0.297551 l 7.738256,5.64e-4 a 3.8709646,3.8709647 0 0 0 -0.01976,-0.325217 z"
-             style="fill:#d9c952;fill-opacity:1;stroke:none;stroke-width:0.49072543;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <path
-           inkscape:connector-curvature="0"
-           id="path7757-3-7-8"
-           d="m 62.391046,70.246857 c 0.0084,1.596501 1.282705,2.8718 2.878162,2.879206 1.589116,-0.0053 2.874989,-1.28798 2.872876,-2.879206 -0.0011,-1.587009 -1.285874,-2.867604 -2.872876,-2.871821 -1.593344,0.0062 -2.866539,1.277406 -2.878162,2.871821"
-           style="fill:#666f29;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2704879" />
-        <path
-           style="fill:#405e63;fill-opacity:1;fill-rule:nonzero;stroke:#0f1511;stroke-width:0.20877486;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 62.885971,70.248098 c 0.0065,1.321904 1.061139,2.376476 2.383055,2.383023 1.315353,-0.005 2.379776,-1.066038 2.378133,-2.383023 0,-1.315348 -1.064419,-2.374878 -2.378133,-2.378151 -1.318633,0.0048 -2.373213,1.05785 -2.383055,2.378151"
-           id="path18715-7-8-0"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="rotate(45)"
-           style="fill:#395259;fill-opacity:1;stroke:none;stroke-width:0.20836374;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-           d="m 97.224741,1.7842588 c 0,1.7787814 -1.066034,0.8036297 -1.549788,0.8036297 -0.483753,0 -1.145314,1.23196 -1.145314,-0.8974636 0,-0.163852 0.779249,-0.4399002 1.275941,-0.4399002 0.743027,0 1.419161,0.3698821 1.419161,0.5337341 z"
-           id="path2944"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssss" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path7759-6-7-7"
-           d="m 63.596182,70.248825 c 0.0046,0.927536 0.744565,1.667493 1.67211,1.672086 0.92294,-0.0033 1.66981,-0.747999 1.668657,-1.672086 0,-0.922936 -0.746867,-1.666375 -1.668657,-1.668671 -0.925241,0.0033 -1.665205,0.742261 -1.67211,1.668671"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.29460451" />
-        <path
-           transform="rotate(45)"
-           style="fill:#717761;fill-opacity:1;stroke:none;stroke-width:0.15833059;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-           d="m 96.491704,5.4991469 c 0,0.1245072 -0.297993,0.2254403 -0.665586,0.2254401 -0.367592,0 -0.665585,-0.100933 -0.665585,-0.2254401 0,-0.1245071 0.316559,-0.1326095 0.684151,-0.1326095 0.367593,-2e-7 0.64702,0.0081 0.64702,0.1326095 z"
-           id="path2944-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="sssss" />
-      </g>
-    </g>
     <g
        style="display:inline"
        transform="translate(-198.61954,-368.85321)"
@@ -1405,5 +1343,78 @@
         </g>
       </g>
     </g>
+    <g
+       style="display:inline"
+       id="g3117-4"
+       transform="matrix(0.91529302,0,0,0.91525397,-53.209547,-123.26844)">
+      <path
+         style="opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:1.52033806;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 59.399533,66.374863 h 5.84418 v 7.756496 h -6.115439 c -0.99438,0 -0.994382,-0.01957 -0.994382,-1.118722 v -5.623194 c 2e-6,-0.978483 2e-6,-1.01458 1.265641,-1.01458 z"
+         id="rect4303"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:#759783;fill-opacity:1;stroke:none;stroke-width:0.49072546;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 69.246125,70.250549 a 3.8709648,3.8709648 0 0 1 -3.870965,3.870965 3.8709648,3.8709648 0 0 1 -3.870965,-3.870965 3.8709648,3.8709648 0 0 1 3.870965,-3.870964 3.8709648,3.8709648 0 0 1 3.870965,3.870964 z"
+         id="path2460-30-1-28"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:1.52408981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4309"
+         width="2.3906524"
+         height="5.9417272"
+         x="59.575317"
+         y="67.336708" />
+      <path
+         style="fill:#c6d4cc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2704879"
+         d="m 62.391046,70.246857 c 0.0084,1.596501 1.282705,2.8718 2.878162,2.879206 1.589116,-0.0053 2.874989,-1.28798 2.872876,-2.879206 -0.0011,-1.587009 -1.285874,-2.867604 -2.872876,-2.871821 -1.593344,0.0062 -2.866539,1.277406 -2.878162,2.871821"
+         id="path7757-3-7-8-8"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path18715-7-8-0-15"
+         d="m 62.885971,70.248098 c 0.0065,1.321904 1.061139,2.376476 2.383055,2.383023 1.315353,-0.005 2.379776,-1.066038 2.378133,-2.383023 0,-1.315348 -1.064419,-2.374878 -2.378133,-2.378151 -1.318633,0.0048 -2.373213,1.05785 -2.383055,2.378151"
+         style="fill:#405e63;fill-opacity:1;fill-rule:nonzero;stroke:#0f1511;stroke-width:0.20877486;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="sssss"
+         inkscape:connector-curvature="0"
+         id="path2944-1"
+         d="m 97.224741,1.7842588 c 0,1.7787814 -1.066034,0.8036297 -1.549788,0.8036297 -0.483753,0 -1.145314,1.23196 -1.145314,-0.8974636 0,-0.163852 0.779249,-0.4399002 1.275941,-0.4399002 0.743027,0 1.419161,0.3698821 1.419161,0.5337341 z"
+         style="fill:#395259;fill-opacity:1;stroke:none;stroke-width:0.20836374;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         transform="rotate(45)" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.29460451"
+         d="m 63.596182,70.248825 c 0.0046,0.927536 0.744565,1.667493 1.67211,1.672086 0.92294,-0.0033 1.66981,-0.747999 1.668657,-1.672086 0,-0.922936 -0.746867,-1.666375 -1.668657,-1.668671 -0.925241,0.0033 -1.665205,0.742261 -1.67211,1.668671"
+         id="path7759-6-7-7-5"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="sssss"
+         inkscape:connector-curvature="0"
+         id="path2944-3-9"
+         d="m 96.491704,5.4991469 c 0,0.1245072 -0.297993,0.2254403 -0.665586,0.2254401 -0.367592,0 -0.665585,-0.100933 -0.665585,-0.2254401 0,-0.1245071 0.316559,-0.1326095 0.684151,-0.1326095 0.367593,-2e-7 0.64702,0.0081 0.64702,0.1326095 z"
+         style="fill:#5b7a7e;fill-opacity:1;stroke:none;stroke-width:0.15833059;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         transform="rotate(45)" />
+      <g
+         aria-label="ext"
+         transform="matrix(0,-1.0000214,0.99997861,0,0,0)"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.69803977px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';opacity:1;fill:#cdbc3f;fill-opacity:1;stroke:none;stroke-width:1.60061443;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="text4307">
+        <path
+           d="m -71.219974,61.000945 h -1.107935 q 0.04216,0.105393 0.148866,0.169945 0.108027,0.06455 0.291146,0.06455 0.150184,0 0.399173,-0.06455 0.102757,-0.02635 0.142279,-0.02635 0.05401,0 0.0909,0.0382 0.03689,0.0382 0.03689,0.09617 0,0.0527 -0.03952,0.08958 -0.0527,0.04874 -0.256893,0.09353 -0.204197,0.04347 -0.392586,0.04347 -0.324081,0 -0.519056,-0.183119 -0.193659,-0.183118 -0.193659,-0.450551 0,-0.284559 0.209467,-0.462408 0.210785,-0.179167 0.484804,-0.179167 0.164676,0 0.301685,0.05797 0.138328,0.05796 0.205515,0.125153 0.09485,0.09749 0.156771,0.241085 0.04216,0.100122 0.04216,0.231862 z m -0.29905,-0.270067 q -0.06192,-0.115932 -0.162041,-0.17258 -0.100122,-0.05797 -0.23845,-0.05797 -0.137009,0 -0.237132,0.05797 -0.100123,0.05665 -0.163358,0.17258 z"
+           style="fill:#cdbc3f;fill-opacity:1;stroke-width:1.60061443"
+           id="path4312"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -70.077786,60.840222 0.409712,0.351747 q 0.07377,0.004 0.110662,0.04216 0.03689,0.03689 0.03689,0.09353 0,0.05928 -0.04216,0.09749 -0.04084,0.03689 -0.138327,0.03689 h -0.306955 q -0.09749,0 -0.139645,-0.03689 -0.04084,-0.0382 -0.04084,-0.100123 0,-0.04743 0.02898,-0.083 0.0303,-0.03689 0.08168,-0.05006 l -0.201563,-0.173897 -0.205515,0.173897 q 0.06192,0.01581 0.08827,0.04874 0.02767,0.03294 0.02767,0.08431 0,0.06192 -0.04084,0.100123 -0.04084,0.03689 -0.138327,0.03689 h -0.30432 q -0.09749,0 -0.139644,-0.03689 -0.04084,-0.0382 -0.04084,-0.0988 0,-0.05533 0.03689,-0.09222 0.03689,-0.03821 0.110662,-0.04216 l 0.40049,-0.353064 -0.354381,-0.303003 q -0.06982,-0.0053 -0.106709,-0.04216 -0.03557,-0.0382 -0.03557,-0.09353 0,-0.05928 0.04084,-0.09617 0.04216,-0.0382 0.139645,-0.0382 h 0.252941 q 0.09749,0 0.138327,0.0382 0.04216,0.03689 0.04216,0.09485 0,0.07773 -0.07377,0.12647 l 0.163358,0.135693 0.160723,-0.138328 q -0.07246,-0.05138 -0.07246,-0.118566 0,-0.06323 0.04084,-0.100122 0.04216,-0.0382 0.139645,-0.0382 h 0.250306 q 0.09749,0 0.138327,0.0382 0.04216,0.03689 0.04216,0.09749 0,0.05401 -0.03689,0.09222 -0.03557,0.03689 -0.10671,0.04216 z"
+           style="fill:#cdbc3f;fill-opacity:1;stroke-width:1.60061443"
+           id="path4314"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -68.728766,60.535902 v 0.541453 q 0,0.08695 0.03557,0.114614 0.05533,0.04347 0.197611,0.04347 0.206832,0 0.382046,-0.08827 0.06719,-0.03425 0.105393,-0.03425 0.0527,0 0.0909,0.03952 0.03952,0.03952 0.03952,0.09617 0,0.0527 -0.04216,0.0909 -0.06455,0.06192 -0.255576,0.114614 -0.189706,0.05138 -0.320129,0.05138 -0.251624,0 -0.378095,-0.108027 -0.125153,-0.109344 -0.125153,-0.267432 v -0.594149 h -0.09749 q -0.09749,0 -0.139644,-0.03689 -0.04084,-0.0382 -0.04084,-0.0988 0,-0.05928 0.04084,-0.09617 0.04216,-0.0382 0.139644,-0.0382 h 0.09749 v -0.24372 q 0,-0.09749 0.03689,-0.138327 0.0382,-0.04216 0.09881,-0.04216 0.05928,0 0.09617,0.04216 0.03821,0.04084 0.03821,0.138327 v 0.24372 h 0.499295 q 0.09749,0 0.138327,0.0382 0.04216,0.03689 0.04216,0.09749 0,0.05928 -0.04216,0.09749 -0.04084,0.03689 -0.138327,0.03689 z"
+           style="fill:#cdbc3f;fill-opacity:1;stroke-width:1.60061443"
+           id="path4316"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/res/CM-8.svg b/res/CM-8.svg
index 0d43048..4685ddf 100644
--- a/res/CM-8.svg
+++ b/res/CM-8.svg
@@ -65,8 +65,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.4535161"
-     inkscape:cx="16.169347"
-     inkscape:cy="239.48326"
+     inkscape:cx="-156.08527"
+     inkscape:cy="246.94076"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -75,8 +75,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      units="px"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -91,8 +91,8 @@
      inkscape:snap-intersection-paths="false"
      inkscape:snap-smooth-nodes="false"
      inkscape:snap-midpoints="false"
-     inkscape:snap-object-midpoints="false"
-     inkscape:snap-center="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
      inkscape:snap-others="true"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -289,6 +289,31 @@
        d="m 14.458984,8.8925777 a 0.19275636,0.19275636 0 0 0 -0.189453,0.1953128 v 2.9902335 a 0.19275636,0.19275636 0 1 0 0.384766,0 V 9.0878905 A 0.19275636,0.19275636 0 0 0 14.458984,8.8925777 Z"
        id="path7473"
        inkscape:connector-curvature="0" />
+    <g
+       transform="translate(8.1857745e-8,-9.6053482e-6)"
+       style="display:inline"
+       id="g1289">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1218"
+         d="m 5.7388915,-17.445222 4.5697015,-4.569701"
+         style="fill:#759783;fill-opacity:1;stroke:#c63434;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="fill:#759783;fill-opacity:1;stroke:#c63434;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 5.7388915,-26.584624 4.5697015,4.569701"
+         id="path1220"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#759783;fill-opacity:1;stroke:#c63434;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 19.572539,-17.445222 -4.569702,-4.569701"
+         id="path1222"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1224"
+         d="m 19.572539,-26.584624 -4.569702,4.569701"
+         style="fill:#759783;fill-opacity:1;stroke:#c63434;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#c06969;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.38547418;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 13.158203,-28.420123 a 0.19275636,0.19275636 0 0 0 -0.179687,0.125 l -1.06836,2.843749 h -1.248047 a 0.19275636,0.19275636 0 1 0 0,0.384765 h 1.38086 a 0.19275636,0.19275636 0 0 0 0.179687,-0.125 l 1.06836,-2.841797 h 1.205078 a 0.193359,0.193359 0 1 0 0,-0.386717 z"
@@ -2084,6 +2109,40 @@
        d="m 1.8625109,-64.153139 c 0.00454,0.939239 0.7539982,1.688538 1.6932916,1.69319 0.9346302,-0.0033 1.6909609,-0.757441 1.6897933,-1.69319 0,-0.934596 -0.756328,-1.68741 -1.6897933,-1.689737 -0.9369608,0.0033 -1.6862974,0.751627 -1.6932916,1.689737"
        id="path9298-8"
        inkscape:connector-curvature="0" />
+    <g
+       id="g1283">
+      <path
+         style="fill:#0f1511;fill-opacity:1;stroke:#c63434;stroke-width:0.33263156;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 15.099855,-20.227551 c -1.526336,0 -3.052672,0 -4.579008,0 l -1.7975447,-1.797544 1.7975447,-1.797544 c 1.526336,0 3.052672,0 4.579008,0 l 1.797545,1.797544 z"
+         id="path1211"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <g
+         id="text1248"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.58605623px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:0.21550468"
+         aria-label="norm">
+        <path
+           id="path1268"
+           style="fill:#759783;fill-opacity:1;stroke-width:0.21550468"
+           d="m 10.15737,-22.601527 v 0.08713 q 0.07071,-0.06061 0.155315,-0.09092 0.08587,-0.03031 0.18562,-0.03031 0.229816,0 0.363665,0.142688 0.106068,0.113645 0.106068,0.298002 v 0.481098 q 0.08208,0 0.121222,0.03662 0.03914,0.03536 0.03914,0.09344 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 10.7218 q -0.09344,0 -0.133848,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.03914,-0.03662 0.121221,-0.03662 v -0.488674 q 0,-0.0846 -0.04546,-0.123747 -0.05935,-0.05051 -0.178044,-0.05051 -0.08965,0 -0.15784,0.03536 -0.06692,0.03409 -0.170468,0.146476 v 0.481098 q 0.09976,0 0.128798,0.01894 0.06187,0.03788 0.06187,0.111119 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 9.880834 q -0.093442,0 -0.1338486,-0.03536 -0.039144,-0.03662 -0.039144,-0.0947 0,-0.07071 0.060611,-0.109856 0.030305,-0.01894 0.1300605,-0.01894 v -0.628836 q -0.082077,0 -0.1212214,-0.03662 -0.039144,-0.03662 -0.039144,-0.09344 0,-0.05682 0.039144,-0.09218 0.040407,-0.03662 0.1338486,-0.03662 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1270"
+           style="fill:#759783;fill-opacity:1;stroke-width:0.21550468"
+           d="m 12.642409,-22.006785 q 0,0.149001 -0.08334,0.289164 -0.08208,0.138899 -0.246231,0.222239 -0.162891,0.08208 -0.340935,0.08208 -0.176781,0 -0.33841,-0.08081 -0.161628,-0.08208 -0.246231,-0.222239 -0.0846,-0.140162 -0.0846,-0.292951 0,-0.155315 0.08587,-0.304317 0.08587,-0.150264 0.246231,-0.236129 0.161628,-0.08587 0.337147,-0.08587 0.176781,0 0.339672,0.08839 0.164154,0.08713 0.247494,0.236129 0.08334,0.147738 0.08334,0.304316 z m -0.258858,0.0013 q 0,-0.12501 -0.08965,-0.229816 -0.122484,-0.141425 -0.321994,-0.141425 -0.175519,0 -0.292952,0.112383 -0.117433,0.112382 -0.117433,0.26012 0,0.121222 0.118696,0.227291 0.118696,0.104806 0.291689,0.104806 0.174256,0 0.292952,-0.104806 0.118696,-0.106069 0.118696,-0.228553 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1272"
+           style="fill:#759783;fill-opacity:1;stroke-width:0.21550468"
+           d="m 13.356967,-22.601527 v 0.161628 q 0.162891,-0.117433 0.256332,-0.156578 0.09471,-0.03914 0.176782,-0.03914 0.126272,0 0.244968,0.09344 0.08081,0.06314 0.08081,0.128797 0,0.05556 -0.03914,0.0947 -0.03788,0.03788 -0.09218,0.03788 -0.04798,0 -0.101018,-0.04798 -0.05303,-0.04798 -0.0947,-0.04798 -0.0543,0 -0.162891,0.06819 -0.107332,0.06819 -0.26896,0.204561 v 0.390182 h 0.368715 q 0.09344,0 0.132586,0.03662 0.04041,0.03536 0.04041,0.09344 0,0.05682 -0.04041,0.09344 -0.03915,0.03536 -0.132586,0.03536 h -0.781626 q -0.09344,0 -0.133848,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.04041,-0.03662 0.133848,-0.03662 h 0.154053 v -0.628836 h -0.09344 q -0.09344,0 -0.133849,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.04041,-0.03662 0.133849,-0.03662 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1274"
+           style="fill:#759783;fill-opacity:1;stroke-width:0.21550468"
+           d="m 14.671604,-22.601527 v 0.07324 q 0.06314,-0.06187 0.113645,-0.0846 0.05177,-0.02399 0.118696,-0.02399 0.05682,0 0.112383,0.02778 0.05556,0.02778 0.108594,0.08334 0.06692,-0.05556 0.135111,-0.08208 0.06945,-0.02778 0.141425,-0.02778 0.14395,0 0.233604,0.07703 0.118696,0.101018 0.118696,0.265172 v 0.57959 q 0.08081,0 0.119958,0.03662 0.03914,0.03662 0.03914,0.09344 0,0.05682 -0.03914,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 15.4949 v -0.816982 q 0,-0.05935 -0.02147,-0.08208 -0.02147,-0.02273 -0.06566,-0.02273 -0.04293,0 -0.07955,0.02273 -0.04672,0.03157 -0.113645,0.118696 v 0.521505 q 0.08081,0 0.119959,0.03662 0.03914,0.03662 0.03914,0.09344 0,0.05682 -0.03914,0.09344 -0.03914,0.03536 -0.132586,0.03536 h -0.246231 v -0.816982 q 0,-0.05808 -0.02273,-0.08081 -0.02147,-0.02399 -0.06566,-0.02399 -0.04546,0 -0.08965,0.02904 -0.0442,0.02778 -0.106069,0.112382 v 0.521505 q 0.08081,0 0.119959,0.03662 0.04041,0.03662 0.04041,0.09344 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 h -0.233604 q -0.09344,0 -0.132586,-0.03536 -0.04041,-0.03662 -0.04041,-0.0947 0,-0.05682 0.03914,-0.09218 0.03914,-0.03662 0.121221,-0.03662 v -0.628836 q -0.08208,0 -0.121221,-0.03662 -0.03914,-0.03662 -0.03914,-0.09344 0,-0.05682 0.04041,-0.09218 0.03914,-0.03662 0.132586,-0.03662 z"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/res/CM-9.svg b/res/CM-9.svg
index bdf81b8..3cbb10b 100644
--- a/res/CM-9.svg
+++ b/res/CM-9.svg
@@ -64,9 +64,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.6740563"
-     inkscape:cx="-53.229333"
-     inkscape:cy="335.22394"
+     inkscape:zoom="5.3481127"
+     inkscape:cx="43.768125"
+     inkscape:cy="52.518523"
      inkscape:document-units="mm"
      inkscape:current-layer="layer6"
      showgrid="false"
@@ -264,7 +264,7 @@
          sodipodi:nodetypes="cccc"
          inkscape:connector-curvature="0"
          id="path1076"
-         d="m 20.370621,-82.117541 h 4.217431 v -10.075756 l -12.644724,0"
+         d="m 20.370621,-82.117541 h 4.217431 V -92.193297 H 11.943328"
          style="display:inline;opacity:1;fill:none;stroke:#c63434;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <path
@@ -554,6 +554,68 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="ccccc" />
     </g>
+    <path
+       style="fill:none;fill-opacity:1;stroke-width:1;stroke:#c63434;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 21.614938,10.97982 2.9271,-2.9270987 v -4.567211 l -5.099671,-5.0996717 0.144764,-0.015108"
+       id="path4598"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="translate(10.184087,9.4099544)"
+       style="display:inline"
+       id="g4552">
+      <circle
+         style="display:inline;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.43102831;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle1347-7"
+         cx="11.430851"
+         cy="1.5698656"
+         r="3.4000587" />
+      <circle
+         style="display:inline;fill:#415e66;fill-opacity:1;stroke-width:0.28058663"
+         id="path3732"
+         cx="11.430851"
+         cy="-1.5698656"
+         r="2.8855541"
+         transform="scale(1,-1)" />
+      <circle
+         style="opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:1.8598721;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:37.79527664;stroke-opacity:1;paint-order:stroke markers fill"
+         id="circle2002-6"
+         cx="11.430851"
+         cy="-0.16698548"
+         r="1.0583327" />
+      <circle
+         r="1.0583327"
+         cy="1.5698656"
+         cx="13.167703"
+         id="circle4433"
+         style="opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:1.8598721;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:37.79527664;stroke-opacity:1;paint-order:stroke markers fill" />
+      <circle
+         style="opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:1.8598721;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:37.79527664;stroke-opacity:1;paint-order:stroke markers fill"
+         id="circle4435"
+         cx="11.430851"
+         cy="3.3067164"
+         r="1.0583327" />
+      <circle
+         r="1.0583327"
+         cy="1.5698656"
+         cx="9.6939993"
+         id="circle4437"
+         style="opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:1.8598721;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:37.79527664;stroke-opacity:1;paint-order:stroke markers fill" />
+      <g
+         aria-label="OP"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.17499995px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#c06969;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         id="text8431-6-4">
+        <path
+           inkscape:connector-curvature="0"
+           d="m 11.375815,-3.412783 q 0,0.42323 -0.269751,0.7053833 -0.2682,0.280603 -0.621667,0.280603 -0.31781,0 -0.5736085,-0.2340942 -0.3162597,-0.2899048 -0.3162597,-0.7518921 0,-0.4619873 0.3162597,-0.7534424 0.2557985,-0.2340942 0.5736085,-0.2340942 0.353467,0 0.621667,0.2821533 0.269751,0.280603 0.269751,0.7053833 z m -0.31781,0 q 0,-0.2899048 -0.175183,-0.4790405 -0.175183,-0.190686 -0.398425,-0.190686 -0.221692,0 -0.396875,0.190686 -0.1751832,0.190686 -0.1751832,0.4790405 0,0.2883545 0.1751832,0.4790405 0.175183,0.1891358 0.396875,0.1891358 0.223242,0 0.398425,-0.1891358 0.175183,-0.1891357 0.175183,-0.4790405 z"
+           style="fill:#c06969;fill-opacity:1;stroke-width:0.26458332"
+           id="path4604" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 12.203672,-3.1182273 v 0.3271118 h 0.32091 q 0.114722,0 0.162781,0.044958 0.04961,0.043408 0.04961,0.1147217 0,0.069763 -0.04961,0.1147216 -0.04806,0.043408 -0.162781,0.043408 h -0.68833 q -0.114721,0 -0.164331,-0.043408 -0.04806,-0.044958 -0.04806,-0.1162719 0,-0.069763 0.04961,-0.1131714 0.04961,-0.044958 0.16278,-0.044958 h 0.04961 v -1.243335 h -0.04961 q -0.114721,0 -0.164331,-0.043408 -0.04806,-0.044958 -0.04806,-0.1162719 0,-0.071313 0.04806,-0.1147217 0.04961,-0.044958 0.164331,-0.044958 l 0.731739,0.00155 q 0.322461,0 0.510046,0.1767334 0.189136,0.1751831 0.189136,0.4278808 0,0.1395264 -0.06356,0.2635498 -0.04806,0.093018 -0.161231,0.1844849 -0.111621,0.089917 -0.229443,0.1364258 -0.116272,0.044958 -0.308508,0.044958 z m 0,-0.3178101 h 0.294555 q 0.20774,0 0.328663,-0.093018 0.122473,-0.094568 0.122473,-0.2263427 0,-0.1116211 -0.09922,-0.1953369 -0.09767,-0.083716 -0.280603,-0.083716 h -0.365869 z"
+           style="fill:#c06969;fill-opacity:1;stroke-width:0.26458332"
+           id="path4606" />
+      </g>
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -1751,8 +1813,7 @@
      id="layer2"
      inkscape:label="text"
      transform="translate(0,105.66933)"
-     style="display:none"
-     sodipodi:insensitive="true">
+     style="display:none">
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:3.17499995px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#c06969;fill-opacity:1;stroke:none;stroke-width:0.26458332"
diff --git a/res/CM-TS_smallh_0.svg b/res/CM-TS_smallh_0.svg
new file mode 100644
index 0000000..0e48714
--- /dev/null
+++ b/res/CM-TS_smallh_0.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="8mm"
+   height="5mm"
+   viewBox="0 0 8.0000002 5.0000002"
+   version="1.1"
+   id="svg10322"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="CM-TS_smallh_0.svg">
+  <defs
+     id="defs10316" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.641671"
+     inkscape:cx="13.953397"
+     inkscape:cy="14.74258"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g1719"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1600"
+     inkscape:window-height="877"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     units="mm"
+     showguides="true"
+     inkscape:snap-global="true" />
+  <metadata
+     id="metadata10319">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-242.62414,-265.83578)"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline;fill:#759783;fill-opacity:1"
+       id="g3117-1"
+       transform="matrix(0,0.91466439,-0.91466439,0,310.32434,209.45955)">
+      <rect
+         style="display:inline;opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:2.23590446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal;enable-background:new"
+         id="rect4901"
+         width="5.1509099"
+         height="8.7242451"
+         x="61.793766"
+         y="65.281128" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(-242.62414,-265.83578)"
+     style="display:inline">
+    <g
+       id="g1719"
+       transform="rotate(90,245.12415,268.3358)">
+      <rect
+         y="263.0556"
+         x="242.9726"
+         height="7.5604095"
+         width="4.303081"
+         id="rect6127"
+         style="opacity:1;fill:#7cac90;fill-opacity:1;stroke:none;stroke-width:1.7674545;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+      <path
+         style="opacity:1;fill:#223a2c;fill-opacity:1;stroke:none;stroke-width:1.60829568;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         d="m 243.21904,263.30084 h 3.8102 v 7.06989 h -3.8102 z"
+         id="rect6127-9"
+         inkscape:connector-curvature="0" />
+      <rect
+         transform="scale(1,-1)"
+         y="-270.38562"
+         x="243.21904"
+         height="3.6559265"
+         width="3.8101971"
+         id="rect6165-7"
+         style="opacity:1;fill:#18281e;fill-opacity:1;stroke:none;stroke-width:1.8890146;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+      <g
+         transform="matrix(0.90197287,0,0,0.90197287,22.639406,19.758689)"
+         id="g6420">
+        <path
+           inkscape:connector-curvature="0"
+           id="rect6165"
+           d="m 245.12461,274.24705 h 3.00095 v 2.7438 h -3.00095 z"
+           style="opacity:1;fill:#759783;fill-opacity:1;stroke:#759783;stroke-width:0.90034294;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
+        <g
+           transform="translate(0,0.04835685)"
+           style="fill:#5e7d6b;fill-opacity:1"
+           id="g6429">
+          <rect
+             y="274.13165"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363776;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="274.68906"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="275.24646"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-9"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="275.80386"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-5"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="276.36124"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-9-6"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="276.91864"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-5-3"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363785;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+        </g>
+        <g
+           transform="translate(0,-0.06769958)"
+           id="g6429-5">
+          <rect
+             y="274.13165"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-46"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363776;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="274.68906"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-3"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="275.24646"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-9-7"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="275.80386"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-5-9"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="276.36124"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-9-6-1"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="276.91864"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-5-3-8"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363785;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+        </g>
+      </g>
+      <rect
+         y="266.95694"
+         x="246.74977"
+         height="3.4137993"
+         width="0.27947113"
+         id="rect6165-7-4"
+         style="opacity:1;fill:#18281e;fill-opacity:1;stroke:none;stroke-width:0.4943698;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    </g>
+  </g>
+</svg>
diff --git a/res/CM-TS_smallh_1.svg b/res/CM-TS_smallh_1.svg
new file mode 100644
index 0000000..f035b33
--- /dev/null
+++ b/res/CM-TS_smallh_1.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="8mm"
+   height="5mm"
+   viewBox="0 0 8.0000002 5.0000002"
+   version="1.1"
+   id="svg10322"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="CM-TS_smallh_1.svg">
+  <defs
+     id="defs10316" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.641671"
+     inkscape:cx="11.314744"
+     inkscape:cy="14.859742"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g1719"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1600"
+     inkscape:window-height="877"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     units="mm"
+     showguides="true"
+     inkscape:snap-global="true" />
+  <metadata
+     id="metadata10319">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-242.62414,-265.83578)"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline;fill:#759783;fill-opacity:1"
+       id="g3117-1"
+       transform="matrix(0,0.91466439,-0.91466439,0,310.32434,209.45955)">
+      <rect
+         style="display:inline;opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:2.23590446;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal;enable-background:new"
+         id="rect4901"
+         width="5.1509099"
+         height="8.7242451"
+         x="61.793766"
+         y="65.281128" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     transform="translate(-242.62414,-265.83578)"
+     style="display:inline">
+    <g
+       id="g1719"
+       transform="rotate(90,245.12415,268.3358)">
+      <rect
+         y="263.0556"
+         x="242.9726"
+         height="7.5604095"
+         width="4.303081"
+         id="rect6127"
+         style="opacity:1;fill:#7cac90;fill-opacity:1;stroke:none;stroke-width:1.7674545;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+      <path
+         style="opacity:1;fill:#223a2c;fill-opacity:1;stroke:none;stroke-width:1.60829568;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         d="m 243.21904,263.30084 h 3.8102 v 7.06989 h -3.8102 z"
+         id="rect6127-9"
+         inkscape:connector-curvature="0" />
+      <rect
+         transform="scale(1,-1)"
+         y="-266.95694"
+         x="243.21904"
+         height="3.6559265"
+         width="3.8101971"
+         id="rect6165-7"
+         style="opacity:1;fill:#18281e;fill-opacity:1;stroke:none;stroke-width:1.8890146;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+      <g
+         transform="matrix(0.90197287,0,0,0.90197287,22.639406,16.465289)"
+         id="g6420">
+        <path
+           inkscape:connector-curvature="0"
+           id="rect6165"
+           d="m 245.12461,274.24705 h 3.00095 v 2.7438 h -3.00095 z"
+           style="opacity:1;fill:#759783;fill-opacity:1;stroke:#759783;stroke-width:0.90034294;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
+        <g
+           transform="translate(0,0.04835685)"
+           style="fill:#5e7d6b;fill-opacity:1"
+           id="g6429">
+          <rect
+             y="274.13165"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363776;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="274.68906"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="275.24646"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-9"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="275.80386"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-5"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="276.36124"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-9-6"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="276.91864"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-5-3"
+             style="opacity:1;fill:#5e7d6b;fill-opacity:1;stroke:none;stroke-width:0.47363785;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+        </g>
+        <g
+           transform="translate(0,-0.06769958)"
+           id="g6429-5">
+          <rect
+             y="274.13165"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-46"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363776;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="274.68906"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-3"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="275.24646"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-9-7"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363779;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="275.80386"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-5-9"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="276.36124"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-9-6-1"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+          <rect
+             y="276.91864"
+             x="244.78337"
+             height="0.23774259"
+             width="3.6834934"
+             id="rect6165-0-4-5-3-8"
+             style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:0.47363785;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+        </g>
+      </g>
+      <rect
+         y="266.95694"
+         x="246.74977"
+         height="3.4137993"
+         width="0.27947113"
+         id="rect6165-7-4"
+         style="opacity:1;fill:#18281e;fill-opacity:1;stroke:none;stroke-width:0.4943698;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    </g>
+  </g>
+</svg>
diff --git a/res/CM-input_ext.svg b/res/CM-input_ext.svg
new file mode 100644
index 0000000..751601f
--- /dev/null
+++ b/res/CM-input_ext.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="51"
+   height="27"
+   viewBox="0 0 13.49375 7.1437503"
+   version="1.1"
+   id="svg9135"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="CM-input_ext.svg">
+  <defs
+     id="defs9129" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.776675"
+     inkscape:cx="31.218888"
+     inkscape:cy="6.8605789"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1600"
+     inkscape:window-height="877"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     units="px"
+     objecttolerance="16"
+     guidetolerance="16"
+     inkscape:snap-perpendicular="true"
+     inkscape:snap-tangential="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-page="true" />
+  <metadata
+     id="metadata9132">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-75.481957,-52.114201)">
+    <g
+       style="display:inline"
+       id="g3117-4"
+       transform="matrix(0.91529302,0,0,0.91525397,22.272411,-8.6356559)">
+      <path
+         style="opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:1.52033806;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 59.399533,66.374863 h 5.84418 v 7.756496 h -6.115439 c -0.99438,0 -0.994382,-0.01957 -0.994382,-1.118722 v -5.623194 c 2e-6,-0.978483 2e-6,-1.01458 1.265641,-1.01458 z"
+         id="rect4303"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:#759783;fill-opacity:1;stroke:none;stroke-width:0.49072546;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 69.246125,70.250549 a 3.8709648,3.8709648 0 0 1 -3.870965,3.870965 3.8709648,3.8709648 0 0 1 -3.870965,-3.870965 3.8709648,3.8709648 0 0 1 3.870965,-3.870964 3.8709648,3.8709648 0 0 1 3.870965,3.870964 z"
+         id="path2460-30-1-28"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="opacity:1;fill:#c63434;fill-opacity:1;stroke:none;stroke-width:1.52408981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4309"
+         width="2.3906524"
+         height="5.9417272"
+         x="59.575317"
+         y="67.336708" />
+      <path
+         style="fill:#c6d4cc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.2704879"
+         d="m 62.391046,70.246857 c 0.0084,1.596501 1.282705,2.8718 2.878162,2.879206 1.589116,-0.0053 2.874989,-1.28798 2.872876,-2.879206 -0.0011,-1.587009 -1.285874,-2.867604 -2.872876,-2.871821 -1.593344,0.0062 -2.866539,1.277406 -2.878162,2.871821"
+         id="path7757-3-7-8-8"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path18715-7-8-0-15"
+         d="m 62.885971,70.248098 c 0.0065,1.321904 1.061139,2.376476 2.383055,2.383023 1.315353,-0.005 2.379776,-1.066038 2.378133,-2.383023 0,-1.315348 -1.064419,-2.374878 -2.378133,-2.378151 -1.318633,0.0048 -2.373213,1.05785 -2.383055,2.378151"
+         style="fill:#405e63;fill-opacity:1;fill-rule:nonzero;stroke:#0f1511;stroke-width:0.20877486;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="sssss"
+         inkscape:connector-curvature="0"
+         id="path2944-1"
+         d="m 97.224741,1.7842588 c 0,1.7787814 -1.066034,0.8036297 -1.549788,0.8036297 -0.483753,0 -1.145314,1.23196 -1.145314,-0.8974636 0,-0.163852 0.779249,-0.4399002 1.275941,-0.4399002 0.743027,0 1.419161,0.3698821 1.419161,0.5337341 z"
+         style="fill:#395259;fill-opacity:1;stroke:none;stroke-width:0.20836374;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         transform="rotate(45)" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.29460451"
+         d="m 63.596182,70.248825 c 0.0046,0.927536 0.744565,1.667493 1.67211,1.672086 0.92294,-0.0033 1.66981,-0.747999 1.668657,-1.672086 0,-0.922936 -0.746867,-1.666375 -1.668657,-1.668671 -0.925241,0.0033 -1.665205,0.742261 -1.67211,1.668671"
+         id="path7759-6-7-7-5"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="sssss"
+         inkscape:connector-curvature="0"
+         id="path2944-3-9"
+         d="m 96.491704,5.4991469 c 0,0.1245072 -0.297993,0.2254403 -0.665586,0.2254401 -0.367592,0 -0.665585,-0.100933 -0.665585,-0.2254401 0,-0.1245071 0.316559,-0.1326095 0.684151,-0.1326095 0.367593,-2e-7 0.64702,0.0081 0.64702,0.1326095 z"
+         style="fill:#5b7a7e;fill-opacity:1;stroke:none;stroke-width:0.15833059;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         transform="rotate(45)" />
+      <g
+         aria-label="ext"
+         transform="matrix(0,-1.0000214,0.99997861,0,0,0)"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.69803977px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';opacity:1;fill:#cdbc3f;fill-opacity:1;stroke:none;stroke-width:1.60061443;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="text4307">
+        <path
+           d="m -71.219974,61.000945 h -1.107935 q 0.04216,0.105393 0.148866,0.169945 0.108027,0.06455 0.291146,0.06455 0.150184,0 0.399173,-0.06455 0.102757,-0.02635 0.142279,-0.02635 0.05401,0 0.0909,0.0382 0.03689,0.0382 0.03689,0.09617 0,0.0527 -0.03952,0.08958 -0.0527,0.04874 -0.256893,0.09353 -0.204197,0.04347 -0.392586,0.04347 -0.324081,0 -0.519056,-0.183119 -0.193659,-0.183118 -0.193659,-0.450551 0,-0.284559 0.209467,-0.462408 0.210785,-0.179167 0.484804,-0.179167 0.164676,0 0.301685,0.05797 0.138328,0.05796 0.205515,0.125153 0.09485,0.09749 0.156771,0.241085 0.04216,0.100122 0.04216,0.231862 z m -0.29905,-0.270067 q -0.06192,-0.115932 -0.162041,-0.17258 -0.100122,-0.05797 -0.23845,-0.05797 -0.137009,0 -0.237132,0.05797 -0.100123,0.05665 -0.163358,0.17258 z"
+           style="fill:#cdbc3f;fill-opacity:1;stroke-width:1.60061443"
+           id="path4312"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -70.077786,60.840222 0.409712,0.351747 q 0.07377,0.004 0.110662,0.04216 0.03689,0.03689 0.03689,0.09353 0,0.05928 -0.04216,0.09749 -0.04084,0.03689 -0.138327,0.03689 h -0.306955 q -0.09749,0 -0.139645,-0.03689 -0.04084,-0.0382 -0.04084,-0.100123 0,-0.04743 0.02898,-0.083 0.0303,-0.03689 0.08168,-0.05006 l -0.201563,-0.173897 -0.205515,0.173897 q 0.06192,0.01581 0.08827,0.04874 0.02767,0.03294 0.02767,0.08431 0,0.06192 -0.04084,0.100123 -0.04084,0.03689 -0.138327,0.03689 h -0.30432 q -0.09749,0 -0.139644,-0.03689 -0.04084,-0.0382 -0.04084,-0.0988 0,-0.05533 0.03689,-0.09222 0.03689,-0.03821 0.110662,-0.04216 l 0.40049,-0.353064 -0.354381,-0.303003 q -0.06982,-0.0053 -0.106709,-0.04216 -0.03557,-0.0382 -0.03557,-0.09353 0,-0.05928 0.04084,-0.09617 0.04216,-0.0382 0.139645,-0.0382 h 0.252941 q 0.09749,0 0.138327,0.0382 0.04216,0.03689 0.04216,0.09485 0,0.07773 -0.07377,0.12647 l 0.163358,0.135693 0.160723,-0.138328 q -0.07246,-0.05138 -0.07246,-0.118566 0,-0.06323 0.04084,-0.100122 0.04216,-0.0382 0.139645,-0.0382 h 0.250306 q 0.09749,0 0.138327,0.0382 0.04216,0.03689 0.04216,0.09749 0,0.05401 -0.03689,0.09222 -0.03557,0.03689 -0.10671,0.04216 z"
+           style="fill:#cdbc3f;fill-opacity:1;stroke-width:1.60061443"
+           id="path4314"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -68.728766,60.535902 v 0.541453 q 0,0.08695 0.03557,0.114614 0.05533,0.04347 0.197611,0.04347 0.206832,0 0.382046,-0.08827 0.06719,-0.03425 0.105393,-0.03425 0.0527,0 0.0909,0.03952 0.03952,0.03952 0.03952,0.09617 0,0.0527 -0.04216,0.0909 -0.06455,0.06192 -0.255576,0.114614 -0.189706,0.05138 -0.320129,0.05138 -0.251624,0 -0.378095,-0.108027 -0.125153,-0.109344 -0.125153,-0.267432 v -0.594149 h -0.09749 q -0.09749,0 -0.139644,-0.03689 -0.04084,-0.0382 -0.04084,-0.0988 0,-0.05928 0.04084,-0.09617 0.04216,-0.0382 0.139644,-0.0382 h 0.09749 v -0.24372 q 0,-0.09749 0.03689,-0.138327 0.0382,-0.04216 0.09881,-0.04216 0.05928,0 0.09617,0.04216 0.03821,0.04084 0.03821,0.138327 v 0.24372 h 0.499295 q 0.09749,0 0.138327,0.0382 0.04216,0.03689 0.04216,0.09749 0,0.05928 -0.04216,0.09749 -0.04084,0.03689 -0.138327,0.03689 z"
+           style="fill:#cdbc3f;fill-opacity:1;stroke-width:1.60061443"
+           id="path4316"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/res/CM8_normoff.svg b/res/CM8_normoff.svg
new file mode 100644
index 0000000..9bcbd4d
--- /dev/null
+++ b/res/CM8_normoff.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="8.6445103mm"
+   height="3.9277196mm"
+   viewBox="0 0 8.6445103 3.9277196"
+   version="1.1"
+   id="svg9135"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="CM8_normoff.svg">
+  <defs
+     id="defs9129" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.710352"
+     inkscape:cx="-4.530684"
+     inkscape:cy="1.886097"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     units="px"
+     objecttolerance="16"
+     guidetolerance="16"
+     inkscape:snap-perpendicular="true"
+     inkscape:snap-tangential="true" />
+  <metadata
+     id="metadata9132">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-74.922591,-53.717701)">
+    <g
+       transform="translate(66.434495,77.706656)"
+       style="display:inline"
+       id="g1283">
+      <path
+         style="fill:#0f1511;fill-opacity:1;stroke:#c63434;stroke-width:0.33263156;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 15.099855,-20.227551 c -1.526336,0 -3.052672,0 -4.579008,0 l -1.7975447,-1.797544 1.7975447,-1.797544 c 1.526336,0 3.052672,0 4.579008,0 l 1.797545,1.797544 z"
+         id="path1211"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <g
+         id="text1248"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.58605623px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#759783;fill-opacity:1;stroke:none;stroke-width:0.21550468"
+         aria-label="norm">
+        <path
+           id="path1268"
+           style="fill:#759783;fill-opacity:1;stroke-width:0.21550468"
+           d="m 10.15737,-22.601527 v 0.08713 q 0.07071,-0.06061 0.155315,-0.09092 0.08587,-0.03031 0.18562,-0.03031 0.229816,0 0.363665,0.142688 0.106068,0.113645 0.106068,0.298002 v 0.481098 q 0.08208,0 0.121222,0.03662 0.03914,0.03536 0.03914,0.09344 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 10.7218 q -0.09344,0 -0.133848,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.03914,-0.03662 0.121221,-0.03662 v -0.488674 q 0,-0.0846 -0.04546,-0.123747 -0.05935,-0.05051 -0.178044,-0.05051 -0.08965,0 -0.15784,0.03536 -0.06692,0.03409 -0.170468,0.146476 v 0.481098 q 0.09976,0 0.128798,0.01894 0.06187,0.03788 0.06187,0.111119 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 9.880834 q -0.093442,0 -0.1338486,-0.03536 -0.039144,-0.03662 -0.039144,-0.0947 0,-0.07071 0.060611,-0.109856 0.030305,-0.01894 0.1300605,-0.01894 v -0.628836 q -0.082077,0 -0.1212214,-0.03662 -0.039144,-0.03662 -0.039144,-0.09344 0,-0.05682 0.039144,-0.09218 0.040407,-0.03662 0.1338486,-0.03662 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1270"
+           style="fill:#759783;fill-opacity:1;stroke-width:0.21550468"
+           d="m 12.642409,-22.006785 q 0,0.149001 -0.08334,0.289164 -0.08208,0.138899 -0.246231,0.222239 -0.162891,0.08208 -0.340935,0.08208 -0.176781,0 -0.33841,-0.08081 -0.161628,-0.08208 -0.246231,-0.222239 -0.0846,-0.140162 -0.0846,-0.292951 0,-0.155315 0.08587,-0.304317 0.08587,-0.150264 0.246231,-0.236129 0.161628,-0.08587 0.337147,-0.08587 0.176781,0 0.339672,0.08839 0.164154,0.08713 0.247494,0.236129 0.08334,0.147738 0.08334,0.304316 z m -0.258858,0.0013 q 0,-0.12501 -0.08965,-0.229816 -0.122484,-0.141425 -0.321994,-0.141425 -0.175519,0 -0.292952,0.112383 -0.117433,0.112382 -0.117433,0.26012 0,0.121222 0.118696,0.227291 0.118696,0.104806 0.291689,0.104806 0.174256,0 0.292952,-0.104806 0.118696,-0.106069 0.118696,-0.228553 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1272"
+           style="fill:#759783;fill-opacity:1;stroke-width:0.21550468"
+           d="m 13.356967,-22.601527 v 0.161628 q 0.162891,-0.117433 0.256332,-0.156578 0.09471,-0.03914 0.176782,-0.03914 0.126272,0 0.244968,0.09344 0.08081,0.06314 0.08081,0.128797 0,0.05556 -0.03914,0.0947 -0.03788,0.03788 -0.09218,0.03788 -0.04798,0 -0.101018,-0.04798 -0.05303,-0.04798 -0.0947,-0.04798 -0.0543,0 -0.162891,0.06819 -0.107332,0.06819 -0.26896,0.204561 v 0.390182 h 0.368715 q 0.09344,0 0.132586,0.03662 0.04041,0.03536 0.04041,0.09344 0,0.05682 -0.04041,0.09344 -0.03915,0.03536 -0.132586,0.03536 h -0.781626 q -0.09344,0 -0.133848,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.04041,-0.03662 0.133848,-0.03662 h 0.154053 v -0.628836 h -0.09344 q -0.09344,0 -0.133849,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.04041,-0.03662 0.133849,-0.03662 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1274"
+           style="fill:#759783;fill-opacity:1;stroke-width:0.21550468"
+           d="m 14.671604,-22.601527 v 0.07324 q 0.06314,-0.06187 0.113645,-0.0846 0.05177,-0.02399 0.118696,-0.02399 0.05682,0 0.112383,0.02778 0.05556,0.02778 0.108594,0.08334 0.06692,-0.05556 0.135111,-0.08208 0.06945,-0.02778 0.141425,-0.02778 0.14395,0 0.233604,0.07703 0.118696,0.101018 0.118696,0.265172 v 0.57959 q 0.08081,0 0.119958,0.03662 0.03914,0.03662 0.03914,0.09344 0,0.05682 -0.03914,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 15.4949 v -0.816982 q 0,-0.05935 -0.02147,-0.08208 -0.02147,-0.02273 -0.06566,-0.02273 -0.04293,0 -0.07955,0.02273 -0.04672,0.03157 -0.113645,0.118696 v 0.521505 q 0.08081,0 0.119959,0.03662 0.03914,0.03662 0.03914,0.09344 0,0.05682 -0.03914,0.09344 -0.03914,0.03536 -0.132586,0.03536 h -0.246231 v -0.816982 q 0,-0.05808 -0.02273,-0.08081 -0.02147,-0.02399 -0.06566,-0.02399 -0.04546,0 -0.08965,0.02904 -0.0442,0.02778 -0.106069,0.112382 v 0.521505 q 0.08081,0 0.119959,0.03662 0.04041,0.03662 0.04041,0.09344 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 h -0.233604 q -0.09344,0 -0.132586,-0.03536 -0.04041,-0.03662 -0.04041,-0.0947 0,-0.05682 0.03914,-0.09218 0.03914,-0.03662 0.121221,-0.03662 v -0.628836 q -0.08208,0 -0.121221,-0.03662 -0.03914,-0.03662 -0.03914,-0.09344 0,-0.05682 0.04041,-0.09218 0.03914,-0.03662 0.132586,-0.03662 z"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/res/CM8_normon.svg b/res/CM8_normon.svg
new file mode 100644
index 0000000..a246ca4
--- /dev/null
+++ b/res/CM8_normon.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="8.6445103mm"
+   height="3.9277196mm"
+   viewBox="0 0 8.6445103 3.9277196"
+   version="1.1"
+   id="svg9135"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="CM8_normon.svg">
+  <defs
+     id="defs9129" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.40179"
+     inkscape:cx="4.9486626"
+     inkscape:cy="2.9369758"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g1283"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     units="px"
+     objecttolerance="16"
+     guidetolerance="16"
+     inkscape:snap-perpendicular="true"
+     inkscape:snap-tangential="true" />
+  <metadata
+     id="metadata9132">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-74.922591,-53.717701)">
+    <g
+       transform="translate(66.434495,77.706656)"
+       style="display:inline"
+       id="g1283">
+      <path
+         style="fill:#ffe335;fill-opacity:1;stroke:#c63434;stroke-width:0.33263156;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 15.099855,-20.227551 c -1.526336,0 -3.052672,0 -4.579008,0 l -1.7975447,-1.797544 1.7975447,-1.797544 c 1.526336,0 3.052672,0 4.579008,0 l 1.797545,1.797544 z"
+         id="path1211"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <g
+         id="text1248"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:2.58605623px;line-height:1.25;font-family:'Courier New';-inkscape-font-specification:'Courier New Bold';letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#5f703d;fill-opacity:1;stroke:none;stroke-width:0.21550468"
+         aria-label="norm">
+        <path
+           id="path1268"
+           style="fill:#5f703d;fill-opacity:1;stroke-width:0.21550468"
+           d="m 10.15737,-22.601527 v 0.08713 q 0.07071,-0.06061 0.155315,-0.09092 0.08587,-0.03031 0.18562,-0.03031 0.229816,0 0.363665,0.142688 0.106068,0.113645 0.106068,0.298002 v 0.481098 q 0.08208,0 0.121222,0.03662 0.03914,0.03536 0.03914,0.09344 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 10.7218 q -0.09344,0 -0.133848,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.03914,-0.03662 0.121221,-0.03662 v -0.488674 q 0,-0.0846 -0.04546,-0.123747 -0.05935,-0.05051 -0.178044,-0.05051 -0.08965,0 -0.15784,0.03536 -0.06692,0.03409 -0.170468,0.146476 v 0.481098 q 0.09976,0 0.128798,0.01894 0.06187,0.03788 0.06187,0.111119 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 9.880834 q -0.093442,0 -0.1338486,-0.03536 -0.039144,-0.03662 -0.039144,-0.0947 0,-0.07071 0.060611,-0.109856 0.030305,-0.01894 0.1300605,-0.01894 v -0.628836 q -0.082077,0 -0.1212214,-0.03662 -0.039144,-0.03662 -0.039144,-0.09344 0,-0.05682 0.039144,-0.09218 0.040407,-0.03662 0.1338486,-0.03662 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1270"
+           style="fill:#5f703d;fill-opacity:1;stroke-width:0.21550468"
+           d="m 12.642409,-22.006785 q 0,0.149001 -0.08334,0.289164 -0.08208,0.138899 -0.246231,0.222239 -0.162891,0.08208 -0.340935,0.08208 -0.176781,0 -0.33841,-0.08081 -0.161628,-0.08208 -0.246231,-0.222239 -0.0846,-0.140162 -0.0846,-0.292951 0,-0.155315 0.08587,-0.304317 0.08587,-0.150264 0.246231,-0.236129 0.161628,-0.08587 0.337147,-0.08587 0.176781,0 0.339672,0.08839 0.164154,0.08713 0.247494,0.236129 0.08334,0.147738 0.08334,0.304316 z m -0.258858,0.0013 q 0,-0.12501 -0.08965,-0.229816 -0.122484,-0.141425 -0.321994,-0.141425 -0.175519,0 -0.292952,0.112383 -0.117433,0.112382 -0.117433,0.26012 0,0.121222 0.118696,0.227291 0.118696,0.104806 0.291689,0.104806 0.174256,0 0.292952,-0.104806 0.118696,-0.106069 0.118696,-0.228553 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1272"
+           style="fill:#5f703d;fill-opacity:1;stroke-width:0.21550468"
+           d="m 13.356967,-22.601527 v 0.161628 q 0.162891,-0.117433 0.256332,-0.156578 0.09471,-0.03914 0.176782,-0.03914 0.126272,0 0.244968,0.09344 0.08081,0.06314 0.08081,0.128797 0,0.05556 -0.03914,0.0947 -0.03788,0.03788 -0.09218,0.03788 -0.04798,0 -0.101018,-0.04798 -0.05303,-0.04798 -0.0947,-0.04798 -0.0543,0 -0.162891,0.06819 -0.107332,0.06819 -0.26896,0.204561 v 0.390182 h 0.368715 q 0.09344,0 0.132586,0.03662 0.04041,0.03536 0.04041,0.09344 0,0.05682 -0.04041,0.09344 -0.03915,0.03536 -0.132586,0.03536 h -0.781626 q -0.09344,0 -0.133848,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.04041,-0.03662 0.133848,-0.03662 h 0.154053 v -0.628836 h -0.09344 q -0.09344,0 -0.133849,-0.03536 -0.03914,-0.03662 -0.03914,-0.0947 0,-0.05682 0.03914,-0.09218 0.04041,-0.03662 0.133849,-0.03662 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path1274"
+           style="fill:#5f703d;fill-opacity:1;stroke-width:0.21550468"
+           d="m 14.671604,-22.601527 v 0.07324 q 0.06314,-0.06187 0.113645,-0.0846 0.05177,-0.02399 0.118696,-0.02399 0.05682,0 0.112383,0.02778 0.05556,0.02778 0.108594,0.08334 0.06692,-0.05556 0.135111,-0.08208 0.06945,-0.02778 0.141425,-0.02778 0.14395,0 0.233604,0.07703 0.118696,0.101018 0.118696,0.265172 v 0.57959 q 0.08081,0 0.119958,0.03662 0.03914,0.03662 0.03914,0.09344 0,0.05682 -0.03914,0.09344 -0.03914,0.03536 -0.132586,0.03536 H 15.4949 v -0.816982 q 0,-0.05935 -0.02147,-0.08208 -0.02147,-0.02273 -0.06566,-0.02273 -0.04293,0 -0.07955,0.02273 -0.04672,0.03157 -0.113645,0.118696 v 0.521505 q 0.08081,0 0.119959,0.03662 0.03914,0.03662 0.03914,0.09344 0,0.05682 -0.03914,0.09344 -0.03914,0.03536 -0.132586,0.03536 h -0.246231 v -0.816982 q 0,-0.05808 -0.02273,-0.08081 -0.02147,-0.02399 -0.06566,-0.02399 -0.04546,0 -0.08965,0.02904 -0.0442,0.02778 -0.106069,0.112382 v 0.521505 q 0.08081,0 0.119959,0.03662 0.04041,0.03662 0.04041,0.09344 0,0.05682 -0.04041,0.09344 -0.03914,0.03536 -0.132586,0.03536 h -0.233604 q -0.09344,0 -0.132586,-0.03536 -0.04041,-0.03662 -0.04041,-0.0947 0,-0.05682 0.03914,-0.09218 0.03914,-0.03662 0.121221,-0.03662 v -0.628836 q -0.08208,0 -0.121221,-0.03662 -0.03914,-0.03662 -0.03914,-0.09344 0,-0.05682 0.04041,-0.09218 0.03914,-0.03662 0.132586,-0.03662 z"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/res/CM9_ledinc.svg b/res/CM9_ledinc.svg
index cbdf6f5..774d35b 100644
--- a/res/CM9_ledinc.svg
+++ b/res/CM9_ledinc.svg
@@ -25,9 +25,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="41.607159"
-     inkscape:cx="6.8942966"
-     inkscape:cy="2.3916192"
+     inkscape:zoom="14.710352"
+     inkscape:cx="-4.530684"
+     inkscape:cy="1.886097"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -35,8 +35,8 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -54,7 +54,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/CM_helpers.cpp b/src/CM_helpers.cpp
index a7aa8bd..6ba1a18 100644
--- a/src/CM_helpers.cpp
+++ b/src/CM_helpers.cpp
@@ -5,12 +5,16 @@
 //helper functions
 
 //math and logic
-float cm_clamp(float val, float lo = -10.0, float hi = 10.0){
+float cm_clamp(float val, float lo = -10.0, float hi = 10.0, bool normalize = false){
 	if (lo > hi) return 0;
-    return std::min(std::max(val, lo), hi);
+    val = std::min(std::max(val, lo), hi);
+    if (normalize){
+        val = 10.0f * ((val - lo) / (hi - lo)) - 5.0f;
+    }
+    return val ;
 }
 
-float cm_fold(float val, float lo = -10.0, float hi = 10.0){
+float cm_fold(float val, float lo = -10.0, float hi = 10.0, bool normalize = false){
 
     if (lo == hi){
         return lo;
@@ -24,7 +28,10 @@ float cm_fold(float val, float lo = -10.0, float hi = 10.0){
                 val = hi + (hi - val);
             }
         }
-        val = std::max(lo, std::min(val, hi));
+        val = std::min(std::max(val, lo), hi);
+        if (normalize){
+        val = 10.0f * ((val - lo) / (hi - lo)) - 5.0f;
+    }
         return val;
     }
     return 0.0;
@@ -51,5 +58,4 @@ float cm_gauss(float size){
 }
 float cm_gauss(float size, float offset){
     return cm_gauss(size) + offset;
-}
-
+}
\ No newline at end of file
diff --git a/src/CM_helpers.hpp b/src/CM_helpers.hpp
index 2ead0de..183566a 100644
--- a/src/CM_helpers.hpp
+++ b/src/CM_helpers.hpp
@@ -4,10 +4,9 @@
 //helper functions header
 
 //math and logic
-float cm_clamp(float val, float lo, float hi);
-float cm_fold(float val, float lo, float hi);
+float cm_clamp(float val, float lo, float hi, bool normalize);
+float cm_fold(float val, float lo, float hi, bool normalize);
 float cm_gauss(float size);
 float cm_gauss(float size, float offset);
 
-
 #endif
\ No newline at end of file
diff --git a/src/CatroModulo.hpp b/src/CatroModulo.hpp
index d735054..5a56fba 100644
--- a/src/CatroModulo.hpp
+++ b/src/CatroModulo.hpp
@@ -38,6 +38,12 @@ struct CM_Knob_small_def_half : CM_Knob_small_def {
 	}
 };
 
+struct CM_Knob_small_def_half_16 : CM_Knob_small_def_half {
+	CM_Knob_small_def_half_16() {
+		snap = true;
+	}
+};
+
 struct CM_Knob_small_red : SvgKnob {
 	CM_Knob_small_red() {
 		minAngle = -1.0*M_PI;
@@ -82,6 +88,14 @@ struct CM_Knob_big_def_tt : CM_Knob_big_def {
 	}
 };
 
+struct CM_Knob_big_def_tts : CM_Knob_big_def {
+	CM_Knob_big_def_tts() {
+		minAngle = -0.75*M_PI;
+		maxAngle = 0.75*M_PI;
+		snap = true;
+	}
+};
+
 struct CM_Knob_big_red : SvgKnob {
 	CM_Knob_big_red() {
 		minAngle = -1.0*M_PI;
@@ -175,6 +189,13 @@ struct CM_Input_bpm : SvgPort {
 	}
 };
 
+struct CM_Input_ext : SvgPort {
+	CM_Input_ext() {
+		setSvg(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CM-input_ext.svg")));
+        shadow->opacity = 0;
+	}
+};
+
 
 struct CM_Output_def : SvgPort {
 	CM_Output_def() {
@@ -211,6 +232,13 @@ struct CM_Switch_small : SvgSwitch {
 	}
 };
 
+struct CM_Switch_smallh : SvgSwitch {
+	CM_Switch_smallh() {
+		addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CM-TS_smallh_0.svg")));
+		addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CM-TS_smallh_1.svg")));
+	}
+};
+
 struct CM_TryMe_button : SvgSwitch {
 	CM_TryMe_button() {
 		momentary = true;
@@ -262,6 +290,13 @@ struct CM_Ledbutton_mini : SvgSwitch {
 	}
 };
 
+struct CM_8_normalizebutton : SvgSwitch {
+	CM_8_normalizebutton() {
+		addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CM8_normoff.svg")));
+		addFrame(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CM8_normon.svg")));
+	}
+};
+
 
 
 //mechanisms
@@ -519,6 +554,18 @@ struct CM_BpmClock {
 	float clk_out[3] = {};
 	int resetframes = 0;
 
+
+	//ext input detector
+	dsp::SchmittTrigger externalClockTrigger;
+	float extTime = 0.0f;
+	float extLasttime[2] = {};
+	// float extRate = 0.0f;
+	// int extCount = 0;
+	// float exthistory[4] = {};
+	 int rateLock = 0;
+	float extRateLocked = 0.0f;
+	// float ret = 0.0f;
+
 	public:
 
 	CM_BpmClock(){
@@ -531,8 +578,7 @@ struct CM_BpmClock {
 
 	//between 0 and 1000
 	void setbpm(float bpm){
-		bpm = std::max(bpm, 0.0f);
-		clk_bpm = bpm;
+		clk_bpm = std::max(bpm, 0.0f);
 		bpm_cv = bpmtocv(bpm);
 		// freq = clk_bpm / 30.0; //double freq! -for halfstep
 	}
@@ -555,7 +601,7 @@ struct CM_BpmClock {
 
 	void step(float dt){
 		pulsegen();
-		freq = clk_bpm / 30.0; //double freq! -for halfstep
+		freq = clk_bpm / 15.0f; //double freq! -for halfstep
 		float deltaPhase = fminf(freq * dt, 0.5f); //delta is halftime
 		phase += deltaPhase;
 		if (phase >= 1.0f){phase -= 1.0f;}
@@ -583,21 +629,67 @@ struct CM_BpmClock {
 			return 0.0;
 		}else{
 			resetframes = 0;
-			return 1.0;
+			return clk_out[out];
 		}
 		
 	}
 
 	float bpmtocv(float bpm){
-		return bpm * 0.01;
+		return bpm / 60.0f;
 	}
 
 	float cvtobpm(float cv){
-		return cv * 100.0;
+		return cv * 60.0f;
+	}
+
+	float exttrack(float ext, float interval){
+		if (externalClockTrigger.process(ext)){
+			extLasttime[1] = extLasttime[0];
+			extLasttime[0] = extTime;
+			if (extLasttime[0] > 0 && abs(extLasttime[0] - extLasttime[1]) < 0.001){
+				extRateLocked = (6.0f / ((extLasttime[0] + extLasttime[1] + interval) * 5.0f));
+				if (rateLock == 0){
+					setReset(1.0f);
+					rateLock = 1;
+				}
+			}else{
+				rateLock = 0;
+			}
+			extTime = 0.0f;
+		}
+		extTime += interval;
+		
+		return (extRateLocked > 0) ? extRateLocked : 0.0f;
+	}
+
+	void extreset(bool go){
+		if (go){
+		externalClockTrigger.reset();
+		extreset();
+		}
+	}
+
+	void extreset(){
+		extTime = 0.0f;
+		extLasttime[0] = 0.0f;
+		extLasttime[1] = 0.0f;
+		extRateLocked = 0.0f;
+		// extCount = 0;
+		 rateLock = 0;
+		// extRateLocked = 0.0f;
 	}
 
 	private:
 
+	bool compar(int num, float valone, const float valar[]){
+		for (int i=0; i < num; i++){
+					if (valar[i] != valone){
+						return false;
+					}
+				}
+				return true;
+	}
+
 	float sqr(){
 		float sqr = phase < pw ? 1.0f : -1.0f;
 		return sqr;
@@ -810,6 +902,35 @@ struct CM9_LedIndicator : SvgWidget {
 	}
 };
 
+//Operator mode switch
+struct CM_OP : Button {
+
+	int *opmode = nullptr;
+	const float opcoords[8] = {10.2, 15.4, 10.2, 5.1, 5.4, 10.5, 15.6, 10.5};
+
+	CM_OP(float x, float y) {
+		box.pos.x = x;
+		box.pos.y = y;
+	};
+
+	void draw(const DrawArgs &args) override {
+		// Background
+		NVGcolor backgroundColor = nvgRGB(0xff, 0xf4, 0x00);
+		nvgBeginPath(args.vg);
+		nvgCircle(args.vg, opcoords[*opmode], opcoords[*opmode + 4], 2.5f);
+		nvgFillColor(args.vg, backgroundColor);
+		nvgFill(args.vg);		
+	}
+
+	void onDragStart(const event::DragStart& e) override {
+		*opmode = (*opmode < 3) ? (*opmode + 1) : 0;
+	}
+	
+	int getopmode(){
+		return *opmode;
+	}
+};
+
 //yellow big led indicator
 struct BigLedIndicator : TransparentWidget {
 
@@ -832,7 +953,7 @@ struct BigLedIndicator : TransparentWidget {
 			nvgBeginPath(args.vg);
 			nvgRoundedRect(args.vg, 4.0, 4.0, box.size.x - 8.0, box.size.y - 8.0, 4.0);
 			nvgFillColor(args.vg, nvgRGB(0xff, 0xf4, 0x00));
-			nvgFill(args.vg);;
+			nvgFill(args.vg);
 		}
 	}
-};
+};
\ No newline at end of file
diff --git a/src/CatroModulo_CM-1.cpp b/src/CatroModulo_CM-1.cpp
index f654d93..901b884 100644
--- a/src/CatroModulo_CM-1.cpp
+++ b/src/CatroModulo_CM-1.cpp
@@ -11,11 +11,12 @@ struct LowFrequencyOscillator {
 	float pw = 0.5f;
 	float freq = 1.0f;
 	bool invert = false;
+	bool paused = false;
 	dsp::SchmittTrigger resetTrigger;
 
 	LowFrequencyOscillator() {}
 	void setPitch(float pitch) {
-			pitch = fminf(pitch, 13.0f);
+			//pitch = fminf(pitch, 13.0f);
 			freq = powf(2.0f, pitch);
 	}
 
@@ -42,6 +43,9 @@ struct LowFrequencyOscillator {
 			default : freq = 0; break;
 		}
 	}
+	void setPitchU(float multi, float base) {
+		freq = powf(multi, 3.0f) * (base / 240);
+	}
 
 	void setPulseWidth(float pw_) {
 		const float pwMin = 0.01f;
@@ -58,9 +62,14 @@ struct LowFrequencyOscillator {
 			phase = 0.0f;
 		}
 	}
+
+	void pause(bool p) {
+		paused = p;
+	}
+
 	void step(float dt) {
 		float deltaPhase = fminf(freq * dt, 0.5f);
-		phase += deltaPhase;
+		phase += paused ? 0.0f : deltaPhase;
 		if (phase >= 1.0f)
 			phase -= 1.0f;
 
@@ -94,15 +103,18 @@ struct LowFrequencyOscillator {
 	//mixing the types
 	float tmix() {
 		float tmr = 0.0f;
-		if (typemix < 1.0f){
+		if (typemix == 0.0f){
+			tmr = sin();
+		}else if (typemix < 1.0f){
 			tmr = (1.0f - typemix) * sin() + typemix * tri();
-		}else 
-		if (typemix < 2.0f){
+		}else if (typemix < 2.0f){
 			typemix -= 1.0f;
 			tmr = (1.0f - typemix) * tri() + typemix * saw();
-		}else {
+		}else if (typemix < 3.0f){
 			typemix -= 2.0f;
 			tmr = (1.0f - typemix) * saw() + typemix * sqr();
+		}else{
+			tmr = sqr();
 		}
 		return tmr;
 	}
@@ -122,6 +134,8 @@ struct CM1Module : Module {
 		ENUMS(PARAM_PHASE, 8),
 		PARAM_RESET,
 		PARAM_OFFSET,
+		PARAM_LOCK,
+		PARAM_PAUSE,
 		NUM_PARAMS
 	};
 	enum InputIds {
@@ -131,11 +145,11 @@ struct CM1Module : Module {
 		ENUMS(INPUT_PHASE, 8),
 		INPUT_RESET,
 		INPUT_BPM,
+		INPUT_PAUSE,
 		NUM_INPUTS
 	};
 	enum OutputIds {
 		ENUMS(OUTPUT_LFO, 8),
-		OUTPUT_MIX,
 		NUM_OUTPUTS
 	};
 	enum LightIds {
@@ -153,13 +167,15 @@ struct CM1Module : Module {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
 		int i = -1;
 		while(++i < 8){
-			configParam(CM1Module::PARAM_TYPE + i , 0.0f, 3.0f, 0.0f, "");
-			configParam(CM1Module::PARAM_RATE + i , 0.0f, 1.0f, 0.5f, "");
-			configParam(CM1Module::PARAM_PW + i ,0.001f, 1.0f, 0.5f, "");
-			configParam(CM1Module::PARAM_PHASE + i , 0.0f , 1.0f, 0.5f, "");
+			configParam(CM1Module::PARAM_TYPE + i , 0.0f, 3.0f, 0.0f, "shape", "", 0.0f, 1.0f, 1.0f);
+			configParam(CM1Module::PARAM_RATE + i , 0.0f, 1.0f, 0.5f, "rate", "", 0.0f, 16.0f, -8.0f);
+			configParam(CM1Module::PARAM_PW + i ,0.001f, 1.0f, 0.5f, "pulse width", "%", 0.0f, 100.0f);
+			configParam(CM1Module::PARAM_PHASE + i , 0.0f , 1.0f, 0.5f, "phase", "°", 0.0f, 360.0f, -180.0f);
 		}
-		configParam(CM1Module::PARAM_RESET, 0.0f, 1.0f, 0.0f, "");
-		configParam(CM1Module::PARAM_OFFSET, 0.0f, 1.0f, 0.0f, "");
+		configParam(CM1Module::PARAM_RESET, 0.0f, 1.0f, 0.0f, "reset");
+		configParam(CM1Module::PARAM_OFFSET, 0.0f, 1.0f, 0.0f, "offset", "V", 0.0f, 5.0f);
+		configParam(CM1Module::PARAM_LOCK, 0.0f, 1.0f, 0.0f, "lock", "", 0.0f, -1.0f, 1.0f);
+		configParam(CM1Module::PARAM_PAUSE, 0.0f, 1.0f, 0.0f, "pause");
 
 	}
 	void process(const ProcessArgs &args) override;
@@ -173,9 +189,9 @@ struct CM1Module : Module {
 //Tarzan - this is for TJ :)
 
 void CM1Module::process(const ProcessArgs &args) {
-	float mixOut = 0.0f;
 	float offset = 5.0f * params[PARAM_OFFSET].getValue();
 	float reset = (inputs[INPUT_RESET].getVoltage() || params[PARAM_RESET].getValue());
+	bool paused = (inputs[INPUT_PAUSE].getVoltage() || params[PARAM_PAUSE].getValue());
 
 	if (inputs[INPUT_BPM].isConnected()){
 		lfoclock.setcv(inputs[INPUT_BPM].getVoltage());
@@ -191,18 +207,27 @@ void CM1Module::process(const ProcessArgs &args) {
 			float mod_one = clamp((inputs[INPUT_TYPE + i].isConnected()) ? params[PARAM_TYPE + i].getValue() * inputs[INPUT_TYPE + i].getVoltage() * 0.1f : params[PARAM_TYPE + i].getValue(), 0.0f, 3.0f); //TYPE
 			float mod_two;
 			if (synced == true){
-				mod_two = roundf(clamp((inputs[INPUT_RATE + i].isConnected()) ? (params[PARAM_RATE + i].getValue() * 16.0 - 8.0) + (clamp(inputs[INPUT_RATE + i].getVoltage() * 0.1, -1.0f, 1.0f) * 8) : params[PARAM_RATE + i].getValue() * 16.0 - 8.0 , -8.0f, 8.0f)); //RATE
+				if (params[PARAM_LOCK].getValue() == 0){
+					mod_two = roundf(clamp((inputs[INPUT_RATE + i].isConnected()) ? (params[PARAM_RATE + i].getValue() * 16.0f - 8.0f) + (inputs[INPUT_RATE + i].getVoltage() * 0.8f) : params[PARAM_RATE + i].getValue() * 16.0f - 8.0f , -8.0f, 8.0f)); //RATE;
+				}else{
+					mod_two = clamp((inputs[INPUT_RATE + i].isConnected()) ? (params[PARAM_RATE + i].getValue() * 2.0f) + (inputs[INPUT_RATE + i].getVoltage() * 0.2f) : params[PARAM_RATE + i].getValue() * 2.0f , 0.0f, 4.0f); //RATE
+				}
 			}else{
-				mod_two = clamp((inputs[INPUT_RATE + i].isConnected()) ? (params[PARAM_RATE + i].getValue() * 21.0 - 8.0) + (clamp(inputs[INPUT_RATE + i].getVoltage() * 0.1, -1.0f, 1.0f) * 21) : params[PARAM_RATE + i].getValue() * 21.0 - 8.0 , -8.0f, 13.0f); //RATE
+				mod_two = clamp((inputs[INPUT_RATE + i].isConnected()) ? (params[PARAM_RATE + i].getValue() * 21.0 - 8.0) + (inputs[INPUT_RATE + i].getVoltage() * 2.1) : params[PARAM_RATE + i].getValue() * 21.0 - 8.0 , -8.0f, 13.0f); //RATE
 			}
 			float mod_thr = clamp((inputs[INPUT_PW + i].isConnected()) ? params[PARAM_PW + i].getValue() * (1.0 + inputs[INPUT_PW + i].getVoltage()) * 0.05f : params[PARAM_PW + i].getValue(), 0.0f, 1.0f); //PW
 			float mod_fou = clamp((inputs[INPUT_PHASE + i].isConnected()) ? params[PARAM_PHASE + i].getValue() + inputs[INPUT_PHASE + i].getVoltage() * 0.1f : params[PARAM_PHASE + i].getValue(), 0.0f, 1.0f); //PHASE
 			
 
 			//set lfo mods
+			lfo[i].pause(paused);
 			lfo[i].setMix(mod_one);
 			if (synced == true){
-				lfo[i].setPitch(mod_two, lfoclock.getbpm());
+				if (params[PARAM_LOCK].getValue()){
+					lfo[i].setPitchU(mod_two, lfoclock.getbpm());
+				}else{
+					lfo[i].setPitch(mod_two, lfoclock.getbpm());
+				}
 			}else{
 				lfo[i].setPitch(mod_two);
 			}
@@ -215,15 +240,12 @@ void CM1Module::process(const ProcessArgs &args) {
 
 			out = 5.0f * lfo[i].tmix() + offset;
 			outputs[OUTPUT_LFO + i].setVoltage(clamp(out, -10.0f, 10.0f) );
-			mixOut += out;
 		}else{
 			out = 0.0f;
 			outputs[OUTPUT_LFO + i].setVoltage(0);
 		}
 		
 	}
-	//mixed output
-	outputs[OUTPUT_MIX].setVoltage(mixOut * 0.125f);
 }
 
 
@@ -267,6 +289,10 @@ struct CM1ModuleWidget : ModuleWidget {
 		//RESET
 		addParam(createParam<CM_I_def_tinybuttonL>(Vec(8.5, 339.2), module, CM1Module::PARAM_RESET));
 		addInput(createInput<CM_Input_def>(Vec(17.4, 339.2), module, CM1Module::INPUT_RESET));
+
+		//RESET
+		addParam(createParam<CM_I_def_tinybuttonL>(Vec(214.3, 329.3), module, CM1Module::PARAM_PAUSE));
+		addInput(createInput<CM_Input_def>(Vec(223.1, 329.3), module, CM1Module::INPUT_PAUSE));
 		
 		//OFFSET (+5V)
 		addParam(createParam<CM_Switch_small>(Vec(48.3, 338.7), module, CM1Module::PARAM_OFFSET));
@@ -274,9 +300,8 @@ struct CM1ModuleWidget : ModuleWidget {
 		//sync (bpm)
 		addInput(createInput<CM_Input_bpm>(Vec(70.1, 339.2), module, CM1Module::INPUT_BPM));
 
-		//
-		//MIXOUT
-		addOutput(createOutput<CM_Output_small>(Vec(188.0, 342.5), module, 8));
+		//synclock
+		addParam(createParam<CM_Switch_smallh>(Vec(100.5, 343.2), module, CM1Module::PARAM_LOCK));
 
 
 	}
diff --git a/src/CatroModulo_CM-1.cpp.bak b/src/CatroModulo_CM-1.cpp.bak
new file mode 100644
index 0000000..f654d93
--- /dev/null
+++ b/src/CatroModulo_CM-1.cpp.bak
@@ -0,0 +1,290 @@
+#include "CatroModulo.hpp"
+//#include "dsp/minblep.hpp" //got to figure this out...
+
+//Catro-Module 8xlfo
+
+struct LowFrequencyOscillator {
+	
+	float phase = 0.0f;
+	float pshift = 0.0f;
+	float typemix = 0.0f;
+	float pw = 0.5f;
+	float freq = 1.0f;
+	bool invert = false;
+	dsp::SchmittTrigger resetTrigger;
+
+	LowFrequencyOscillator() {}
+	void setPitch(float pitch) {
+			pitch = fminf(pitch, 13.0f);
+			freq = powf(2.0f, pitch);
+	}
+
+	void setPitch(int multi, float base) {
+		switch (multi){
+			case -8 : freq = base / 7680 ; break;
+			case -7 : freq = base / 3840 ; break;
+			case -6 : freq = base / 1920 ; break;
+			case -5 : freq = base / 1440 ; break;
+			case -4 : freq = base / 960  ; break;
+			case -3 : freq = base / 720  ; break;
+			case -2 : freq = base / 480  ; break;
+			case -1 : freq = base / 360  ; break;
+			case 0  : freq = base / 240  ; break;
+			case 1  : freq = base / 120  ; break;
+			case 2  : freq = base / 60   ; break;
+			case 3  : freq = base / 30   ; break;
+			case 4  : freq = base / 15   ; break; 
+			case 5  : freq = base / 10   ; break;
+			case 6  : freq = base / 7.5  ; break;
+			case 7  : freq = base / 5    ; break;
+			case 8  : freq = base / 2.5  ; break;
+
+			default : freq = 0; break;
+		}
+	}
+
+	void setPulseWidth(float pw_) {
+		const float pwMin = 0.01f;
+		pw = clamp(pw_, pwMin, 1.0f - pwMin);
+	}
+	void setShift(float ps){
+		pshift = ps;
+	}
+	void setMix(float sm){
+		typemix = sm;
+	}
+	void setReset(float reset) {
+		if (resetTrigger.process(reset * 100)) {
+			phase = 0.0f;
+		}
+	}
+	void step(float dt) {
+		float deltaPhase = fminf(freq * dt, 0.5f);
+		phase += deltaPhase;
+		if (phase >= 1.0f)
+			phase -= 1.0f;
+
+		pshift += phase;
+		if(pshift >= 1.0f){
+			pshift -= 1.0f;	
+		}		
+	}
+
+	float sin() {
+			return sinf(2*M_PI * pshift) * (invert ? -1.0f : 1.0f);
+	}
+
+	float tri(float x) {
+		return 4.0f * fabsf(x - roundf(x));
+	}
+	float tri() {
+			return -1.0f + tri(invert ? pshift - 0.25f : pshift - 0.75f);
+	}
+	float saw(float x) {
+		return 2.0f * (x - roundf(x));
+	}
+	float saw() {
+			return saw(pshift) * (invert ? -1.0f : 1.0f);
+	}
+	float sqr() {
+		float sqr = (pshift < pw) ^ invert ? 1.0f : -1.0f;
+		return sqr;
+	}
+
+	//mixing the types
+	float tmix() {
+		float tmr = 0.0f;
+		if (typemix < 1.0f){
+			tmr = (1.0f - typemix) * sin() + typemix * tri();
+		}else 
+		if (typemix < 2.0f){
+			typemix -= 1.0f;
+			tmr = (1.0f - typemix) * tri() + typemix * saw();
+		}else {
+			typemix -= 2.0f;
+			tmr = (1.0f - typemix) * saw() + typemix * sqr();
+		}
+		return tmr;
+	}
+
+	// float light() {
+	// 	return sinf(2*M_PI * pshift);
+	// }
+};
+
+
+
+struct CM1Module : Module {
+	enum ParamIds {
+		ENUMS(PARAM_TYPE, 8),
+		ENUMS(PARAM_RATE, 8),
+		ENUMS(PARAM_PW, 8),
+		ENUMS(PARAM_PHASE, 8),
+		PARAM_RESET,
+		PARAM_OFFSET,
+		NUM_PARAMS
+	};
+	enum InputIds {
+		ENUMS(INPUT_TYPE, 8),
+		ENUMS(INPUT_RATE, 8),
+		ENUMS(INPUT_PW, 8),
+		ENUMS(INPUT_PHASE, 8),
+		INPUT_RESET,
+		INPUT_BPM,
+		NUM_INPUTS
+	};
+	enum OutputIds {
+		ENUMS(OUTPUT_LFO, 8),
+		OUTPUT_MIX,
+		NUM_OUTPUTS
+	};
+	enum LightIds {
+		NUM_LIGHTS = 0
+	};
+
+	//generate 8 lfos
+	LowFrequencyOscillator lfo[8];
+
+	//bpm clock for synced lfo
+	CM_BpmClock lfoclock;
+	bool synced = false;
+
+	CM1Module() {
+		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
+		int i = -1;
+		while(++i < 8){
+			configParam(CM1Module::PARAM_TYPE + i , 0.0f, 3.0f, 0.0f, "");
+			configParam(CM1Module::PARAM_RATE + i , 0.0f, 1.0f, 0.5f, "");
+			configParam(CM1Module::PARAM_PW + i ,0.001f, 1.0f, 0.5f, "");
+			configParam(CM1Module::PARAM_PHASE + i , 0.0f , 1.0f, 0.5f, "");
+		}
+		configParam(CM1Module::PARAM_RESET, 0.0f, 1.0f, 0.0f, "");
+		configParam(CM1Module::PARAM_OFFSET, 0.0f, 1.0f, 0.0f, "");
+
+	}
+	void process(const ProcessArgs &args) override;
+
+	// For more advanced Module features, read Rack's engine.hpp header file
+	// - dataToJson, dataFromJson: serialization of internal data
+	// - onSampleRateChange: event triggered by a change of sample rate
+	// - onReset, onRandomize, onCreate, onDelete: implements special behavior when user clicks these from the context menu
+};
+
+//Tarzan - this is for TJ :)
+
+void CM1Module::process(const ProcessArgs &args) {
+	float mixOut = 0.0f;
+	float offset = 5.0f * params[PARAM_OFFSET].getValue();
+	float reset = (inputs[INPUT_RESET].getVoltage() || params[PARAM_RESET].getValue());
+
+	if (inputs[INPUT_BPM].isConnected()){
+		lfoclock.setcv(inputs[INPUT_BPM].getVoltage());
+		synced = true;
+	}else{
+		synced = false;
+	}
+
+	for (int i = 0; i < 8; i++) {
+		float out;
+		if (outputs[OUTPUT_LFO + i].isConnected() == true){
+			//merge modulations
+			float mod_one = clamp((inputs[INPUT_TYPE + i].isConnected()) ? params[PARAM_TYPE + i].getValue() * inputs[INPUT_TYPE + i].getVoltage() * 0.1f : params[PARAM_TYPE + i].getValue(), 0.0f, 3.0f); //TYPE
+			float mod_two;
+			if (synced == true){
+				mod_two = roundf(clamp((inputs[INPUT_RATE + i].isConnected()) ? (params[PARAM_RATE + i].getValue() * 16.0 - 8.0) + (clamp(inputs[INPUT_RATE + i].getVoltage() * 0.1, -1.0f, 1.0f) * 8) : params[PARAM_RATE + i].getValue() * 16.0 - 8.0 , -8.0f, 8.0f)); //RATE
+			}else{
+				mod_two = clamp((inputs[INPUT_RATE + i].isConnected()) ? (params[PARAM_RATE + i].getValue() * 21.0 - 8.0) + (clamp(inputs[INPUT_RATE + i].getVoltage() * 0.1, -1.0f, 1.0f) * 21) : params[PARAM_RATE + i].getValue() * 21.0 - 8.0 , -8.0f, 13.0f); //RATE
+			}
+			float mod_thr = clamp((inputs[INPUT_PW + i].isConnected()) ? params[PARAM_PW + i].getValue() * (1.0 + inputs[INPUT_PW + i].getVoltage()) * 0.05f : params[PARAM_PW + i].getValue(), 0.0f, 1.0f); //PW
+			float mod_fou = clamp((inputs[INPUT_PHASE + i].isConnected()) ? params[PARAM_PHASE + i].getValue() + inputs[INPUT_PHASE + i].getVoltage() * 0.1f : params[PARAM_PHASE + i].getValue(), 0.0f, 1.0f); //PHASE
+			
+
+			//set lfo mods
+			lfo[i].setMix(mod_one);
+			if (synced == true){
+				lfo[i].setPitch(mod_two, lfoclock.getbpm());
+			}else{
+				lfo[i].setPitch(mod_two);
+			}
+			lfo[i].setPulseWidth(mod_thr);
+			lfo[i].setShift(mod_fou);
+
+			//run lfo
+			lfo[i].step(args.sampleTime);
+			lfo[i].setReset(reset);
+
+			out = 5.0f * lfo[i].tmix() + offset;
+			outputs[OUTPUT_LFO + i].setVoltage(clamp(out, -10.0f, 10.0f) );
+			mixOut += out;
+		}else{
+			out = 0.0f;
+			outputs[OUTPUT_LFO + i].setVoltage(0);
+		}
+		
+	}
+	//mixed output
+	outputs[OUTPUT_MIX].setVoltage(mixOut * 0.125f);
+}
+
+
+struct CM1ModuleWidget : ModuleWidget {
+	CM1ModuleWidget(CM1Module *module) {
+		setModule(module);
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CM-1.svg")));
+
+		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, 0)));
+		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, 0)));
+		addChild(createWidget<ScrewSilver>(Vec(RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 2 * RACK_GRID_WIDTH, RACK_GRID_HEIGHT - RACK_GRID_WIDTH)));
+
+		//GRID
+		const float gridrowjacks[8] = {35.5, 74.3, 113.1, 151.9, 190.7, 229.5, 268.2, 307};
+		const float gridcoljacks[10] = {3.7, 29.9, 64.8, 94.1, 126.0, 155.1, 186.4, 215.8, 249.2, 278.5};
+		
+		int i = -1;
+
+		
+		while(++i < 8){
+		//INPUTS
+			addInput(createInput<CM_Input_def>(Vec(gridcoljacks[0], gridrowjacks[i]), module, CM1Module::INPUT_TYPE + i));
+			addInput(createInput<CM_Input_def>(Vec(gridcoljacks[2], gridrowjacks[i]), module, CM1Module::INPUT_RATE + i));
+			addInput(createInput<CM_Input_def>(Vec(gridcoljacks[4], gridrowjacks[i]), module, CM1Module::INPUT_PW + i));
+			addInput(createInput<CM_Input_def>(Vec(gridcoljacks[6], gridrowjacks[i]), module, CM1Module::INPUT_PHASE + i));
+		//POTS
+			addChild(createWidget<CM_Pot1_small>(Vec(gridcoljacks[1], gridrowjacks[i] - 15.0)));
+			addChild(createWidget<CM_Pot1_small>(Vec(gridcoljacks[3], gridrowjacks[i] + 7.0)));
+			addChild(createWidget<CM_Pot1_small>(Vec(gridcoljacks[5], gridrowjacks[i] - 15.0)));
+			addChild(createWidget<CM_Pot1_small>(Vec(gridcoljacks[7], gridrowjacks[i] - 15.0)));
+		//KNOBS
+			addParam(createParam<CM_Knob_small_def_half>(Vec(gridcoljacks[1], gridrowjacks[i] - 15.0), module, CM1Module::PARAM_TYPE + i ));
+			addParam(createParam<CM_Knob_small_def>(Vec(gridcoljacks[3], gridrowjacks[i] + 7.0), module, CM1Module::PARAM_RATE + i ));
+			addParam(createParam<CM_Knob_small_def>(Vec(gridcoljacks[5], gridrowjacks[i] - 15.0), module, CM1Module::PARAM_PW + i ));
+			addParam(createParam<CM_Knob_small_def>(Vec(gridcoljacks[7], gridrowjacks[i] - 15.0), module, CM1Module::PARAM_PHASE + i ));
+		//OUTPUTS
+			addOutput(createOutput<CM_Output_def>(Vec(gridcoljacks[8], gridrowjacks[i]), module, CM1Module::OUTPUT_LFO + i));
+		}
+		
+		//RESET
+		addParam(createParam<CM_I_def_tinybuttonL>(Vec(8.5, 339.2), module, CM1Module::PARAM_RESET));
+		addInput(createInput<CM_Input_def>(Vec(17.4, 339.2), module, CM1Module::INPUT_RESET));
+		
+		//OFFSET (+5V)
+		addParam(createParam<CM_Switch_small>(Vec(48.3, 338.7), module, CM1Module::PARAM_OFFSET));
+
+		//sync (bpm)
+		addInput(createInput<CM_Input_bpm>(Vec(70.1, 339.2), module, CM1Module::INPUT_BPM));
+
+		//
+		//MIXOUT
+		addOutput(createOutput<CM_Output_small>(Vec(188.0, 342.5), module, 8));
+
+
+	}
+};
+
+
+// Specify the Module and ModuleWidget subclass, human-readable
+// author name for categorization per pluginInstance, module slug (should never
+// change), human-readable module name, and any number of tags
+// (found in `include/tags.hpp`) separated by commas.
+Model *modelCM1Module = createModel<CM1Module, CM1ModuleWidget>("CatroModulo_CM-1");
diff --git a/src/CatroModulo_CM-10.cpp b/src/CatroModulo_CM-10.cpp
index 1b802d9..c3ec514 100644
--- a/src/CatroModulo_CM-10.cpp
+++ b/src/CatroModulo_CM-10.cpp
@@ -39,11 +39,10 @@ struct CM10Module : Module {
     	
 	CM10Module() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-        configParam(CM10Module::PARAM_REC, 0.0, 1.0, 0.0f, "");
-        configParam(CM10Module::PARAM_PLAY, 0.0, 1.0, 0.0f, "");
-        configParam(CM10Module::PARAM_REC + 1, 0.0, 1.0, 0.0f, "");
-        configParam(CM10Module::PARAM_PLAY + 1, 0.0, 1.0, 0.0f, "");
-
+        configParam(CM10Module::PARAM_REC, 0.0, 1.0, 0.0f, "capture");
+        configParam(CM10Module::PARAM_PLAY, 0.0, 1.0, 0.0f, "override");
+        configParam(CM10Module::PARAM_REC + 1, 0.0, 1.0, 0.0f, "capture");
+        configParam(CM10Module::PARAM_PLAY + 1, 0.0, 1.0, 0.0f, "override");
 	}
 
 	void process(const ProcessArgs &args) override;
diff --git a/src/CatroModulo_CM-2.cpp b/src/CatroModulo_CM-2.cpp
index 0296d3c..62f91a3 100644
--- a/src/CatroModulo_CM-2.cpp
+++ b/src/CatroModulo_CM-2.cpp
@@ -27,23 +27,23 @@ struct CM2Module : Module {
 
 	CM2Module() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-		configParam(CM2Module::PARAMS_ATN + 0, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_ATN + 1, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_ATN + 2, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_ATN + 3, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_ATN + 4, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_ATN + 5, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_ATN + 6, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_ATN + 7, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_OFF + 0, -5.0f, 5.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_OFF + 1, -5.0f, 5.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_OFF + 2, -5.0f, 5.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_OFF + 3, -5.0f, 5.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_OFF + 4, -5.0f, 5.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_OFF + 5, -5.0f, 5.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_OFF + 6, -5.0f, 5.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_OFF + 7, -5.0f, 5.0f, 0.0f, "");
-		configParam(CM2Module::PARAMS_X2, 1.0f, 2.0f, 1.0f, "");
+		configParam(CM2Module::PARAMS_ATN + 0, -1.0f, 1.0f, 0.0f, "attenuate", "%", 0.0f, 100.0f);
+		configParam(CM2Module::PARAMS_ATN + 1, -1.0f, 1.0f, 0.0f, "attenuate", "%", 0.0f, 100.0f);
+		configParam(CM2Module::PARAMS_ATN + 2, -1.0f, 1.0f, 0.0f, "attenuate", "%", 0.0f, 100.0f);
+		configParam(CM2Module::PARAMS_ATN + 3, -1.0f, 1.0f, 0.0f, "attenuate", "%", 0.0f, 100.0f);
+		configParam(CM2Module::PARAMS_ATN + 4, -1.0f, 1.0f, 0.0f, "attenuate", "%", 0.0f, 100.0f);
+		configParam(CM2Module::PARAMS_ATN + 5, -1.0f, 1.0f, 0.0f, "attenuate", "%", 0.0f, 100.0f);
+		configParam(CM2Module::PARAMS_ATN + 6, -1.0f, 1.0f, 0.0f, "attenuate", "%", 0.0f, 100.0f);
+		configParam(CM2Module::PARAMS_ATN + 7, -1.0f, 1.0f, 0.0f, "attenuate", "%", 0.0f, 100.0f);
+		configParam(CM2Module::PARAMS_OFF + 0, -5.0f, 5.0f, 0.0f, "offset", "V");
+		configParam(CM2Module::PARAMS_OFF + 1, -5.0f, 5.0f, 0.0f, "offset", "V");
+		configParam(CM2Module::PARAMS_OFF + 2, -5.0f, 5.0f, 0.0f, "offset", "V");
+		configParam(CM2Module::PARAMS_OFF + 3, -5.0f, 5.0f, 0.0f, "offset", "V");
+		configParam(CM2Module::PARAMS_OFF + 4, -5.0f, 5.0f, 0.0f, "offset", "V");
+		configParam(CM2Module::PARAMS_OFF + 5, -5.0f, 5.0f, 0.0f, "offset", "V");
+		configParam(CM2Module::PARAMS_OFF + 6, -5.0f, 5.0f, 0.0f, "offset", "V");
+		configParam(CM2Module::PARAMS_OFF + 7, -5.0f, 5.0f, 0.0f, "offset", "V");
+		configParam(CM2Module::PARAMS_X2, 1.0f, 2.0f, 1.0f, "output multiplier");
 
 		}
 	void process(const ProcessArgs &args) override;
diff --git a/src/CatroModulo_CM-3.cpp b/src/CatroModulo_CM-3.cpp
index f78cb73..d4beeb4 100644
--- a/src/CatroModulo_CM-3.cpp
+++ b/src/CatroModulo_CM-3.cpp
@@ -64,20 +64,20 @@ struct CM3Module : Module {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
 		int y = 0;
 		for(int i = 0; i < 16; i += 2){
-			configParam(CM3Module::PARAM_REC + y, 0.0f, 1.0f, 0.0f, "");
-			configParam(CM3Module::PARAM_EYE + y, -1.0f, 1.0f, 0.0f, "");
+			configParam(CM3Module::PARAM_REC + y, 0.0f, 1.0f, 0.0f, "record values in slot " + std::to_string(y + 1));
+			configParam(CM3Module::PARAM_EYE + y, -1.0f, 1.0f, 0.0f, "value " + std::to_string(y + 1), "", 0.0f, 100.0f);
 			y++;
 		}
 		
-		configParam(CM3Module::PARAM_PATTERN, 0.0f, 15.0f, 0.0f, "");
-		configParam(CM3Module::PARAM_MORPH, -1.0f, 1.0f, 0.0f, "");
-		configParam(CM3Module::PARAM_LENGTH, 0.0f, 15.0f, 7.0f, "");
-		configParam(CM3Module::PARAM_TRYME, 0.0f, 1.0f, 0.0f, "");
-		configParam(CM3Module::PARAM_SCAN, 0.0f, 1.0f, 0.0f, "");
-		configParam(CM3Module::PARAM_SELECT, 0.0f, 7.99999f, 0.0f, "");
-		configParam(CM3Module::PARAM_SEQ, 0.0f, 1.0f, 1.0f, "");
-		configParam(CM3Module::PARAM_RESET, 0.0f, 1.0f, 0.0f, "");
-		configParam(CM3Module::PARAM_STEP, 0.0f, 1.0f, 0.0f, "");
+		configParam(CM3Module::PARAM_PATTERN, 0.0f, 15.0f, 0.0f, "pattern select", "", 0.0f, 1.0f, 1.0f);
+		configParam(CM3Module::PARAM_MORPH, -1.0f, 1.0f, 0.0f, "(multiplied < source > recording)");
+		configParam(CM3Module::PARAM_LENGTH, 0.0f, 15.0f, 7.0f, "pattern lenght", "", 0.0f, 1.0f, 1.0f);
+		configParam(CM3Module::PARAM_TRYME, 0.0f, 1.0f, 0.0f, "randomize (!)");
+		configParam(CM3Module::PARAM_SCAN, 0.0f, 1.0f, 0.0f, "enable scan/blend");
+		configParam(CM3Module::PARAM_SELECT, 0.0f, 7.99999f, 0.0f, "select recording for output");
+		configParam(CM3Module::PARAM_SEQ, 0.0f, 1.0f, 1.0f, "enable sequencer", "", 0.0f, -1.0f, 1.0f);
+		configParam(CM3Module::PARAM_RESET, 0.0f, 1.0f, 0.0f, "reset");
+		configParam(CM3Module::PARAM_STEP, 0.0f, 1.0f, 0.0f, "step");
 
 		recball_x = recball_xarray[0];
 		recball_y = recball_yarray[0];
@@ -300,9 +300,9 @@ struct CM3ModuleWidget : ModuleWidget {
 		}
 
 		//OTHER ELEMENTS
-		addParam(createParam<CM_Knob_small_def_half>(Vec(33.4 , 34.7), module, CM3Module::PARAM_PATTERN));
+		addParam(createParam<CM_Knob_small_def_half_16>(Vec(33.4 , 34.7), module, CM3Module::PARAM_PATTERN));
 		addParam(createParam<CM_Slider_big_red>(Vec(156.5 , 17.9), module, CM3Module::PARAM_MORPH));
-		addParam(createParam<CM_Knob_small_def_half>(Vec(326.0 , 34.7), module, CM3Module::PARAM_LENGTH));
+		addParam(createParam<CM_Knob_small_def_half_16>(Vec(326.0 , 34.7), module, CM3Module::PARAM_LENGTH));
 		addParam(createParam<CM_TryMe_button>(Vec(15.0 , 320.1), module, CM3Module::PARAM_TRYME));
 		addParam(createParam<CM_Switch_small>(Vec(137.8 , 309.0), module, CM3Module::PARAM_SCAN));
 		addParam(createParam<CM_Knob_huge_red_os>(Vec(161.3 , 286.0), module, CM3Module::PARAM_SELECT));
diff --git a/src/CatroModulo_CM-4.cpp b/src/CatroModulo_CM-4.cpp
index 63f4224..db18c03 100644
--- a/src/CatroModulo_CM-4.cpp
+++ b/src/CatroModulo_CM-4.cpp
@@ -12,9 +12,8 @@ struct CM4Module : Module {
 		NUM_PARAMS
 	};
 	enum InputIds {
-		INPUT_BPM1,
-		INPUT_BPM2,
-		INPUT_BPM3,
+		INPUT_EXT,
+		INPUT_BPM,
 		INPUT_RST,
 		NUM_INPUTS
 	};
@@ -35,14 +34,14 @@ struct CM4Module : Module {
 
 	float bpm_display = 0.0;
     //create objects
-    //dsp::SchmittTrigger recordTrigger[16];
     CM_BpmClock bpmclock;
+	bool isreset = false;
 	
 	CM4Module() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-		configParam(CM4Module::PARAM_BPM, 0.0f, 6.0, 0.0f, "");
-		configParam(CM4Module::PARAM_SNAP, 0.0f, 2.0f, 1.0f, "");
-		configParam(CM4Module::PARAM_RST, 0.0f, 1.0f, 0.0f, "");
+		configParam(CM4Module::PARAM_BPM, 0.0f, 5.0, 0.0f, "tempo", " BPM", 0.0f, 100.0f);
+		configParam(CM4Module::PARAM_SNAP, 0.0f, 2.0f, 1.0f, "snap");
+		configParam(CM4Module::PARAM_RST, 0.0f, 1.0f, 0.0f, "reset");
 
 			//initialize objects
 	}
@@ -51,22 +50,40 @@ struct CM4Module : Module {
 
 void CM4Module::process(const ProcessArgs &args) {
 	if (params[PARAM_SNAP].getValue() == 0){
-		bpmclock.setbpm(int( (params[PARAM_BPM].getValue() * 100.0) * 50) / 50.0f );
+		bpmclock.setbpm(int( (params[PARAM_BPM].getValue() * 100.0) * 100) / 100.0f );
 	}else if (params[PARAM_SNAP].getValue() == 1){
-		bpmclock.setbpm(int( (params[PARAM_BPM].getValue() * 100.0) * 0.5) * 2.0f);
+		bpmclock.setbpm(int(params[PARAM_BPM].getValue() * 100.0));
 	}else if (params[PARAM_SNAP].getValue() == 2){
-		bpmclock.setbpm(int( (params[PARAM_BPM].getValue() * 100.0) * 0.1) * 10.0f );
+		bpmclock.setbpm(int( (params[PARAM_BPM].getValue() * 100.0) * 0.2) * 5.0f );
 	}
-
+	
 	outputs[OUTPUT_RST].setVoltage((inputs[INPUT_RST].getVoltage() || params[PARAM_RST].getValue()) * 10.0);
-	bpmclock.setReset(outputs[OUTPUT_RST].value);
+	bpmclock.setReset(outputs[OUTPUT_RST].getVoltage());
 	
-	outputs[OUTPUT_BPM1].setVoltage(bpmclock.addcv((inputs[INPUT_BPM1].isConnected()) ? inputs[INPUT_BPM1].getVoltage() : 0.0f));
-	outputs[OUTPUT_BPM2].setVoltage(bpmclock.addcv((inputs[INPUT_BPM2].isConnected()) ? inputs[INPUT_BPM2].getVoltage() : 0.0f));
+	//external clock
+	if (inputs[INPUT_EXT].isConnected()){
+		float extcv = bpmclock.exttrack(inputs[INPUT_EXT].getVoltage(), args.sampleTime);
+		//extcv = (extcv > 0) ? (1.0f / extcv) * (60000.0f / args.sampleRate ) : 0.0f;//* 1.211387038158690f : 0.0f;
+		if (params[PARAM_SNAP].getValue() == 0){
+		bpmclock.addcv(bpmclock.bpmtocv(0.01) * roundf(extcv * 10000.0f));
+		}else if (params[PARAM_SNAP].getValue() == 1){
+		bpmclock.addcv(bpmclock.bpmtocv(1) * roundf(extcv * 100.0f));
+		}else if (params[PARAM_SNAP].getValue() == 2){
+		bpmclock.addcv(bpmclock.bpmtocv(5) * roundf(extcv * 20.0f));
+		}
+		isreset = false;
+	}else if (isreset == false){
+		bpmclock.extreset(true);
+		isreset = true;
+	}
+	outputs[OUTPUT_BPM1].setVoltage(bpmclock.getcv());
+
+	//add bpm cv
+	outputs[OUTPUT_BPM2].setVoltage(bpmclock.addcv((inputs[INPUT_BPM].isConnected()) ? inputs[INPUT_BPM].getVoltage() : 0.0f));
 
 	outputs[OUTPUT_D2].setVoltage(bpmclock.getcv() * 0.5);
 	outputs[OUTPUT_X2].setVoltage(bpmclock.getcv() * 2.0);
-	bpm_display = bpmclock.getbpm() / 2.0f;
+	bpm_display = bpmclock.getbpm();
 
 	bpmclock.step(args.sampleTime);
 
@@ -90,8 +107,8 @@ struct CM4ModuleWidget : ModuleWidget {
 		addParam(createParam<CM_Knob_huge_red_os>(Vec(3.6 , 56.0), module, CM4Module::PARAM_BPM));
 		addParam(createParam<CM_Switch_small_3>(Vec(7.0, 43.0), module, CM4Module::PARAM_SNAP));
 
-		addInput(createInput<CM_Input_bpm>(Vec(7.0 , 126.3), module, CM4Module::INPUT_BPM1));
-		addInput(createInput<CM_Input_bpm>(Vec(7.0 , 169.1), module, CM4Module::INPUT_BPM2));
+		addInput(createInput<CM_Input_ext>(Vec(0.0 , 126.3), module, CM4Module::INPUT_EXT));
+		addInput(createInput<CM_Input_bpm>(Vec(7.0 , 169.1), module, CM4Module::INPUT_BPM));
 
 		addOutput(createOutput<CM_Output_bpm>(Vec(44.4 , 126.3), module, CM4Module::OUTPUT_BPM1));
 		addOutput(createOutput<CM_Output_bpm>(Vec(44.4 , 169.1), module, CM4Module::OUTPUT_BPM2));
diff --git a/src/CatroModulo_CM-4.cpp.bak2 b/src/CatroModulo_CM-4.cpp.bak2
new file mode 100644
index 0000000..107fb7f
--- /dev/null
+++ b/src/CatroModulo_CM-4.cpp.bak2
@@ -0,0 +1,145 @@
+#include "CatroModulo.hpp"
+
+
+//Catro-Module CM-4: vcClk
+
+struct CM4Module : Module {
+
+	enum ParamIds {
+		PARAM_BPM,
+		PARAM_RST,
+		PARAM_SNAP,
+		NUM_PARAMS
+	};
+	enum InputIds {
+		INPUT_EXT,
+		INPUT_BPM,
+		INPUT_RST,
+		NUM_INPUTS
+	};
+	enum OutputIds {
+		OUTPUT_BPM1,
+		OUTPUT_BPM2,
+		OUTPUT_D2,
+		OUTPUT_X2,
+		OUTPUT_CLKD2,
+		OUTPUT_CLK,
+		OUTPUT_CLKX2,
+		OUTPUT_RST,
+		NUM_OUTPUTS
+	};
+	enum LightIds {
+		NUM_LIGHTS
+	};
+
+	float bpm_display = 0.0;
+	bool extconnect = false;
+    //create objects
+    CM_BpmClock bpmclock;
+	
+	CM4Module() {
+		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
+		configParam(CM4Module::PARAM_BPM, 0.0f, 6.0, 0.0f, "BPM", "", 0.0f, 50.0f);
+		configParam(CM4Module::PARAM_SNAP, 0.0f, 2.0f, 1.0f, "snap");
+		configParam(CM4Module::PARAM_RST, 0.0f, 1.0f, 0.0f, "reset");
+
+			//initialize objects
+	}
+	void process(const ProcessArgs &args) override;
+};
+
+void CM4Module::process(const ProcessArgs &args) {
+	if (params[PARAM_SNAP].getValue() == 0){
+		bpmclock.setbpm(bpmclock.cvtobpm(int((params[PARAM_BPM].getValue() * 100.0) * 100) / 100.0f));
+	}else if (params[PARAM_SNAP].getValue() == 1){
+		bpmclock.setbpm(int(params[PARAM_BPM].getValue() * 100.0));
+	}else if (params[PARAM_SNAP].getValue() == 2){
+		bpmclock.setbpm(int( (params[PARAM_BPM].getValue() * 100.0) * 0.2) * 5.0f );
+	}
+
+	outputs[OUTPUT_RST].setVoltage((inputs[INPUT_RST].getVoltage() || params[PARAM_RST].getValue()) * 10.0);
+	bpmclock.setReset(outputs[OUTPUT_RST].value);
+	
+	//external clock
+	if (inputs[INPUT_EXT].isConnected()){
+		float extcv = bpmclock.exttrack(inputs[INPUT_EXT].getVoltage(), args.sampleTime);
+		extcv = (extcv > 0.35) ? (1.0f / extcv) * 1.211387038158690f : 0.0f;
+		if (params[PARAM_SNAP].getValue() == 0){
+		bpmclock.addcv(extcv);
+		}else if (params[PARAM_SNAP].getValue() == 1){
+		bpmclock.addcv(bpmclock.bpmtocv(2) * roundf(extcv * 50.0f));
+		}else if (params[PARAM_SNAP].getValue() == 2){
+		bpmclock.addcv(bpmclock.bpmtocv(10) * roundf(extcv * 10.0f));
+		extconnect = true;
+		}
+	}else if (extconnect == true){
+		bpmclock.extreset(true);
+		extconnect = false;
+	}
+	outputs[OUTPUT_BPM1].setVoltage(bpmclock.getcv());
+
+	//add bpm cv
+	outputs[OUTPUT_BPM2].setVoltage(bpmclock.addcv((inputs[INPUT_BPM].isConnected()) ? inputs[INPUT_BPM].getVoltage() : 0.0f));
+
+	outputs[OUTPUT_D2].setVoltage(bpmclock.getcv() * 0.5);
+	outputs[OUTPUT_X2].setVoltage(bpmclock.getcv() * 2.0);
+	// bpm_display = bpmclock.getbpm() / 2.0f;
+	bpm_display = bpmclock.debug(); //temp debugging output
+
+	bpmclock.step(args.sampleTime);
+
+	outputs[OUTPUT_CLK].setVoltage(bpmclock.track(1) * 10.0);
+	outputs[OUTPUT_CLKD2].setVoltage(bpmclock.track(2) * 10.0);
+	outputs[OUTPUT_CLKX2].setVoltage(bpmclock.track(0) * 10.0);
+}
+
+struct CM4ModuleWidget : ModuleWidget {
+
+	CM4ModuleWidget(CM4Module *module) {
+		setModule(module);
+		setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/CM-4.svg")));
+
+		//addChild(createWidget<ScrewSilver>(Vec(30, 0)));
+		addChild(createWidget<ScrewSilver>(Vec(box.size.x - 16, 0)));
+		addChild(createWidget<ScrewSilver>(Vec(5, 365)));
+		// addChild(createWidget<ScrewSilver>(Vec(box.size.x - 60, 365)));
+
+		//UNIQUE ELEMENTS
+		addParam(createParam<CM_Knob_huge_red_os>(Vec(3.6 , 56.0), module, CM4Module::PARAM_BPM));
+		addParam(createParam<CM_Switch_small_3>(Vec(7.0, 43.0), module, CM4Module::PARAM_SNAP));
+
+		addInput(createInput<CM_Input_ext>(Vec(0.0 , 126.3), module, CM4Module::INPUT_EXT));
+		addInput(createInput<CM_Input_bpm>(Vec(7.0 , 169.1), module, CM4Module::INPUT_BPM));
+
+		addOutput(createOutput<CM_Output_bpm>(Vec(44.4 , 126.3), module, CM4Module::OUTPUT_BPM1));
+		addOutput(createOutput<CM_Output_bpm>(Vec(44.4 , 169.1), module, CM4Module::OUTPUT_BPM2));
+
+		addOutput(createOutput<CM_Output_bpm>(Vec(7.0 , 212.0), module, CM4Module::OUTPUT_D2));
+		addOutput(createOutput<CM_Output_bpm>(Vec(44.4 , 212.0), module, CM4Module::OUTPUT_X2));
+
+		addOutput(createOutput<CM_Output_def>(Vec(26.1 , 293.9), module, CM4Module::OUTPUT_CLK));
+		addOutput(createOutput<CM_Output_def>(Vec(3.5 , 326.5), module, CM4Module::OUTPUT_CLKD2));
+		addOutput(createOutput<CM_Output_def>(Vec(48.1 , 326.5), module, CM4Module::OUTPUT_CLKX2));
+
+		addInput(createInput<CM_Input_small>(Vec(6.2 , 251.8), module, CM4Module::INPUT_RST));
+		addParam(createParam<CM_Button_small_red>(Vec(29.4 , 251.8), module, CM4Module::PARAM_RST));
+		addOutput(createOutput<CM_Output_small>(Vec(52.4 , 251.8), module, CM4Module::OUTPUT_RST));
+
+		if (module)
+		{
+			//LCD display
+			NumDisplayWidget *display = new NumDisplayWidget();
+			display->box.pos = Vec(7.0, 21.0);
+			display->box.size = Vec(61.1, 20.4);
+			display->value = &module->bpm_display;
+			addChild(display);
+		}
+	}
+};
+
+
+// Specify the Module and ModuleWidget subclass, human-readable
+// author name for categorization per pluginInstance, module slug (should never
+// change), human-readable module name, and any number of tags
+// (found in `include/tags.hpp`) separated by commas.
+Model *modelCM4Module = createModel<CM4Module, CM4ModuleWidget>("CatroModulo_CM-4");
diff --git a/src/CatroModulo_CM-5.cpp b/src/CatroModulo_CM-5.cpp
index 580a09f..afd492f 100644
--- a/src/CatroModulo_CM-5.cpp
+++ b/src/CatroModulo_CM-5.cpp
@@ -47,7 +47,7 @@ struct CM5Module : Module {
 	
 	CM5Module() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-		configParam(CM5Module::PARAM_RST, 0.0f, 1.0f, 0.0f, "");
+		configParam(CM5Module::PARAM_RST, 0.0f, 1.0f, 0.0f, "reset");
 			//initialize objects
 	}
 	void process(const ProcessArgs &args) override;
diff --git a/src/CatroModulo_CM-7.cpp b/src/CatroModulo_CM-7.cpp
index 3f24a0a..d0c45d1 100644
--- a/src/CatroModulo_CM-7.cpp
+++ b/src/CatroModulo_CM-7.cpp
@@ -47,7 +47,7 @@ struct CM7Module : Module {
 	
 	CM7Module() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-		configParam(CM7Module::PARAM_RST, 0.0f, 1.0f, 0.0f, "");
+		configParam(CM7Module::PARAM_RST, 0.0f, 1.0f, 0.0f, "reset");
 			//initialize objects
 	}
 	void process(const ProcessArgs &args) override;
diff --git a/src/CatroModulo_CM-8.cpp b/src/CatroModulo_CM-8.cpp
index a4ea61c..e94eda0 100644
--- a/src/CatroModulo_CM-8.cpp
+++ b/src/CatroModulo_CM-8.cpp
@@ -10,6 +10,7 @@ struct CM8Module : Module {
 		PARAM__b,
         PARAM_CIA,
 		PARAM_BMODE,
+		PARAM_NORMALIZE,
 		NUM_PARAMS
 	};
 	enum InputIds {
@@ -70,10 +71,11 @@ struct CM8Module : Module {
 	
 	CM8Module() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-		configParam(CM8Module::PARAM__a, -10.0, 10.0, 0.0f, "Lower treshold");
-		configParam(CM8Module::PARAM__b, -10.0, 10.0, 0.0f, "Upper treshold");
-		configParam(CM8Module::PARAM_CIA, 0.0f, 2.0f, 0.0f, "Centered - Inversing - Additive");
-		configParam(CM8Module::PARAM_BMODE, 0.0f, 1.0f, 0.0f, "Binary mode");
+		configParam(CM8Module::PARAM__a, -10.0, 10.0, 0.0f, "lower treshold", "V");
+		configParam(CM8Module::PARAM__b, -10.0, 10.0, 0.0f, "upper treshold", "V");
+		configParam(CM8Module::PARAM_CIA, 0.0f, 2.0f, 0.0f, "centered < inversing > additive");
+		configParam(CM8Module::PARAM_BMODE, 0.0f, 1.0f, 0.0f, "binary mode");
+		configParam(CM8Module::PARAM_NORMALIZE, 0.0f, 1.0f, 0.0f, "normalize waveshapers");
 
 		srand(time(NULL));
 		cia = 1;
@@ -149,8 +151,8 @@ void CM8Module::process(const ProcessArgs &args) {
 	//A
 	outputs[OUTPUT_ALTB].setVoltage((binA > binB) * 10.0);
 	outputs[OUTPUT_AISB].setVoltage((binA == binB) * 10.0);
-	outputs[OUTPUT_ACLM].setVoltage(cm_clamp(binA, lo, hi));
-	outputs[OUTPUT_AFLD].setVoltage(cm_fold(binA, lo, hi));
+	outputs[OUTPUT_ACLM].setVoltage(cm_clamp(binA, lo, hi, params[PARAM_NORMALIZE].getValue()));
+	outputs[OUTPUT_AFLD].setVoltage(cm_fold(binA, lo, hi, params[PARAM_NORMALIZE].getValue()));
 	outputs[OUTPUT_ALO].setVoltage((currentA < lo) * 10.0);
 	outputs[OUTPUT_AHI].setVoltage((currentA > hi) * 10.0);
 	outputs[OUTPUT_ARNG].setVoltage((currentA >= lo && currentA <= hi) * 10.0);
@@ -158,8 +160,8 @@ void CM8Module::process(const ProcessArgs &args) {
 	//B
 	outputs[OUTPUT_BLTA].setVoltage((binA < binB) * 10.0);
 	outputs[OUTPUT_ANTB].setVoltage(!(binA == binB) * 10.0);
-	outputs[OUTPUT_BCLM].setVoltage(cm_clamp(binB, lo, hi));
-	outputs[OUTPUT_BFLD].setVoltage(cm_fold(binB, lo, hi));
+	outputs[OUTPUT_BCLM].setVoltage(cm_clamp(binB, lo, hi, params[PARAM_NORMALIZE].getValue()));
+	outputs[OUTPUT_BFLD].setVoltage(cm_fold(binB, lo, hi, params[PARAM_NORMALIZE].getValue()));
 	outputs[OUTPUT_BLO].setVoltage((currentB < lo) * 10.0);
 	outputs[OUTPUT_BHI].setVoltage((currentB > hi) * 10.0);
 	outputs[OUTPUT_BRNG].setVoltage((currentB >= lo && currentB <= hi) * 10.0);
@@ -191,6 +193,7 @@ struct CM8ModuleWidget : ModuleWidget {
 		addParam(createParam<CM_Switch_small_3>(Vec(16.4, 103.3), module, CM8Module::PARAM_CIA));
 		addParam(createParam<CM_Ledbutton_mini>(Vec(5.0, 117.2), module, CM8Module::PARAM_BMODE));
 		addInput(createInput<CM_Input_small>(Vec(54.0 , 112.7), module, CM8Module::INPUT_SNH));
+		addParam(createParam<CM_8_normalizebutton>(Vec(25.0 , 241.3), module, CM8Module::PARAM_NORMALIZE));
 
 		float a = 5.4;
 		float b = 46.0;
diff --git a/src/CatroModulo_CM-9.cpp b/src/CatroModulo_CM-9.cpp
index f937e5e..444ee1d 100644
--- a/src/CatroModulo_CM-9.cpp
+++ b/src/CatroModulo_CM-9.cpp
@@ -45,18 +45,41 @@ struct CM9Module : Module {
 	float ins[8];
 	float outs[8];
 	bool gatemode = 0;
+	int opmode = 0;
 	
 	CM9Module() {
 		config(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS);
-		configParam(CM9Module::PARAM_SEL, 0.0, 7.0, 0.0f, "");
-
+		configParam(CM9Module::PARAM_SEL, 0.0, 7.0, 0.0f, "selector", "", 0.0f, 1.0f, 1.0f);
 	}
 
 	void process(const ProcessArgs &args) override;
 
+	void onReset() override{
+		opmode = 0;
+	}
+
+	json_t *dataToJson() override {
+
+		json_t *rootJ = json_object();
+		json_t *opmodeJ = json_array();
+		json_array_append_new(opmodeJ, json_integer(opmode));
+		json_object_set_new(rootJ, "opmode", opmodeJ);
+	
+		return rootJ;
+	}
+
+
+	void dataFromJson(json_t *rootJ) override {
+		// load opmode
+		json_t *opmodeJ = json_object_get(rootJ, "opmode");
+		opmode = json_integer_value(json_array_get(opmodeJ, 0));
+	}
 };
 
 void CM9Module::process(const ProcessArgs &args) {
+
+	gatemode = true;
+
 	//process inputs
 	int inputsconnected = 0;
 	for (int i = 0; i < 8; i++){
@@ -64,10 +87,11 @@ void CM9Module::process(const ProcessArgs &args) {
 			inputsconnected++;
 			ins[i] = inputs[INPUT_IN + i].getVoltage();
 		}else{
-			ins[i] = 10.0;
+			ins[i] = 0.0f;
 		}
 	}
-
+	gatemode = (inputsconnected == 0 && inputs[INPUT_1].isConnected() == false);
+	
 	//process selector
 	float selectorparam = clamp(round((inputs[INPUT_SEL].isConnected()) ? inputs[INPUT_SEL].getVoltage() * 0.1 * params[PARAM_SEL].getValue() : params[PARAM_SEL].getValue()), 0, 7);
 
@@ -88,35 +112,69 @@ void CM9Module::process(const ProcessArgs &args) {
 	//process outputs
 	//reset all to 0
 	for (int i = 0; i < NUM_OUTPUTS; i++){
-			outputs[OUTPUT_OUT + i].setVoltage(0.0);
+			outputs[OUTPUT_OUT + i].setVoltage(0.0f);
 		}
-	gatemode = true;
+	outputs[OUTPUT_1].setVoltage(selector * 1.4285714285714285714285714285714f);
 
-	if (inputs[INPUT_1].isConnected()){
-		outputs[OUTPUT_OUT + selector].setVoltage(inputs[INPUT_1].getVoltage());
-		gatemode = false;
-	}
-	if (outputs[OUTPUT_1].isConnected()){
-		if (inputsconnected > 0){
-			outputs[OUTPUT_1].setVoltage(inputs[INPUT_IN + selector].getVoltage());
+	if (gatemode == true){
+		if (inputs[INPUT_CLK].isConnected()){
+			outputs[OUTPUT_OUT + selector].setVoltage((inputs[INPUT_CLK].getVoltage() > 0) ? 10.0f : 0.0f);
 		}else{
-			outputs[OUTPUT_1].setVoltage(selector * 1.4285714285714285714285714285714f);
+			outputs[OUTPUT_OUT + selector].setVoltage(10.0f);
+		}
+	}else{
+		if (inputs[INPUT_1].isConnected()){
+			outputs[OUTPUT_OUT + selector].setVoltage(inputs[INPUT_1].getVoltage());
+		}else if (inputsconnected > 0){
+			outputs[OUTPUT_OUT + selector].setVoltage(ins[selector]);
 		}
-		
-		
-	}
-	if (gatemode == true){
 		if (inputsconnected > 0){
-			outputs[OUTPUT_OUT + selector].setVoltage(inputs[INPUT_IN + selector].getVoltage());
-		}else{
-			if (inputs[INPUT_CLK].isConnected()){
-				outputs[OUTPUT_OUT + selector].setVoltage((inputs[INPUT_CLK].getVoltage() > 0) ? 10.0f : 0.0f);
+			outputs[OUTPUT_1].setVoltage(ins[selector]);
+		}
+	}
+
+	if (opmode > 0){
+		if (gatemode == true){
+			for (int i = 0; i < 8; i++){
+				float tempval = outputs[OUTPUT_OUT + i].getVoltage();
+				outputs[OUTPUT_OUT + i].setVoltage(10.0f - tempval);
+			}
+		}else if (opmode == 1){
+			for (int i = 0; i < 8; i++){
+				float tempval = outputs[OUTPUT_OUT + i].getVoltage();
+				outputs[OUTPUT_OUT + i].setVoltage(0.0f - tempval);
+			}
+			if (inputsconnected > 0){
+				outputs[OUTPUT_1].setVoltage(0.0f - ins[selector]);
+			}
+		}else if (opmode == 2){
+
+			if (inputsconnected > 0){
+				for (int i = 0; i < 8; i++){
+					outputs[OUTPUT_OUT + i].setVoltage(0.0f - inputs[INPUT_IN + i].getVoltage());
+				}
+				outputs[OUTPUT_1].setVoltage(outputs[OUTPUT_OUT + selector].getVoltage());
 			}else{
-				outputs[OUTPUT_OUT + selector].setVoltage(10.0f);
+				for (int i = 0; i < 8; i++){
+					outputs[OUTPUT_OUT + i].setVoltage(0.0f - inputs[INPUT_1].getVoltage());
+				}
 			}
+			
+			outputs[OUTPUT_OUT + selector].setVoltage(0.0f);
+		}else if (opmode == 3){
+			if (inputsconnected > 0){
+				for (int i = 0; i < 8; i++){
+					outputs[OUTPUT_OUT + i].setVoltage(inputs[INPUT_IN + i].getVoltage());
+				}
+				outputs[OUTPUT_1].setVoltage(outputs[OUTPUT_OUT + selector].getVoltage());
+			}else{
+				for (int i = 0; i < 8; i++){
+					outputs[OUTPUT_OUT + i].setVoltage(inputs[INPUT_1].getVoltage());
+				}
+			}
+			outputs[OUTPUT_OUT + selector].setVoltage(0.0f);
 		}
 	}
-
 	//indicator leds
 	ledy = 114.1 + 27.7 * selector;
 
@@ -134,7 +192,7 @@ struct CM9ModuleWidget : ModuleWidget {
 		// addChild(createWidget<ScrewSilver>(Vec(box.size.x - 60, 365)));
 
 		//widget items
-        addParam(createParam<CM_Knob_big_def_tt>(Vec(7.0 , 20.2), module, CM9Module::PARAM_SEL));
+        addParam(createParam<CM_Knob_big_def_tts>(Vec(7.0 , 20.2), module, CM9Module::PARAM_SEL));
 
 		addInput(createInput<CM_Input_small>(Vec(2.8, 65.9), module, CM9Module::INPUT_SEL));
         addInput(createInput<CM_Input_small>(Vec(50.2 , 30.0), module, CM9Module::INPUT_CLK));
@@ -157,13 +215,19 @@ struct CM9ModuleWidget : ModuleWidget {
 
         addOutput(createOutput<CM_Output_def>(Vec(25.7 , 326.6), module, CM9Module::OUTPUT_1));
 
-		//led selector display
+		
 		if (module)
 		{
+			//led selector display
 			CM9_LedIndicator *ledindicator = new CM9_LedIndicator();
 			ledindicator->posx = &module->ledx;
 			ledindicator->posy = &module->ledy;
 			addChild(ledindicator);
+
+			//Operating mode selector
+			CM_OP *opswitch = new CM_OP(53.7, 333.9f);
+			opswitch->opmode = &module->opmode;
+			addChild(opswitch);
 		}
 	}
 };