diff --git a/resources/medeco.svg b/resources/medeco.svg
index 3822beb..281a99f 100644
--- a/resources/medeco.svg
+++ b/resources/medeco.svg
@@ -7,6 +7,7 @@
    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:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="210mm"
@@ -15,9 +16,22 @@
    version="1.1"
    id="svg14868"
    inkscape:version="0.92.1 r"
-   sodipodi:docname="medeco2.svg">
+   sodipodi:docname="medeco.svg">
   <defs
-     id="defs14862" />
+     id="defs14862">
+    <clipPath
+       clip-path="url(#clipPathH)"
+       id="clipPathJ"
+       clipPathUnits="userSpaceOnUse">
+      <use
+         height="100%"
+         width="100%"
+         y="0"
+         x="0"
+         xlink:href="#path11026"
+         id="use6" />
+    </clipPath>
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,14 +39,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-354.28571"
-     inkscape:cy="560"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="226.13746"
+     inkscape:cy="558.8381"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1788"
-     inkscape:window-height="1763"
+     inkscape:window-width="3200"
+     inkscape:window-height="1767"
      inkscape:window-x="0"
      inkscape:window-y="33"
      inkscape:window-maximized="0" />
@@ -44,7 +58,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>
@@ -277,5 +291,135 @@
          sodipodi:role="line"
          x="-129.77797 -127.61092 -125.44771 -123.28066">1517</tspan>
     </text>
