diff --git a/templates/jtccr.svg b/templates/jtccr.svg
index 367b564..1536016 100644
--- a/templates/jtccr.svg
+++ b/templates/jtccr.svg
@@ -692,16 +692,16 @@
        cy="217.45926"
        r="3" />
     <path
-       id="V"
+       id="v"
        style="fill:#e5e5e5;fill-opacity:1;stroke:#000000;stroke-width:0.364156;stroke-dasharray:none;stroke-opacity:1"
        d="m 103.05848,212.57605 0.0121,4.64216 0.0517,4.87763 z m 6.48731,-0.0165 -0.005,4.67125 -0.005,4.67126 -3.23198,-2.34196 -3.23199,-2.34197 3.23784,-2.32929 z"
        sodipodi:nodetypes="ccccccccccc"
        inkscape:label="V" />
     <g
-       id="V5">
+       id="v5">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V5:-click"
+         id="v5:-click"
          cx="-134.72661"
          cy="-55.261589"
          transform="scale(-1)"
@@ -709,7 +709,7 @@
          ry="5.9069905"
          inkscape:label="V5:-click" />
       <path
-         id="V5:-state"
+         id="v5:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 134.74377,61.168219 a 5.9181489,5.9068489 0 0 0 4.07331,-1.658259 l -1.26311,-1.27566 -2.92562,-2.954264 -2.90369,2.986501 -1.171,1.204316 a 5.9181489,5.9068489 0 0 0 4.19011,1.697366 z m -0.11542,-5.888183 2.90868,-2.981171 1.2667,-1.298167 a 5.9181489,5.9068489 0 0 0 -4.13645,-1.645733 5.9181489,5.9068489 0 0 0 -4.16696,1.750447 l 1.20696,1.220742 z"
          inkscape:label="V5:-state" />
@@ -731,18 +731,18 @@
            y="46.528187">V5</tspan></text>
     </g>
     <g
-       id="V9"
+       id="v9"
        inkscape:label="V9">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V9:-click"
+         id="v9:-click"
          cx="43.140038"
          cy="179.26065"
          rx="5.9182906"
          ry="5.9069905"
          inkscape:label="V9:-click" />
       <path
-         id="V9:-state"
+         id="v9:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 43.122871,173.35402 a 5.9181489,5.9068489 0 0 0 -4.073313,1.65826 l 1.26311,1.27566 2.92562,2.95427 2.903686,-2.9865 1.171002,-1.20432 a 5.9181489,5.9068489 0 0 0 -4.190105,-1.69737 z m 0.115417,5.88819 -2.908682,2.98117 -1.266698,1.29817 a 5.9181489,5.9068489 0 0 0 4.136452,1.64573 5.9181489,5.9068489 0 0 0 4.166954,-1.75045 l -1.206955,-1.22074 z"
          inkscape:label="V9:-state" />
@@ -759,12 +759,12 @@
            y="170.25491">V9</tspan></text>
     </g>
     <g
-       id="V8"
+       id="v8"
        transform="translate(-0.65283821,-2.5221618)"
        inkscape:label="V8">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V8:-click"
+         id="v8:-click"
          cx="199.45615"
          cy="-66.386192"
          transform="rotate(90)"
@@ -772,7 +772,7 @@
          ry="5.9069905"
          inkscape:label="V8:-click" />
       <path
-         id="V8:-state"
+         id="v8:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 72.292824,199.43897 a 5.9068489,5.9181489 0 0 0 -1.658259,-4.07331 l -1.27566,1.26311 -2.954264,2.92562 2.986501,2.90369 1.204316,1.171 a 5.9068489,5.9181489 0 0 0 1.697366,-4.19011 z m -5.888183,0.11542 -2.981171,-2.90868 -1.298167,-1.2667 a 5.9068489,5.9181489 0 0 0 -1.645733,4.13645 5.9068489,5.9181489 0 0 0 1.750447,4.16696 l 1.220742,-1.20696 z"
          inkscape:label="V8:-state" />
@@ -789,11 +789,11 @@
            y="201.45016">V8</tspan></text>
     </g>
     <g
-       id="V4"
+       id="v4"
        inkscape:label="V4">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V4:-click"