+    <path
+       clip-path="url(#clipPathJ)"
+       transform="matrix(0.35277769,0,0,-0.35277769,2.8631455,500.03783)"
+       inkscape:connector-curvature="0"
+       id="path11038"
+       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 95.1521,550.696 c -0.5743,0.339 -1.0464,0.827 -1.3663,1.412 l -4e-4,-0.002 -0.4937,0.907 c -0.1919,0.351 -0.5596,0.569 -0.959,0.569 -0.4492,0 -0.8525,-0.275 -1.0171,-0.693 l 0.0034,-0.005 -0.6293,-1.605 c -0.1797,-0.456 -0.6207,-0.757 -1.1109,-0.757 h -2.1787 c -0.3569,0 -0.647,0.29 -0.647,0.648 v 5.198 c 0,0.358 0.2901,0.648 0.647,0.648 l 0.791,-0.007 c 0.5303,0 1,-0.342 1.1631,-0.848 l 0.002,0.006 0.0825,-0.272 c 0.1489,-0.46 0.5771,-0.772 1.0605,-0.772 0.2417,0 0.4771,0.078 0.6704,0.224 l -0.0019,-10e-4 1.792,1.35 c 0.2192,0.165 0.4863,0.255 0.7607,0.255 0.4556,0 0.876,-0.245 1.1006,-0.641 l -5e-4,0.001 0.44,-0.762 c 0.1391,-0.245 0.3999,-0.398 0.6816,-0.398 0.2646,0 0.5107,0.134 0.6558,0.355 l -0.0015,-0.002 0.6269,0.961 c 0.2046,0.312 0.5528,0.501 0.9263,0.501 0.4302,0 0.8218,-0.25 1.0039,-0.641 h 0.0029 l 0.1534,-0.33 c 0.1093,-0.236 0.3125,-0.417 0.5586,-0.499 l 0.0019,-0.004 c 0.2891,-0.097 0.5918,-0.146 0.8965,-0.146 0.3623,0 0.7207,0.07 1.0566,0.205 l -0.002,0.003 c 0.1475,0.059 0.2754,0.158 0.3721,0.286 l 0.005,0.003 0.1807,0.247 c 0.2041,0.27 0.5225,0.43 0.8613,0.43 h 1.92 v -4.306 h -1.294 c -0.5351,0 -1.0264,-0.296 -1.2773,-0.769 l 0.004,-0.001 -0.166,-0.308 c -0.2051,-0.387 -0.6055,-0.628 -1.0411,-0.628 -0.3125,0 -0.6132,0.124 -0.8339,0.345 l -0.001,-0.006 -1.5581,1.55 c -0.1455,0.146 -0.3428,0.228 -0.5484,0.228 -0.2734,0 -0.5268,-0.145 -0.667,-0.379 l -0.0019,0.004 -0.6172,-1.041 c -0.2646,-0.443 -0.7432,-0.715 -1.2593,-0.715 -0.2617,0 -0.519,0.069 -0.7446,0.203 l -0.0024,-10e-4" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ff0000;stroke:#211c1c;stroke-width:0.08819442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 22.977979,271.86938 c 0,1.97231 1.60421,3.57291 3.58118,3.57291 h 17.347257 c 1.97679,0 3.58117,-1.6006 3.58117,-3.57291 v -0.65164 c 0,-0.79047 0.64304,-1.43144 1.43506,-1.43144 h 2.55281 c 0.28025,0 0.50798,-0.22719 0.50798,-0.50694 v -1.24954 c 0,-0.13988 0.11354,-0.25322 0.25373,-0.25322 l 24.89047,1e-5 c 0.30869,0 0.55914,-0.24979 0.55914,-0.55759 v -0.55759 c 0,-0.62823 0.49858,-1.14361 1.12758,-1.1653 v -10e-4 c 0.36266,-0.0124 0.65061,-0.30903 0.65061,-0.67076 0,-0.16606 -0.0618,-0.32626 -0.1726,-0.44959 l -2.66495,-2.95176 c -0.0483,-0.0532 -0.11618,-0.0832 -0.18811,-0.0832 h -24.20214 c -0.14019,0 -0.25373,-0.11385 -0.25373,-0.25373 v -1.17357 c 0,-0.7276 -0.59169,-1.31723 -1.32085,-1.31723 h -1.73994 c -0.79202,0 -1.43506,-0.64163 -1.43506,-1.43195 v -0.65164 c 0,-1.972 -1.60438,-3.57343 -3.58117,-3.57343 H 26.559159 c -1.97697,0 -3.58118,1.60143 -3.58118,3.57343 z m 2.40657,-7.65431 c 0,-1.52496 1.24025,-2.76263 2.76831,-2.76263 1.52827,0 2.76882,1.23767 2.76882,2.76263 0,1.52481 -1.24055,2.7621 -2.76882,2.7621 -1.52806,0 -2.76831,-1.23729 -2.76831,-2.7621 z"
+       id="outline_1655"
+       inkscape:label="#path27478" />
+    <text
+       y="95.605949"
+       x="-268.58673"
+       id="text9248"
+       style="font-variant:normal;font-weight:bold;font-size:4.23333216px;font-family:Helvetica;-inkscape-font-specification:Helvetica-Bold;writing-mode:lr-tb;fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277769"
+       transform="rotate(-90)">
+      <tspan
+         style="stroke-width:0.35277769"
+         id="tspan9246"
+         sodipodi:role="line"
+         y="95.605949"
+         x="-268.58673 -266.42166 -264.25842 -262.09146">1655</tspan>
+    </text>
+    <path
+       style="fill:#0000ff;stroke:#211c1c;stroke-width:0.08819442;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 85.611076,267.77644 h 1.651 c 0.2099,0 0.381,-0.17036 0.381,-0.38015 v -0.63098 c 0,-0.12436 -0.0759,-0.23615 -0.19156,-0.28233 l 0.001,-10e-4 -0.60148,-0.23993 c -0.1711,-0.0681 -0.28258,-0.23307 -0.28258,-0.41634 0,-0.15709 0.0818,-0.30283 0.21696,-0.38397 l -0.001,-10e-4 0.56656,-0.34039 c 0.18097,-0.10919 0.2921,-0.30505 0.2921,-0.51622 v -1.43919 l -0.38382,-0.44022 c -0.0607,-0.0689 -0.0938,-0.15776 -0.0938,-0.24942 v -1.16582 h -1.2319 v 0.50711 c 0,0.19707 -0.1143,0.37621 -0.29281,0.45958 l 8e-4,-8e-4 -0.0854,0.04 c -0.1524,0.0709 -0.24941,0.22324 -0.24941,0.39067 v 1.0287 c 0,0.14608 0.0737,0.28197 0.19614,0.36138 l -8e-4,-10e-4 0.33585,0.21876 c 0.0868,0.0562 0.13899,0.15212 0.13899,0.25513 0,0.10869 -0.0579,0.20908 -0.1524,0.26339 v 1.4e-4 l -0.33867,0.19328 c -0.1016,0.0584 -0.16404,0.16641 -0.16404,0.28318 0,0.0691 0.0219,0.13628 0.0624,0.19208 l 8e-4,2.7e-4 0.52457,0.72245 c 0.0536,0.0736 0.0826,0.16225 0.0826,0.25323 0,0.17191 -0.10265,0.32745 -0.26035,0.39564 l 0.001,-2.6e-4 -0.24271,0.1035 c -0.11148,0.048 -0.18379,0.1578 -0.18379,0.27922 v 0.23822 c 0,0.16779 0.13617,0.30403 0.30444,0.30403 z"
+       id="warding_1655"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssscccscccsccsccscccsscccscccscccscccsscc"
+       inkscape:label="#path27480" />
+    <path
+       style="opacity:0.42000002;fill:#00ff00;stroke:#211c1c;stroke-width:0.08819442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 46.928866,257.16488 v -0.6539 c 0,-1.66465 -1.35411,-3.01583 -3.02239,-3.01583 H 26.559059 c -1.66829,0 -3.02239,1.35118 -3.02239,3.01583 v 15.3574 c 0,1.66465 1.3541,3.01564 3.02239,3.01564 h 17.347417 c 1.66828,0 3.02239,-1.35099 3.02239,-3.01564 v -0.6513 -5.47513 z"
+       id="engrave_1655"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssssssccc"
+       inkscape:label="#path10946" />
+    <text
+       y="97.354179"
+       x="-239.6091"
+       id="text9256"
+       style="font-variant:normal;font-weight:bold;font-size:4.23333216px;font-family:Helvetica;-inkscape-font-specification:Helvetica-Bold;writing-mode:lr-tb;fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277769"
+       transform="rotate(-90)">
+      <tspan
+         style="stroke-width:0.35277769"
+         id="tspan9254"
+         sodipodi:role="line"
+         y="97.354179"
+         x="-239.6091 -237.44588 -235.28264 -233.11382">1644</tspan>
+    </text>
+    <path
+       id="outline_1644"
+       style="fill:#ff0000;stroke:#231f20;stroke-width:0.17638884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 28.547569,235.15077 c 0,1.7501 1.42215,3.17052 3.17468,3.17052 1.75217,0 3.17447,-1.42042 3.17447,-3.17052 0,-1.75027 -1.4223,-3.17104 -3.17447,-3.17104 -1.75253,0 -3.17468,1.42077 -3.17468,3.17104 z m 21.468627,-7.5408 v 0.83718 c 0,0.83989 0.68266,1.52203 1.52379,1.52203 h 1.92768 c 0.67282,0 1.21889,0.54535 1.21889,1.2175 v 1.26848 c 0,0.13988 0.11387,0.25355 0.25407,0.25355 h 23.7915 c 0.21378,0 0.41769,0.0896 0.56233,0.24736 l -7.9e-4,10e-4 2.41653,2.6379 c 0.32561,0.35553 0.50624,0.81975 0.50624,1.30139 0,0.54431 -0.23001,1.06314 -0.63394,1.42851 l -7.9e-4,-2.6e-4 -0.84314,0.76119 c -0.0462,0.0424 -0.10724,0.0656 -0.17039,0.0656 h -25.62771 c -0.14019,0 -0.25407,0.1137 -0.25407,0.25376 v 1.39505 c 0,0.22409 -0.18189,0.40584 -0.40619,0.40584 h -2.74038 c -0.84112,0 -1.52378,0.68195 -1.52378,1.52202 0,1.94807 -1.55081,3.54313 -3.50055,3.60034 -2.92128,0.0856 -5.84358,0.12831 -8.766062,0.12831 -2.92227,0 -5.84458,-0.0427 -8.76586,-0.12831 -1.949605,-0.0572 -3.500595,-1.6523 -3.500595,-3.60037 v -15.11812 c 0,-1.94786 1.55099,-3.54291 3.50058,-3.60013 2.92128,-0.0854 5.84359,-0.12884 8.76603,-0.12884 2.922487,0 5.844787,0.0434 8.765887,0.12884 1.94974,0.0572 3.50055,1.65227 3.50055,3.60013 z"
+       inkscape:connector-curvature="0"
+       inkscape:label="#path11030" />
+    <path
+       inkscape:connector-curvature="0"
+       id="engrave_1644"
+       style="opacity:0.453;fill:#00ff00;stroke:#231f20;stroke-width:0.17638884;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 49.457576,242.72671 c 0,1.64645 -1.31067,2.99434 -2.95829,3.04274 -2.91574,0.0853 -5.83254,0.12817 -8.749687,0.12799 -2.91695,0 -5.83375,-0.0426 -8.74949,-0.12799 -1.64765,-0.0484 -2.95815,-1.39629 -2.95815,-3.04274 v -15.11776 c 0,-1.64641 1.3105,-2.99413 2.95815,-3.04235 h 1.8e-4 c 2.91556,-0.0854 5.83254,-0.12817 8.74948,-0.12817 2.916977,0 5.833777,0.0427 8.749517,0.12817 1.64762,0.0482 2.95829,1.39594 2.95829,3.04235 v 8.93115 z"
+       inkscape:label="#path11034" />
+    <path
+       inkscape:connector-curvature="0"
+       id="warding_1644"
+       style="fill:#0000ff;stroke:#231f20;stroke-width:0.088;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 87.342683,236.51379 c -0.11959,0.2026 -0.29174,0.36914 -0.49812,0.482 l 8e-4,1.4e-4 -0.31996,0.17416 c -0.12383,0.0677 -0.20074,0.19742 -0.20074,0.33832 0,0.15847 0.097,0.30074 0.24448,0.35881 l 0.002,-0.001 0.56621,0.222 c 0.16082,0.0634 0.267,0.21897 0.267,0.3919 v 0.7686 c 0,0.1259 -0.1023,0.22825 -0.2286,0.22825 h -1.83374 c -0.12629,0 -0.2286,-0.10235 -0.2286,-0.22825 l 0.002,-0.27905 c 0,-0.18708 0.12065,-0.35278 0.29916,-0.41031 l -0.002,-7.1e-4 0.096,-0.0291 c 0.16228,-0.0525 0.27235,-0.20359 0.27235,-0.37412 0,-0.0853 -0.0275,-0.16831 -0.079,-0.2365 l 2.6e-4,6.6e-4 -0.47625,-0.63218 c -0.0582,-0.0773 -0.09,-0.17155 -0.09,-0.26836 0,-0.16072 0.0864,-0.30903 0.22613,-0.38826 l -2.6e-4,1.7e-4 0.26881,-0.15522 c 0.0864,-0.0491 0.14041,-0.14108 0.14041,-0.24045 0,-0.0933 -0.0473,-0.18017 -0.12524,-0.23135 l 7.9e-4,5.3e-4 -0.33902,-0.22115 c -0.11007,-0.0722 -0.17675,-0.19502 -0.17675,-0.32678 0,-0.15176 0.0882,-0.28991 0.22614,-0.35415 v -0.001 l 0.11641,-0.0541 c 0.0833,-0.0386 0.14712,-0.11025 0.17605,-0.19706 l 10e-4,-6.6e-4 c 0.0342,-0.10198 0.0515,-0.20877 0.0515,-0.31626 0,-0.12781 -0.0247,-0.25425 -0.0723,-0.37275 l -0.001,7.1e-4 c -0.0208,-0.052 -0.0557,-0.0972 -0.1009,-0.13127 l -0.001,-0.002 -0.0871,-0.0637 c -0.0953,-0.072 -0.15169,-0.18433 -0.15169,-0.30385 v -0.67735 h 1.51906 v 0.45649 c 0,0.18877 0.10442,0.36209 0.27129,0.45061 l 2.6e-4,-0.001 0.10866,0.0586 c 0.13652,0.0724 0.22154,0.2136 0.22154,0.36727 0,0.11025 -0.0437,0.21633 -0.12171,0.29418 l 0.002,3.5e-4 -0.5468,0.54966 c -0.0515,0.0513 -0.0804,0.12092 -0.0804,0.19346 0,0.0965 0.0511,0.18585 0.1337,0.23531 l -0.001,6.6e-4 0.36724,0.21773 c 0.15628,0.0933 0.25223,0.26219 0.25223,0.44426 0,0.0923 -0.0243,0.18309 -0.0716,0.26267 l 2.7e-4,8.4e-4 z"
+       sodipodi:nodetypes="ccccscccsssscccccscccscccscccscccccscccccsccscccscccscccsccc"
+       inkscape:label="#path11040" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ff0000;stroke:#231f20;stroke-width:0.08819442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 111.23112,83.887761 c 0,2.06051 1.63657,3.74723 3.69383,3.80752 2.92005,0.0858 5.84101,0.12868 8.76226,0.12868 2.92128,0 5.8422,-0.0429 8.76225,-0.12868 2.05726,-0.0603 3.69383,-1.74701 3.69383,-3.80752 v -0.90175 c 0,-0.77103 0.62512,-1.39681 1.39527,-1.39681 0.40188,0 0.78413,0.17346 1.04903,0.47594 l 0.001,0.002 0.50642,0.58187 c 0.2244,0.25636 0.54826,0.40359 0.8888,0.40359 0.6525,0 1.18236,-0.53052 1.18236,-1.1839 v -0.65991 c 0,-0.1402 0.11385,-0.25425 0.25373,-0.25425 h 26.97665 c 0.0677,0 0.13272,-0.0269 0.18035,-0.0744 l -0.003,0.001 0.98392,-0.98341 c 0.33831,-0.33863 0.52865,-0.79806 0.52865,-1.27692 0,-0.44616 -0.16509,-0.87666 -0.46354,-1.2082 l -5.3e-4,-0.001 -3.70365,-4.11861 c -0.0476,-0.0538 -0.11649,-0.0842 -0.1881,-0.0842 h -24.31122 c -0.13988,0 -0.25374,-0.11374 -0.25374,-0.25425 v -1.93528 c 0,-0.649 -0.52623,-1.17512 -1.1746,-1.17512 -0.25598,0 -0.50503,0.0832 -0.709,0.23823 h 10e-4 l -0.90283,0.68475 c -0.24236,0.18326 -0.53813,0.28318 -0.84233,0.28318 -0.77014,0 -1.39526,-0.62637 -1.39526,-1.39733 v -0.90123 c 0,-2.06016 -1.63657,-3.7474 -3.69383,-3.80804 -2.92005,-0.0854 -5.84098,-0.12816 -8.76226,-0.12816 -2.92124,0 -5.84238,0.0428 -8.76225,0.12816 -2.05726,0.0606 -3.69383,1.74788 -3.69383,3.80804 z m 3.27887,-7.59126 c 0,-1.75253 1.42093,-3.17449 3.17138,-3.17449 1.75045,0 3.17086,1.42196 3.17086,3.17449 0,1.75231 -1.42041,3.17448 -3.17086,3.17448 -1.75045,0 -3.17138,-1.42217 -3.17138,-3.17448 z"
+       id="outline_1638"
+       inkscape:label="#path33873" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ff0000;stroke:#231f20;stroke-width:0.08819442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 111.2337,51.100621 c 0,2.05419 1.63674,3.73637 3.69435,3.79666 2.9204,0.0854 5.84169,0.12816 8.76329,0.12816 2.92163,0 5.84289,-0.0427 8.76329,-0.12816 2.05761,-0.0603 3.69435,-1.74247 3.69435,-3.79666 v -0.89865 c 0,-0.76878 0.62511,-1.39268 1.39526,-1.39268 0.40185,0 0.78461,0.17294 1.04955,0.47438 l 10e-4,0.002 0.50643,0.58033 c 0.22443,0.25545 0.54844,0.40204 0.88883,0.40204 0.65267,0 1.18236,-0.52847 1.18236,-1.17977 v -0.65836 c 0,-0.1397 0.11368,-0.25321 0.25373,-0.25321 h 31.42078 c 0.0674,0 0.13221,-0.0264 0.17983,-0.0739 l -0.002,5.3e-4 0.98392,-0.9803 c 0.33832,-0.33761 0.52865,-0.79583 0.52865,-1.27331 0,-0.44492 -0.1656,-0.87399 -0.46405,-1.20458 l -5.3e-4,-5.3e-4 -3.70365,-4.10672 c -0.048,-0.0534 -0.1163,-0.0837 -0.18862,-0.0837 h -28.7543 c -0.14005,0 -0.25373,-0.1137 -0.25373,-0.25322 v -1.9296 h 5.3e-4 c 0,-0.64696 -0.52627,-1.17202 -1.17461,-1.17202 -0.25615,0 -0.5054,0.0834 -0.70951,0.23771 h 0.001 l -0.90279,0.68265 c -0.24254,0.18327 -0.53864,0.28267 -0.84284,0.28267 -0.77015,0 -1.39527,-0.62425 -1.39527,-1.3932 v -0.89865 c 0,-2.05398 -1.63674,-3.73586 -3.69434,-3.79615 -2.9204,-0.0854 -5.84166,-0.12816 -8.7633,-0.12816 -2.92159,0 -5.84288,0.0427 -8.76328,0.12816 -2.05762,0.0603 -3.69435,1.74217 -3.69435,3.79615 z m 3.26853,-7.55251 c 0,-1.74721 1.42076,-3.16518 3.17139,-3.16518 1.75062,0 3.1719,1.41797 3.1719,3.16518 0,1.74699 -1.42128,3.16466 -3.1719,3.16466 -1.75063,0 -3.17139,-1.41767 -3.17139,-3.16466 z"
+       id="outline_a1638"
+       inkscape:label="#path33913" />
+    <text
+       id="text32047"
+       style="font-variant:normal;font-weight:bold;font-size:4.23333216px;font-family:Helvetica;-inkscape-font-specification:Helvetica-Bold;writing-mode:lr-tb;fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277769"
+       x="-50.333736"
+       y="186.59254"
+       transform="rotate(-90)">
+      <tspan
+         id="tspan32045"
+         sodipodi:role="line"
+         y="186.59254"
+         x="-50.333736 -47.46777 -45.300747 -43.137508 -40.970547"
+         style="stroke-width:0.35277769">A1638</tspan>
+    </text>
+    <path
+       style="fill:#0000ff;stroke:#231f20;stroke-width:0.08819442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 173.701,77.256571 c -0.11042,-0.0721 -0.17639,-0.19516 -0.17639,-0.3271 0,-0.15211 0.0875,-0.29026 0.22507,-0.3545 v -0.001 l 0.11924,-0.0543 c 0.0833,-0.0389 0.14675,-0.11024 0.17568,-0.19742 l -0.001,0.002 c 0.0346,-0.10216 0.0519,-0.20912 0.0519,-0.31679 0,-0.12785 -0.0243,-0.25439 -0.0723,-0.37292 l 0.002,-0.002 c -0.0215,-0.0524 -0.0561,-0.0979 -0.1016,-0.13166 l -7.9e-4,10e-4 -0.0868,-0.0668 c -0.0956,-0.0717 -0.15134,-0.18468 -0.15134,-0.30392 v -1.97329 h 1.51694 l -0.002,1.75214 c 0,0.18877 0.10407,0.36244 0.27058,0.45063 l 7.9e-4,0.001 0.11113,0.0586 c 0.13617,0.0724 0.22119,0.21361 0.22119,0.36795 0,0.11039 -0.0434,0.21633 -0.12136,0.29439 l -7.9e-4,3.5e-4 -0.54645,0.54793 c -0.0508,0.0513 -0.0797,0.12108 -0.0797,0.19361 0,0.0966 0.0508,0.18605 0.13335,0.23544 l 7.9e-4,7.2e-4 0.36653,0.22062 c 0.15664,0.0936 0.25224,0.26254 0.25224,0.44478 0,0.0925 -0.024,0.18345 -0.0716,0.26307 l 7.9e-4,10e-4 c -0.11923,0.20279 -0.29138,0.36951 -0.49741,0.48254 l 8e-4,1.4e-4 -0.31962,0.17173 c -0.12347,0.0677 -0.20073,0.19763 -0.20073,0.3387 0,0.15865 0.0974,0.30106 0.24483,0.35927 l -0.001,-0.001 0.5655,0.22497 c 0.16052,0.0634 0.2667,0.21893 0.2667,0.39218 h 0.003 v 0.76708 c 0,0.12608 -0.10265,0.22842 -0.22895,0.22842 h -1.83127 c -0.12594,0 -0.22789,-0.10234 -0.22789,-0.22842 v -0.27696 c 0,-0.18729 0.1203,-0.35314 0.2981,-0.41071 l 7.9e-4,-7.1e-4 0.096,-0.0319 c 0.16192,-0.0525 0.27199,-0.2038 0.27199,-0.37447 0,-0.0855 -0.0275,-0.16845 -0.079,-0.23672 l 7.9e-4,7.2e-4 -0.47907,-0.63288 c -0.0579,-0.0774 -0.0896,-0.17177 -0.0896,-0.26875 0,-0.1609 0.0861,-0.30935 0.22613,-0.38876 l 0.003,1.4e-4 0.26776,-0.15279 c 0.0871,-0.0493 0.14005,-0.14125 0.14005,-0.24081 0,-0.0933 -0.0469,-0.18033 -0.12488,-0.23145 l -0.002,-0.002 -0.33831,-0.22137 z"
+       id="warding_1638"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscccccscccccsccccccscccscccscccccscccccssssscccscccscccscccc"
+       inkscape:label="#path48824" />
+    <path
+       style="opacity:0.47999998;fill:#00ff00;stroke:#231f20;stroke-width:0.08819442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 135.58485,68.752691 c 0,-1.75835 -1.39647,-3.19772 -3.15193,-3.24937 -2.91454,-0.0855 -5.83029,-0.1289 -8.74606,-0.1289 -2.91575,0 -5.83131,0.0434 -8.74589,0.1289 -1.75564,0.0516 -3.15211,1.49102 -3.15211,3.24937 v 15.13624 c 0,1.75821 1.39647,3.19772 3.15211,3.24923 2.91458,0.0856 5.83014,0.12851 8.74589,0.12851 2.91577,0 5.83152,-0.0429 8.74592,-0.12851 h 1.4e-4 c 1.75546,-0.0515 3.15193,-1.49102 3.15193,-3.24923 v -5.54799 z"
+       id="path48822"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scscsscsccscs" />
+    <text
+       y="182.97798"
+       x="-81.356331"
+       id="text33879"
+       style="font-variant:normal;font-weight:bold;font-size:4.23333216px;font-family:Helvetica;-inkscape-font-specification:Helvetica-Bold;writing-mode:lr-tb;fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.35277769"
+       transform="rotate(-90)">
+      <tspan
+         style="stroke-width:0.35277769"
+         id="tspan33877"
+         sodipodi:role="line"
+         y="182.97798"
+         x="-81.356331 -79.191246 -77.028008 -74.861046">1638</tspan>
+    </text>
+    <path
+       style="opacity:0.47999998;fill:#00ff00;stroke:#231f20;stroke-width:0.08819442;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+       d="m 135.59095,36.011421 c 0,-1.75284 -1.39665,-3.18805 -3.15246,-3.23941 -2.91486,-0.0854 -5.83099,-0.12817 -8.74726,-0.12817 -2.9161,0 -5.83201,0.0427 -8.74691,0.12817 -1.75581,0.0514 -3.15246,1.48657 -3.15246,3.23941 v 15.09057 c 0,1.75288 1.39665,3.18808 3.15246,3.23941 2.9149,0.0854 5.83081,0.12799 8.74709,0.12799 2.91609,0 5.83222,-0.0426 8.74708,-0.12799 1.75581,-0.0513 3.15246,-1.48653 3.15246,-3.23941 v -5.53121 z"
+       id="engrave_a1638"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scscsscscscs"
+       inkscape:label="#path48828" />
   </g>
 </svg>
diff --git a/scad/medeco_classic.scad b/scad/medeco_classic.scad
index 4c562c3..36c218e 100644
--- a/scad/medeco_classic.scad
+++ b/scad/medeco_classic.scad
@@ -9,6 +9,8 @@ module medeco_classic(bitting="",
     name = "Medeco Classic";
 
     /*
+        "A" variants of key outlines indicates 6-pin version.
+
         Bitting is specified from bow to tip, 1-6, with 1 being the shallowest cut and 6 being the deepest.
 
         After each number, a letter L, C, or R is specified for the cut angle: left, center or right.
@@ -22,7 +24,11 @@ module medeco_classic(bitting="",
                   "1517",
                   "1518",
                   "1542",
-                  "1543"];
+                  "1543",
+                  "A1638",
+                  "1638",
+                  "1644",
+                  "1655"];
     outlines_v = [[outline_a1515_points, outline_a1515_paths,
                    [-outline_a1515_points[52][0], -outline_a1515_points[52][1]],
                    engrave_a1515_points,
@@ -50,18 +56,41 @@ module medeco_classic(bitting="",
                   [outline_1543_points, outline_1543_paths,
                    [-outline_1543_points[48][0], -outline_1543_points[48][1]],
                    engrave_1543_points,
-                   engrave_1543_paths]];
+                   engrave_1543_paths],
+                  [outline_a1638_points, outline_a1638_paths,
+                   [-outline_a1638_points[64][0], -outline_a1638_points[68][1]],
+                   engrave_a1638_points,
+                   engrave_a1638_paths],
+                  [outline_1638_points, outline_1638_paths,
+                   [-outline_1638_points[64][0], -outline_1638_points[68][1]],
+                   engrave_1638_points,
+                   engrave_1638_paths],
+                  [outline_1644_points, outline_1644_paths,
+                   [-outline_1644_points[47][0], -outline_1644_points[43][1]],
+                   engrave_1644_points,
+                   engrave_1644_paths],
+                  [outline_1655_points, outline_1655_paths,
+                   [-outline_1655_points[48][0], -outline_1655_points[52][1]],
+                   engrave_1655_points,
+                   engrave_1655_paths]];
 
     wardings_k = ["1515",
                   "1517",
                   "1518",
                   "1542",
-                  "1543"];
+                  "1543",
+                  "1638",
+                  "1644",
+                  "1655"];
+
     wardings_v = [warding_1515_points,
                   warding_1517_points,
                   warding_1518_points,
                   warding_1542_points,
-                  warding_1543_points];
+                  warding_1543_points,
+                  warding_1638_points,
+                  warding_1644_points,
+                  warding_1655_points];
 
     outline_param = key_lkup(outlines_k, outlines_v, outline_name);
     outline_points = outline_param[0];
@@ -104,6 +133,6 @@ module medeco_classic(bitting="",
 
 // Defaults
 bitting="";
-outline="1515";
-warding="1515";
+outline="1638";
+warding="1638";
 medeco_classic(bitting, outline, warding);