+         id="v4:-click"
          cx="-95.040253"
          cy="-55.175602"
          inkscape:label="V4:-click"
@@ -801,7 +801,7 @@
          rx="5.9182906"
          ry="5.9069905" />
       <path
-         id="V4:-state"
+         id="v4:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 95.057417,61.082234 a 5.9181489,5.9068489 0 0 0 4.073313,-1.658259 l -1.26311,-1.27566 -2.92562,-2.954264 -2.903686,2.986501 -1.171002,1.204316 a 5.9181489,5.9068489 0 0 0 4.190105,1.697366 z M 94.942,55.194051 97.850682,52.21288 99.11738,50.914713 a 5.9181489,5.9068489 0 0 0 -4.136452,-1.645733 5.9181489,5.9068489 0 0 0 -4.166954,1.750447 l 1.206955,1.220742 z"
          inkscape:label="V4:-state" />
@@ -823,11 +823,11 @@
            y="46.61417">V4</tspan></text>
     </g>
     <g
-       id="V6"
+       id="v6"
        inkscape:label="V6">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V6:-click"
+         id="v6:-click"
          cx="-135.38646"
          cy="-133.45741"
          rx="5.9182906"
@@ -835,7 +835,7 @@
          transform="scale(-1)"
          inkscape:label="V6:-click" />
       <path
-         id="V6:-state"
+         id="v6:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 135.47032,139.43074 a 5.9181489,5.9068489 0 0 0 4.07331,-1.65826 l -1.26311,-1.27566 -2.92562,-2.95427 -2.90369,2.9865 -1.171,1.20432 a 5.9181489,5.9068489 0 0 0 4.19011,1.69737 z m -0.11542,-5.88819 2.90868,-2.98117 1.2667,-1.29817 a 5.9181489,5.9068489 0 0 0 -4.13645,-1.64573 5.9181489,5.9068489 0 0 0 -4.16696,1.75045 l 1.20696,1.22074 z"
          inkscape:label="V6:-state" />
@@ -862,7 +862,7 @@
            id="tspan58" /></text>
     </g>
     <g
-       id="V3"
+       id="v3"
        inkscape:label="V3">
       <text
          xml:space="preserve"
@@ -882,7 +882,7 @@
            y="125.27914">V3</tspan></text>
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V3:-click"
+         id="v3:-click"
          cx="-95.040253"
          cy="-133.52124"
          transform="scale(-1)"
@@ -890,17 +890,17 @@
          ry="5.9069905"
          inkscape:label="V3:-click" />
       <path
-         id="V3:-state"
+         id="v3:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 95.057417,139.42788 a 5.9181489,5.9068489 0 0 0 4.073313,-1.65826 l -1.26311,-1.27566 -2.92562,-2.95427 -2.903686,2.9865 -1.171002,1.20432 a 5.9181489,5.9068489 0 0 0 4.190105,1.69737 z m -0.115417,-5.88819 2.908682,-2.98117 1.266698,-1.29817 a 5.9181489,5.9068489 0 0 0 -4.136452,-1.64573 5.9181489,5.9068489 0 0 0 -4.166954,1.75045 l 1.206955,1.22074 z"
          inkscape:label="V3:-state" />
     </g>
     <g
-       id="V7"
+       id="v7"
        inkscape:label="V7">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V7:-click"
+         id="v7:-click"
          cx="159.99113"
          cy="-114.64465"
          transform="rotate(90)"
@@ -908,7 +908,7 @@
          ry="5.9069905"
          inkscape:label="V7:-click" />
       <path
-         id="V7:-state"
+         id="v7:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 120.55128,159.97396 a 5.9068489,5.9181489 0 0 0 -1.65826,-4.07331 l -1.27566,1.26311 -2.95427,2.92562 2.9865,2.90369 1.20432,1.171 a 5.9068489,5.9181489 0 0 0 1.69737,-4.19011 z m -5.88819,0.11542 -2.98117,-2.90868 -1.29817,-1.2667 a 5.9068489,5.9181489 0 0 0 -1.64573,4.13645 5.9068489,5.9181489 0 0 0 1.75045,4.16696 l 1.22074,-1.20696 z"
          inkscape:label="V7:-state" />
@@ -930,11 +930,11 @@
            y="162.01134">V7</tspan></text>
     </g>
     <g
-       id="V10"
+       id="v10"
        inkscape:label="V10">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V10:-click"
+         id="v10:-click"
          cx="238.85155"
          cy="-95.040253"
          transform="rotate(90)"
@@ -942,7 +942,7 @@
          ry="5.9069905"
          inkscape:label="V10:-click" />
       <path
-         id="V10:-state"
+         id="v10:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 100.94689,238.83438 a 5.9068489,5.9181489 0 0 0 -1.658264,-4.07331 l -1.27566,1.26311 -2.954264,2.92562 2.986501,2.90369 1.204316,1.171 a 5.9068489,5.9181489 0 0 0 1.697371,-4.19011 z m -5.888188,0.11542 -2.981171,-2.90868 -1.298167,-1.2667 a 5.9068489,5.9181489 0 0 0 -1.645733,4.13645 5.9068489,5.9181489 0 0 0 1.750447,4.16696 l 1.220742,-1.20696 z"
          inkscape:label="V10:-state" />
@@ -959,11 +959,11 @@
            y="241.37473">V10</tspan></text>
     </g>
     <g
-       id="V2"
+       id="v2"
        inkscape:label="V2">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V2:-click"
+         id="v2:-click"
          cx="32.087536"
          cy="-65.935478"
          transform="rotate(90)"
@@ -971,7 +971,7 @@
          ry="5.9069905"
          inkscape:label="V2:-click" />
       <path
-         id="V2:-state"
+         id="v2:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 71.842112,32.070368 a 5.9068489,5.9181489 0 0 0 -1.658259,-4.073313 l -1.27566,1.26311 -2.954264,2.92562 2.986501,2.903686 1.204316,1.171002 a 5.9068489,5.9181489 0 0 0 1.697366,-4.190105 z m -5.888183,0.115417 -2.981171,-2.908682 -1.298167,-1.266698 a 5.9068489,5.9181489 0 0 0 -1.645733,4.136452 5.9068489,5.9181489 0 0 0 1.750447,4.166954 l 1.220742,-1.206955 z"
          inkscape:label="V2:-state" />
@@ -988,11 +988,11 @@
            y="34.116005">V2</tspan></text>
     </g>
     <g
-       id="V1"
+       id="v1"
        inkscape:label="V1">
       <ellipse
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="V1:-click"
+         id="v1:-click"
          cx="112.83993"
          cy="-65.943611"
          transform="rotate(90)"
@@ -1000,7 +1000,7 @@
          ry="5.9069905"
          inkscape:label="V1:-click" />
       <path
-         id="V1:-state"
+         id="v1:-state"
          style="fill:#eaeaea;fill-opacity:1;stroke:#000000;stroke-width:0.299;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 71.850243,112.82276 a 5.9068489,5.9181489 0 0 0 -1.658259,-4.07331 l -1.27566,1.26311 -2.954264,2.92562 2.986501,2.90369 1.204316,1.171 a 5.9068489,5.9181489 0 0 0 1.697366,-4.19011 z m -5.888183,0.11542 -2.981171,-2.90868 -1.298167,-1.2667 a 5.9068489,5.9181489 0 0 0 -1.645733,4.13645 5.9068489,5.9181489 0 0 0 1.750447,4.16696 l 1.220742,-1.20696 z"
          inkscape:label="V1:-state" />
@@ -1056,7 +1056,7 @@
          id="tspan34-9-9"
          style="font-size:5.64444px;stroke-width:0.2"
          x="11.994142"
-         y="56.479591">* mbar</tspan></text>
+         y="56.479591">* bar</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -1068,7 +1068,7 @@
          id="tspan34-9-9-8"
          style="font-size:5.64444px;stroke-width:0.2"
          x="14.415089"
-         y="219.61841">* mbar</tspan></text>
+         y="219.61841">* bar</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -1080,7 +1080,7 @@
          id="tspan34-9-9-6"
          style="font-size:5.64444px;stroke-width:0.2"
          x="178.86285"
-         y="218.68578">* mbar</tspan></text>
+         y="218.68578">* bar</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr-tb;direction:ltr;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"