[gnome-shell-design] workspace switcher with appropriate concentric border roundings



commit 2b121d87dabb6672adaba8eaec57b1733ad4bd60
Author: Jakub Steiner <jimmac gmail com>
Date:   Mon Aug 23 11:08:00 2010 +0200

    workspace switcher with appropriate concentric border roundings

 mockups/shell-mockups.svg             |  440 ++++++++++++++++++---------------
 mockups/static/workspace-switcher.png |  Bin 0 -> 427101 bytes
 2 files changed, 235 insertions(+), 205 deletions(-)
---
diff --git a/mockups/shell-mockups.svg b/mockups/shell-mockups.svg
index 02d27fd..6f71d97 100644
--- a/mockups/shell-mockups.svg
+++ b/mockups/shell-mockups.svg
@@ -14,7 +14,7 @@
    height="768"
    id="svg2940"
    version="1.1"
-   inkscape:version="0.48+devel r9695 custom"
+   inkscape:version="0.48+devel r9722 custom"
    sodipodi:docname="shell-mockups.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    style="display:inline"
@@ -29,9 +29,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="560.37869"
-     inkscape:cy="428.84889"
-     inkscape:current-layer="layer50"
+     inkscape:cx="537.16521"
+     inkscape:cy="400.27939"
+     inkscape:current-layer="g8497"
      inkscape:document-units="px"
      showgrid="false"
      inkscape:window-width="1680"
@@ -16256,7 +16256,7 @@
      inkscape:groupmode="layer"
      id="layer38"
      inkscape:label="OSD/Dialogs FIXME"
-     style="display:none">
+     style="display:inline">
     <g
        inkscape:groupmode="layer"
        id="g16149"
@@ -16688,7 +16688,7 @@
         </g>
         <path
            transform="matrix(0.897436,0,0,0.981132,1.333333,1.688679)"
-           d="M 52,33.1875 C 52,35.016943 45.452164,36.5 37.375,36.5 29.297836,36.5 22.75,35.016943 22.75,33.1875 c 0,-1.829443 6.547836,-3.3125 14.625,-3.3125 8.077164,0 14.625,1.483057 14.625,3.3125 z"
+           d="m 52,33.1875 a 14.625,3.3125 0 1 1 -29.25,0 14.625,3.3125 0 1 1 29.25,0 z"
            sodipodi:ry="3.3125"
            sodipodi:rx="14.625"
            sodipodi:cy="33.1875"
@@ -16707,7 +16707,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,-1.524595,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -16717,7 +16717,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,2.475405,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -16727,7 +16727,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,6.475405,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -16737,7 +16737,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,10.47541,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -16747,7 +16747,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,14.47541,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -16757,7 +16757,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,18.47541,-5.176204)" />
           <path
              sodipodi:type="arc"
@@ -16767,7 +16767,7 @@
              sodipodi:cy="15.109375"
              sodipodi:rx="1.7421875"
              sodipodi:ry="1.578125"
-             d="m 13.999999,15.109375 c 0,0.871574 -0.780004,1.578125 -1.742187,1.578125 -0.962184,0 -1.742188,-0.706551 -1.742188,-1.578125 0,-0.871574 0.780004,-1.578125 1.742188,-1.578125 0.962183,0 1.742187,0.706551 1.742187,1.578125 z"
+             d="m 13.999999,15.109375 a 1.7421875,1.578125 0 1 1 -3.484375,0 1.7421875,1.578125 0 1 1 3.484375,0 z"
              transform="matrix(1.143498,0,0,1.268986,22.47541,-5.176204)" />
         </g>
         <rect
@@ -16810,7 +16810,7 @@
              sodipodi:cy="11.257812"
              sodipodi:rx="0.59375"
              sodipodi:ry="0.6484375"
-             d="m 12.71875,11.257812 c 0,0.358122 -0.265831,0.648437 -0.59375,0.648437 -0.327919,0 -0.59375,-0.290315 -0.59375,-0.648437 0,-0.358123 0.265831,-0.648438 0.59375,-0.648438 0.327919,0 0.59375,0.290315 0.59375,0.648438 z"
+             d="m 12.71875,11.257812 a 0.59375,0.6484375 0 1 1 -1.1875,0 0.59375,0.6484375 0 1 1 1.1875,0 z"
              transform="translate(-0.21875,-0.109374)" />
         </g>
         <g
@@ -17387,7 +17387,7 @@
       </g>
     </g>
     <g
-       style="display:inline"
+       style="display:none"
        inkscape:label="Restart"
        id="g14373"
        inkscape:groupmode="layer"
@@ -18178,7 +18178,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(2.1248378,0,0,2.1249489,542.91022,375.7404)" />
                 <path
                    sodipodi:type="arc"
@@ -18188,7 +18188,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.94632584,0,0,0.9447551,561.91315,434.68492)" />
                 <path
                    sodipodi:type="arc"
@@ -18198,7 +18198,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.94632584,0,0,0.9447551,579.5406,434.68738)" />
                 <path
                    sodipodi:type="arc"
@@ -18208,7 +18208,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.23898032,0,0,0.23858367,587.38287,427.69097)" />
                 <path
                    sodipodi:type="arc"
@@ -18218,7 +18218,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.82637292,0,0,0.82637292,564.67108,437.94501)" />
                 <path
                    sodipodi:type="arc"
@@ -18228,7 +18228,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.11999306,0,0,0.11940445,581.29065,457.40401)" />
                 <path
                    sodipodi:type="arc"
@@ -18238,7 +18238,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 16.111254,28.201619 c -0.36606,-4.107376 2.666876,-7.733813 6.774253,-8.099873 0.438098,-0.03904 0.878789,-0.0393 1.316933,-7.69e-4"
+                   d="M 16.111254,28.201619 A 7.4665399,7.4665399 0 0 1 24.20244,20.100977"
                    transform="matrix(1.2941317,0,0,1.2867116,562.47065,398.82439)"
                    sodipodi:start="3.0527049"
                    sodipodi:end="4.8001087"
@@ -18251,7 +18251,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.11999306,0,0,0.11940445,598.91964,457.40401)" />
                 <path
                    sodipodi:type="arc"
@@ -18261,7 +18261,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.82637292,0,0,0.82637292,582.30007,437.94503)" />
                 <path
                    sodipodi:type="arc"
@@ -18271,7 +18271,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.71480963,0,0,0.71361967,584.87873,441.01055)" />
                 <path
                    sodipodi:type="arc"
@@ -18281,7 +18281,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 31.014857,27.538809 c 0,4.123656 -3.342884,7.46654 -7.46654,7.46654 -4.123656,0 -7.46654,-3.342884 -7.46654,-7.46654 0,-4.123656 3.342884,-7.46654 7.46654,-7.46654 4.123656,0 7.46654,3.342884 7.46654,7.46654 z"
+                   d="m 31.014857,27.538809 a 7.4665399,7.4665399 0 1 1 -14.93308,0 7.4665399,7.4665399 0 1 1 14.93308,0 z"
                    transform="matrix(0.71480963,0,0,0.71361967,567.36502,441.05007)" />
                 <path
                    sodipodi:type="arc"
@@ -18291,7 +18291,7 @@
                    sodipodi:cy="27.538809"
                    sodipodi:rx="7.4665399"
                    sodipodi:ry="7.4665399"
-                   d="m 16.111254,28.201619 c -0.36606,-4.107376 2.666876,-7.733813 6.774253,-8.099873 0.438098,-0.03904 0.878789,-0.0393 1.316933,-7.69e-4"
+                   d="M 16.111254,28.201619 A 7.4665399,7.4665399 0 0 1 24.20244,20.100977"
                    transform="matrix(-1.2941317,0,0,-1.2867116,623.38495,469.66478)"
                    sodipodi:start="3.0527049"
                    sodipodi:end="4.8001087"
@@ -18304,7 +18304,7 @@
                    sodipodi:cy="12.8681"
                    sodipodi:rx="10.638533"
                    sodipodi:ry="10.638533"
-                   d="M 15.290321,23.493506 C 9.4220711,23.785292 4.4283755,19.264675 4.1365895,13.396426 3.8448034,7.528176 8.3654203,2.5344804 14.23367,2.2426943 c 0.353301,-0.017567 0.707259,-0.017502 1.060554,1.949e-4"
+                   d="m 15.290321,23.493506 a 10.638533,10.638533 0 1 1 0.0039,-21.2506168"
                    transform="matrix(1.8949769,0,0,1.9073349,558.68134,408.85292)"
                    sodipodi:start="1.5211144"
                    sodipodi:end="4.7624383"
@@ -18317,7 +18317,7 @@
                    sodipodi:cy="12.8681"
                    sodipodi:rx="10.638533"
                    sodipodi:ry="10.638533"
-                   d="M 15.290321,23.493506 C 9.4220711,23.785292 4.4283755,19.264675 4.1365895,13.396426 3.8448034,7.528176 8.3654203,2.5344804 14.23367,2.2426943 c 0.353301,-0.017567 0.707259,-0.017502 1.060554,1.949e-4"
+                   d="m 15.290321,23.493506 a 10.638533,10.638533 0 1 1 0.0039,-21.2506168"
                    transform="matrix(3.0705466,0,0,2.9854145,543.26377,395.84946)"
                    sodipodi:start="1.5211144"
                    sodipodi:end="4.7624383"
@@ -18330,7 +18330,7 @@
                    sodipodi:cy="12.8681"
                    sodipodi:rx="10.638533"
                    sodipodi:ry="10.638533"
-                   d="M 15.290321,23.493506 C 9.4220711,23.785292 4.4283755,19.264675 4.1365895,13.396426 3.8448034,7.528176 8.3654203,2.5344804 14.23367,2.2426943 c 0.353301,-0.017567 0.707259,-0.017502 1.060554,1.949e-4"
+                   d="m 15.290321,23.493506 a 10.638533,10.638533 0 1 1 0.0039,-21.2506168"
                    transform="matrix(-1.9101097,0,0,1.9073349,629.0275,409.70003)"
                    sodipodi:start="1.5211144"
                    sodipodi:end="4.7624383"
@@ -18343,7 +18343,7 @@
                    sodipodi:cy="12.8681"
                    sodipodi:rx="10.638533"
                    sodipodi:ry="10.638533"
-                   d="M 15.290321,23.493506 C 9.4220711,23.785292 4.4283755,19.264675 4.1365895,13.396426 3.8448034,7.528176 8.3654203,2.5344804 14.23367,2.2426943 c 0.353301,-0.017567 0.707259,-0.017502 1.060554,1.949e-4"
+                   d="m 15.290321,23.493506 a 10.638533,10.638533 0 1 1 0.0039,-21.2506168"
                    transform="matrix(-3.0705466,0,0,2.984295,642.55122,395.85147)"
                    sodipodi:start="1.5211144"
                    sodipodi:end="4.7624383"
@@ -18490,11 +18490,11 @@
                      sodipodi:cy="38.700001"
                      sodipodi:rx="13.75"
                      sodipodi:ry="3.8"
-                     d="m 26.5,38.700001 c 0,2.098682 -6.156085,3.8 -13.75,3.8 -7.5939153,0 -13.75,-1.701318 -13.75,-3.8 0,-2.098682 6.1560847,-3.8 13.75,-3.8 7.593915,0 13.75,1.701318 13.75,3.8 z"
+                     d="m 26.5,38.700001 a 13.75,3.8 0 1 1 -27.5,0 13.75,3.8 0 1 1 27.5,0 z"
                      transform="matrix(0.9,0,0,1,21.1,-2)" />
                   <path
                      transform="matrix(0.704562,0,0,0.704562,20.97029,15.85306)"
-                     d="m 31.160714,16.910715 c 0,8.23496 -6.675754,14.910714 -14.910714,14.910714 -8.23496,0 -14.9107141,-6.675754 -14.9107141,-14.910714 0,-8.2349599 6.6757541,-14.910714 14.9107141,-14.910714 8.23496,0 14.910714,6.6757541 14.910714,14.910714 z"
+                     d="m 31.160714,16.910715 a 14.910714,14.910714 0 1 1 -29.8214281,0 14.910714,14.910714 0 1 1 29.8214281,0 z"
                      sodipodi:ry="14.910714"
                      sodipodi:rx="14.910714"
                      sodipodi:cy="16.910715"
@@ -18504,7 +18504,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(0.521637,0,0,0.521637,23.89626,18.89987)"
-                     d="m 31.160714,16.910715 c 0,8.23496 -6.675754,14.910714 -14.910714,14.910714 -8.23496,0 -14.9107141,-6.675754 -14.9107141,-14.910714 0,-8.2349599 6.6757541,-14.910714 14.9107141,-14.910714 8.23496,0 14.910714,6.6757541 14.910714,14.910714 z"
+                     d="m 31.160714,16.910715 a 14.910714,14.910714 0 1 1 -29.8214281,0 14.910714,14.910714 0 1 1 29.8214281,0 z"
                      sodipodi:ry="14.910714"
                      sodipodi:rx="14.910714"
                      sodipodi:cy="16.910715"
@@ -18514,7 +18514,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(0.89268,0,0,0.89268,18.74719,12.22636)"
-                     d="m 16.40625,17.28125 c 0,0.673097 -0.545653,1.21875 -1.21875,1.21875 -0.673097,0 -1.21875,-0.545653 -1.21875,-1.21875 0,-0.673097 0.545653,-1.21875 1.21875,-1.21875 0.673097,0 1.21875,0.545653 1.21875,1.21875 z"
+                     d="m 16.40625,17.28125 a 1.21875,1.21875 0 1 1 -2.4375,0 1.21875,1.21875 0 1 1 2.4375,0 z"
                      sodipodi:ry="1.21875"
                      sodipodi:rx="1.21875"
                      sodipodi:cy="17.28125"
@@ -18535,7 +18535,7 @@
                      inkscape:connector-curvature="0" />
                   <path
                      transform="matrix(1.189172,0,0,1.189172,12.45482,12.63401)"
-                     d="m 17.324117,7.6932044 c 0,0.3417088 -0.27701,0.6187184 -0.618718,0.6187184 -0.341709,0 -0.618719,-0.2770096 -0.618719,-0.6187184 0,-0.3417088 0.27701,-0.6187184 0.618719,-0.6187184 0.341708,0 0.618718,0.2770096 0.618718,0.6187184 z"
+                     d="m 17.324117,7.6932044 a 0.61871845,0.61871845 0 1 1 -1.237437,0 0.61871845,0.61871845 0 1 1 1.237437,0 z"
                      sodipodi:ry="0.61871845"
                      sodipodi:rx="0.61871845"
                      sodipodi:cy="7.6932044"
@@ -18545,7 +18545,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(1.189172,0,0,1.189172,12.45482,24.40622)"
-                     d="m 17.324117,7.6932044 c 0,0.3417088 -0.27701,0.6187184 -0.618718,0.6187184 -0.341709,0 -0.618719,-0.2770096 -0.618719,-0.6187184 0,-0.3417088 0.27701,-0.6187184 0.618719,-0.6187184 0.341708,0 0.618718,0.2770096 0.618718,0.6187184 z"
+                     d="m 17.324117,7.6932044 a 0.61871845,0.61871845 0 1 1 -1.237437,0 0.61871845,0.61871845 0 1 1 1.237437,0 z"
                      sodipodi:ry="0.61871845"
                      sodipodi:rx="0.61871845"
                      sodipodi:cy="7.6932044"
@@ -18555,7 +18555,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(1.189172,0,0,1.189172,6.568712,18.52011)"
-                     d="m 17.324117,7.6932044 c 0,0.3417088 -0.27701,0.6187184 -0.618718,0.6187184 -0.341709,0 -0.618719,-0.2770096 -0.618719,-0.6187184 0,-0.3417088 0.27701,-0.6187184 0.618719,-0.6187184 0.341708,0 0.618718,0.2770096 0.618718,0.6187184 z"
+                     d="m 17.324117,7.6932044 a 0.61871845,0.61871845 0 1 1 -1.237437,0 0.61871845,0.61871845 0 1 1 1.237437,0 z"
                      sodipodi:ry="0.61871845"
                      sodipodi:rx="0.61871845"
                      sodipodi:cy="7.6932044"
@@ -18565,7 +18565,7 @@
                      sodipodi:type="arc" />
                   <path
                      transform="matrix(1.189172,0,0,1.189172,18.34092,18.52011)"
-                     d="m 17.324117,7.6932044 c 0,0.3417088 -0.27701,0.6187184 -0.618718,0.6187184 -0.341709,0 -0.618719,-0.2770096 -0.618719,-0.6187184 0,-0.3417088 0.27701,-0.6187184 0.618719,-0.6187184 0.341708,0 0.618718,0.2770096 0.618718,0.6187184 z"
+                     d="m 17.324117,7.6932044 a 0.61871845,0.61871845 0 1 1 -1.237437,0 0.61871845,0.61871845 0 1 1 1.237437,0 z"
                      sodipodi:ry="0.61871845"
                      sodipodi:rx="0.61871845"
                      sodipodi:cy="7.6932044"
@@ -18581,7 +18581,7 @@
                      sodipodi:cy="16.910715"
                      sodipodi:rx="14.910714"
                      sodipodi:ry="14.910714"
-                     d="m 31.160714,16.910715 c 0,8.23496 -6.675754,14.910714 -14.910714,14.910714 -8.23496,0 -14.9107141,-6.675754 -14.9107141,-14.910714 0,-8.2349599 6.6757541,-14.910714 14.9107141,-14.910714 8.23496,0 14.910714,6.6757541 14.910714,14.910714 z"
+                     d="m 31.160714,16.910715 a 14.910714,14.910714 0 1 1 -29.8214281,0 14.910714,14.910714 0 1 1 29.8214281,0 z"
                      transform="matrix(0.659664,0,0,0.659664,21.69988,16.61232)" />
                 </g>
               </g>
@@ -18602,36 +18602,35 @@
       </g>
     </g>
     <g
-       sodipodi:insensitive="true"
        inkscape:groupmode="layer"
        id="g8497"
        inkscape:label="Workspace Switcher"
-       style="display:none">
+       style="display:inline">
       <rect
-         style="fill:#000000;fill-opacity:0.8;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.25098039;stroke-dasharray:none"
+         style="fill:#000000;fill-opacity:0.8;stroke:#8b8b8b;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect8501"
          width="305"
          height="168"
          x="359.5"
-         y="300"
-         rx="8"
-         ry="8" />
+         y="299.5"
+         rx="26"
+         ry="26" />
       <rect
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.25098039;stroke-dasharray:none;display:inline"
+         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect8505-3"
-         width="126"
-         height="126"
-         x="517.875"
-         y="321"
-         rx="8"
+         width="125.93749"
+         height="127"
+         x="518"
+         y="320"
+         rx="7.9999995"
          ry="8" />
       <rect
-         style="fill:#ffffff;fill-opacity:0.33333333;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.25098039;stroke-dasharray:none"
+         style="fill:#ffffff;fill-opacity:0.33333333;stroke:#8b8b8b;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rect8505"
-         width="127.5"
-         height="127.5"
-         x="379.375"
-         y="320.25"
+         width="127"
+         height="127"
+         x="380"
+         y="320"
          rx="8"
          ry="8" />
       <g
@@ -20391,11 +20390,11 @@
              sodipodi:cy="26.90625"
              sodipodi:rx="12.3125"
              sodipodi:ry="2.34375"
-             d="m 28.5625,26.90625 a 12.3125,2.34375 0 1 1 -24.625,0 12.3125,2.34375 0 1 1 24.625,0 z"
+             d="m 28.5625,26.90625 c 0,1.294417 -5.512494,2.34375 -12.3125,2.34375 -6.800006,0 -12.3125,-1.049333 -12.3125,-2.34375 0,-1.294417 5.512494,-2.34375 12.3125,-2.34375 6.800006,0 12.3125,1.049333 12.3125,2.34375 z"
              transform="matrix(5.1842156,0,0,8.8969203,44.847524,-26.3318)" />
           <path
              transform="matrix(8.1389816,0,0,13.052309,-6.3336811,-145.1386)"
-             d="m 28.5625,26.90625 a 12.3125,2.34375 0 1 1 -24.625,0 12.3125,2.34375 0 1 1 24.625,0 z"
+             d="m 28.5625,26.90625 c 0,1.294417 -5.512494,2.34375 -12.3125,2.34375 -6.800006,0 -12.3125,-1.049333 -12.3125,-2.34375 0,-1.294417 5.512494,-2.34375 12.3125,-2.34375 6.800006,0 12.3125,1.049333 12.3125,2.34375 z"
              sodipodi:ry="2.34375"
              sodipodi:rx="12.3125"
              sodipodi:cy="26.90625"
@@ -20405,7 +20404,7 @@
              sodipodi:type="arc" />
           <path
              transform="matrix(5.6364554,0,0,5.4942496,-3.1296647,-9.1944228)"
-             d="m 44.04265,22.695679 a 20.556604,20.556604 0 1 1 -41.1132085,0 20.556604,20.556604 0 1 1 41.1132085,0 z"
+             d="m 44.04265,22.695679 c 0,11.353099 -9.203505,20.556604 -20.556604,20.556604 -11.353099,0 -20.5566045,-9.203505 -20.5566045,-20.556604 0,-11.353099 9.2035055,-20.5566047 20.5566045,-20.5566047 11.353099,0 20.556604,9.2035057 20.556604,20.5566047 z"
              sodipodi:ry="20.556604"
              sodipodi:rx="20.556604"
              sodipodi:cy="22.695679"
@@ -20421,7 +20420,7 @@
              sodipodi:cy="22.695679"
              sodipodi:rx="20.556604"
              sodipodi:ry="20.556604"
-             d="m 44.04265,22.695679 a 20.556604,20.556604 0 1 1 -41.1132085,0 20.556604,20.556604 0 1 1 41.1132085,0 z"
+             d="m 44.04265,22.695679 c 0,11.353099 -9.203505,20.556604 -20.556604,20.556604 -11.353099,0 -20.5566045,-9.203505 -20.5566045,-20.556604 0,-11.353099 9.2035055,-20.5566047 20.5566045,-20.5566047 11.353099,0 20.556604,9.2035057 20.556604,20.5566047 z"
              transform="matrix(5.6364554,0,0,5.4942496,-3.1296647,-9.1944228)" />
           <g
              transform="matrix(5.3038963,0,0,5.303707,-0.6970739,-6.7512476)"
@@ -20602,7 +20601,7 @@
           <path
              clip-path="url(#clipPath6263)"
              transform="matrix(1.6415896,0,0,1.7904762,-87.51062,-114.65238)"
-             d="m 202,99.5 a 69.5,52.5 0 1 1 -139,0 69.5,52.5 0 1 1 139,0 z"
+             d="M 202,99.5 C 202,128.49495 170.88379,152 132.5,152 94.11621,152 63,128.49495 63,99.5 63,70.505051 94.11621,47 132.5,47 170.88379,47 202,70.505051 202,99.5 z"
              sodipodi:ry="52.5"
              sodipodi:rx="69.5"
              sodipodi:cy="99.5"
@@ -20618,11 +20617,11 @@
              sodipodi:cy="22.695679"
              sodipodi:rx="20.556604"
              sodipodi:ry="20.556604"
-             d="m 44.04265,22.695679 a 20.556604,20.556604 0 1 1 -41.1132085,0 20.556604,20.556604 0 1 1 41.1132085,0 z"
+             d="m 44.04265,22.695679 c 0,11.353099 -9.203505,20.556604 -20.556604,20.556604 -11.353099,0 -20.5566045,-9.203505 -20.5566045,-20.556604 0,-11.353099 9.2035055,-20.5566047 20.5566045,-20.5566047 11.353099,0 20.556604,9.2035057 20.556604,20.5566047 z"
              transform="matrix(4.7134374,0,0,4.5945189,18.54838,11.225575)" />
           <path
              transform="matrix(5.6364554,0,0,5.4942496,-3.1296647,-9.1944228)"
-             d="m 44.04265,22.695679 a 20.556604,20.556604 0 1 1 -41.1132085,0 20.556604,20.556604 0 1 1 41.1132085,0 z"
+             d="m 44.04265,22.695679 c 0,11.353099 -9.203505,20.556604 -20.556604,20.556604 -11.353099,0 -20.5566045,-9.203505 -20.5566045,-20.556604 0,-11.353099 9.2035055,-20.5566047 20.5566045,-20.5566047 11.353099,0 20.556604,9.2035057 20.556604,20.5566047 z"
              sodipodi:ry="20.556604"
              sodipodi:rx="20.556604"
              sodipodi:cy="22.695679"
@@ -20632,7 +20631,7 @@
              sodipodi:type="arc" />
           <path
              transform="matrix(1.6962522,0,0,2.0582735,-154.27415,-85.66293)"
-             d="m 213,72.5 a 46,28.5 0 1 1 -92,0 46,28.5 0 1 1 92,0 z"
+             d="M 213,72.5 C 213,88.240115 192.4051,101 167,101 141.5949,101 121,88.240115 121,72.5 121,56.759885 141.5949,44 167,44 c 25.4051,0 46,12.759885 46,28.5 z"
              sodipodi:ry="28.5"
              sodipodi:rx="46"
              sodipodi:cy="72.5"
@@ -20660,11 +20659,11 @@
              sodipodi:cy="22.695679"
              sodipodi:rx="20.556604"
              sodipodi:ry="20.556604"
-             d="m 44.04265,22.695679 a 20.556604,20.556604 0 1 1 -41.1132085,0 20.556604,20.556604 0 1 1 41.1132085,0 z"
+             d="m 44.04265,22.695679 c 0,11.353099 -9.203505,20.556604 -20.556604,20.556604 -11.353099,0 -20.5566045,-9.203505 -20.5566045,-20.556604 0,-11.353099 9.2035055,-20.5566047 20.5566045,-20.5566047 11.353099,0 20.556604,9.2035057 20.556604,20.5566047 z"
              transform="matrix(5.4601401,0,0,5.3222446,1.0112829,-5.2906517)" />
           <path
              transform="matrix(5.7120897,0,0,5.5679758,-4.9060167,-10.867688)"
-             d="m 44.04265,22.695679 a 20.556604,20.556604 0 1 1 -41.1132085,0 20.556604,20.556604 0 1 1 41.1132085,0 z"
+             d="m 44.04265,22.695679 c 0,11.353099 -9.203505,20.556604 -20.556604,20.556604 -11.353099,0 -20.5566045,-9.203505 -20.5566045,-20.556604 0,-11.353099 9.2035055,-20.5566047 20.5566045,-20.5566047 11.353099,0 20.556604,9.2035057 20.556604,20.5566047 z"
              sodipodi:ry="20.556604"
              sodipodi:rx="20.556604"
              sodipodi:cy="22.695679"
@@ -20745,11 +20744,11 @@
                sodipodi:cy="34.5"
                sodipodi:rx="8.5"
                sodipodi:ry="8.5"
-               d="m 158,34.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+               d="m 158,34.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                transform="matrix(7.8211495,0,0,7.8211495,-1929.9418,-306.5188)" />
             <path
                transform="matrix(2.2423679,0,0,2.2423679,-1095.914,-114.05084)"
-               d="m 158,34.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+               d="m 158,34.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                sodipodi:ry="8.5"
                sodipodi:rx="8.5"
                sodipodi:cy="34.5"
@@ -21139,7 +21138,7 @@
                sodipodi:cy="86.5"
                sodipodi:rx="8.5"
                sodipodi:ry="8.5"
-               d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+               d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                transform="matrix(0.64680538,-0.64680538,0.29716347,0.29716347,7.3594367,104.10629)" />
             <path
                sodipodi:type="arc"
@@ -21149,7 +21148,7 @@
                sodipodi:cy="86.5"
                sodipodi:rx="8.5"
                sodipodi:ry="8.5"
-               d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+               d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                transform="matrix(0.25300786,-0.25300786,0.11624006,0.11624006,50.336327,85.060075)" />
             <path
                sodipodi:type="arc"
@@ -21159,7 +21158,7 @@
                sodipodi:cy="86.5"
                sodipodi:rx="8.5"
                sodipodi:ry="8.5"
-               d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+               d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                transform="matrix(0.32617031,-0.32617031,0.14985327,0.14985327,166.35178,248.59862)" />
             <path
                d="m 105.5625,44.59375 c -8.805711,0 -16.379622,4.70254 -20.46875,11.65625 L 77.65625,74 A 2.6002601,2.6002601 0 0 1 77.5,74.3125 C 75.153793,78.342238 73.78125,83.003622 73.78125,88 l 0,132 c 0,15.20797 12.325502,27.40625 27.75,27.40625 l 84.9375,0 c 15.4245,0 27.75,-12.19828 27.75,-27.40625 l 0,-132 c 0,-4.996409 -1.37248,-9.657806 -3.71875,-13.6875 A 2.6002601,2.6002601 0 0 1 210.34375,74 l -7.4375,-17.75 C 198.81701,49.296253 191.24321,44.59375 182.4375,44.59375 l -76.875,0 z"
@@ -21195,7 +21194,7 @@
                  sodipodi:cy="216.5"
                  sodipodi:rx="11.75"
                  sodipodi:ry="11.75"
-                 d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                 d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                  transform="matrix(2.042553,0,0,2.0425529,-171.31912,-218.2127)" />
             </g>
             <g
@@ -21206,7 +21205,7 @@
                transform="matrix(0.81818181,0,0,0.81818181,34.36364,47.636363)">
               <path
                  transform="matrix(1.8723397,0,0,1.8723396,-144.04244,-187.36153)"
-                 d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                 d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                  sodipodi:ry="11.75"
                  sodipodi:rx="11.75"
                  sodipodi:cy="216.5"
@@ -21223,7 +21222,7 @@
                sodipodi:cy="216.5"
                sodipodi:rx="11.75"
                sodipodi:ry="11.75"
-               d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+               d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                transform="matrix(1.53519,0,0,1.5351899,-84.052697,-106.36862)" />
           </g>
           <g
@@ -21235,7 +21234,7 @@
                transform="matrix(0.18181828,0,0,0.18181828,293.81817,46.545441)">
               <path
                  transform="matrix(0.69565202,0,0,0.69565202,44.000022,32.000033)"
-                 d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                 d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                  sodipodi:ry="63.25"
                  sodipodi:rx="63.25"
                  sodipodi:cy="155.25"
@@ -21302,7 +21301,7 @@
                sodipodi:cy="155.25"
                sodipodi:rx="63.25"
                sodipodi:ry="63.25"
-               d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+               d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                transform="matrix(0.0474309,0,0,0.0474309,313.1818,64.636357)" />
             <g
                transform="matrix(0.20052071,0,0,0.19505429,291.12501,44.281689)"
@@ -21316,7 +21315,7 @@
                  sodipodi:cy="155.25"
                  sodipodi:rx="63.25"
                  sodipodi:ry="63.25"
-                 d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                 d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                  transform="matrix(-0.18972328,0,0,-0.18972328,171.27272,170.45456)" />
               <path
                  sodipodi:nodetypes="cccc"
@@ -21338,7 +21337,7 @@
              id="g6033">
             <path
                transform="matrix(0.37934416,-3.1351523e-5,-3.1335757e-5,0.37923558,265.47415,13.120253)"
-               d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+               d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                sodipodi:ry="63.25"
                sodipodi:rx="63.25"
                sodipodi:cy="155.25"
@@ -21348,7 +21347,7 @@
                sodipodi:type="arc" />
             <path
                transform="matrix(0.31617066,-2.6124054e-5,-2.6117082e-5,0.31608017,274.55453,22.92438)"
-               d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+               d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                sodipodi:ry="63.25"
                sodipodi:rx="63.25"
                sodipodi:cy="155.25"
@@ -21358,7 +21357,7 @@
                sodipodi:type="arc" />
             <path
                transform="matrix(0.25291149,-2.0898618e-5,-2.0894046e-5,0.25283909,283.64722,32.741808)"
-               d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+               d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                sodipodi:ry="63.25"
                sodipodi:rx="63.25"
                sodipodi:cy="155.25"
@@ -21368,7 +21367,7 @@
                sodipodi:type="arc" />
             <path
                transform="matrix(0.18965228,-1.5671374e-5,-1.5667945e-5,0.18959798,292.73992,42.559238)"
-               d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+               d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                sodipodi:ry="63.25"
                sodipodi:rx="63.25"
                sodipodi:cy="155.25"
@@ -21591,7 +21590,7 @@
            inkscape:connector-curvature="0" />
         <path
            transform="matrix(1.2857143,0,0,1.2857143,-86.857137,-109.42857)"
-           d="m 311,386.5 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z"
+           d="m 311,386.5 c 0,1.933 -1.567,3.5 -3.5,3.5 -1.933,0 -3.5,-1.567 -3.5,-3.5 0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5 z"
            sodipodi:ry="3.5"
            sodipodi:rx="3.5"
            sodipodi:cy="386.5"
@@ -22650,7 +22649,7 @@
                    sodipodi:cy="86.5"
                    sodipodi:rx="8.5"
                    sodipodi:ry="8.5"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    transform="matrix(0.64680538,-0.64680538,0.29716347,0.29716347,7.3594367,104.10629)" />
                 <path
                    sodipodi:type="arc"
@@ -22660,7 +22659,7 @@
                    sodipodi:cy="86.5"
                    sodipodi:rx="8.5"
                    sodipodi:ry="8.5"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    transform="matrix(0.25300786,-0.25300786,0.11624006,0.11624006,50.336327,85.060075)" />
                 <path
                    sodipodi:type="arc"
@@ -22670,7 +22669,7 @@
                    sodipodi:cy="86.5"
                    sodipodi:rx="8.5"
                    sodipodi:ry="8.5"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    transform="matrix(0.32617031,-0.32617031,0.14985327,0.14985327,166.35178,248.59862)" />
                 <path
                    d="m 105.5625,44.59375 c -8.805711,0 -16.379622,4.70254 -20.46875,11.65625 L 77.65625,74 A 2.6002601,2.6002601 0 0 1 77.5,74.3125 C 75.153793,78.342238 73.78125,83.003622 73.78125,88 l 0,132 c 0,15.20797 12.325502,27.40625 27.75,27.40625 l 84.9375,0 c 15.4245,0 27.75,-12.19828 27.75,-27.40625 l 0,-132 c 0,-4.996409 -1.37248,-9.657806 -3.71875,-13.6875 A 2.6002601,2.6002601 0 0 1 210.34375,74 l -7.4375,-17.75 C 198.81701,49.296253 191.24321,44.59375 182.4375,44.59375 l -76.875,0 z"
@@ -22706,7 +22705,7 @@
                      sodipodi:cy="216.5"
                      sodipodi:rx="11.75"
                      sodipodi:ry="11.75"
-                     d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                     d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                      transform="matrix(2.042553,0,0,2.0425529,-171.31912,-218.2127)" />
                 </g>
                 <g
@@ -22717,7 +22716,7 @@
                    transform="matrix(0.81818181,0,0,0.81818181,34.36364,47.636363)">
                   <path
                      transform="matrix(1.8723397,0,0,1.8723396,-144.04244,-187.36153)"
-                     d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                     d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                      sodipodi:ry="11.75"
                      sodipodi:rx="11.75"
                      sodipodi:cy="216.5"
@@ -22734,7 +22733,7 @@
                    sodipodi:cy="216.5"
                    sodipodi:rx="11.75"
                    sodipodi:ry="11.75"
-                   d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                   d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                    transform="matrix(1.53519,0,0,1.5351899,-84.052697,-106.36862)" />
               </g>
               <g
@@ -22746,7 +22745,7 @@
                    transform="matrix(0.18181828,0,0,0.18181828,293.81817,46.545441)">
                   <path
                      transform="matrix(0.69565202,0,0,0.69565202,44.000022,32.000033)"
-                     d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                     d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                      sodipodi:ry="63.25"
                      sodipodi:rx="63.25"
                      sodipodi:cy="155.25"
@@ -22813,7 +22812,7 @@
                    sodipodi:cy="155.25"
                    sodipodi:rx="63.25"
                    sodipodi:ry="63.25"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    transform="matrix(0.0474309,0,0,0.0474309,313.1818,64.636357)" />
                 <g
                    transform="matrix(0.20052071,0,0,0.19505429,291.12501,44.281689)"
@@ -22827,7 +22826,7 @@
                      sodipodi:cy="155.25"
                      sodipodi:rx="63.25"
                      sodipodi:ry="63.25"
-                     d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                     d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                      transform="matrix(-0.18972328,0,0,-0.18972328,171.27272,170.45456)" />
                   <path
                      sodipodi:nodetypes="cccc"
@@ -22849,7 +22848,7 @@
                  id="g6033-0">
                 <path
                    transform="matrix(0.37934416,-3.1351523e-5,-3.1335757e-5,0.37923558,265.47415,13.120253)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -22859,7 +22858,7 @@
                    sodipodi:type="arc" />
                 <path
                    transform="matrix(0.31617066,-2.6124054e-5,-2.6117082e-5,0.31608017,274.55453,22.92438)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -22869,7 +22868,7 @@
                    sodipodi:type="arc" />
                 <path
                    transform="matrix(0.25291149,-2.0898618e-5,-2.0894046e-5,0.25283909,283.64722,32.741808)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -22879,7 +22878,7 @@
                    sodipodi:type="arc" />
                 <path
                    transform="matrix(0.18965228,-1.5671374e-5,-1.5667945e-5,0.18959798,292.73992,42.559238)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -23216,7 +23215,7 @@
              style="display:inline">
             <path
                transform="matrix(1.565915,0,0,1.279986,-7.565521,-3.434433)"
-               d="m 35.443728,33.636894 a 15.291184,3.9332814 0 1 1 -30.5823684,0 15.291184,3.9332814 0 1 1 30.5823684,0 z"
+               d="m 35.443728,33.636894 c 0,2.172292 -6.846096,3.933282 -15.291184,3.933282 -8.445088,0 -15.2911844,-1.76099 -15.2911844,-3.933282 0,-2.172291 6.8460964,-3.933281 15.2911844,-3.933281 8.445088,0 15.291184,1.76099 15.291184,3.933281 z"
                sodipodi:ry="3.9332814"
                sodipodi:rx="15.291184"
                sodipodi:cy="33.636894"
@@ -23268,7 +23267,7 @@
                sodipodi:cy="40.4375"
                sodipodi:rx="19.5625"
                sodipodi:ry="6.8125"
-               d="m 43.125,40.4375 a 19.5625,6.8125 0 1 1 -39.125,0 19.5625,6.8125 0 1 1 39.125,0 z"
+               d="m 43.125,40.4375 c 0,3.76244 -8.75843,6.8125 -19.5625,6.8125 C 12.75843,47.25 4,44.19994 4,40.4375 4,36.67506 12.75843,33.625 23.5625,33.625 c 10.80407,0 19.5625,3.05006 19.5625,6.8125 z"
                transform="matrix(-0.69968,0,0,0.499691,36.92371,12.80796)" />
             <path
                inkscape:connector-curvature="0"
@@ -23368,7 +23367,7 @@
                  transform="matrix(1,0,0,1.066291,-0.707108,-4.942179)"
                  inkscape:r_cy="true"
                  inkscape:r_cx="true"
-                 d="m 45.961941,41.63604 a 22.627417,5.6568542 0 1 1 -45.25483346,0 22.627417,5.6568542 0 1 1 45.25483346,0 z"
+                 d="m 45.961941,41.63604 c 0,3.124194 -10.13064,5.656854 -22.627417,5.656854 -12.496777,0 -22.62741646,-2.53266 -22.62741646,-5.656854 0,-3.124195 10.13063946,-5.656854 22.62741646,-5.656854 12.496777,0 22.627417,2.532659 22.627417,5.656854 z"
                  sodipodi:ry="5.6568542"
                  sodipodi:rx="22.627417"
                  sodipodi:cy="41.63604"
@@ -23405,7 +23404,7 @@
                    inkscape:r_cy="true" />
                 <path
                    transform="translate(-0.496132,-0.891381)"
-                   d="m 30.405591,24.930641 a 6.0987959,6.0987959 0 1 1 -12.197592,0 6.0987959,6.0987959 0 1 1 12.197592,0 z"
+                   d="m 30.405591,24.930641 c 0,3.368272 -2.730524,6.098796 -6.098796,6.098796 -3.368272,0 -6.098796,-2.730524 -6.098796,-6.098796 0,-3.368272 2.730524,-6.098796 6.098796,-6.098796 3.368272,0 6.098796,2.730524 6.098796,6.098796 z"
                    sodipodi:ry="6.0987959"
                    sodipodi:rx="6.0987959"
                    sodipodi:cy="24.930641"
@@ -23552,7 +23551,7 @@
                  sodipodi:cy="41.63604"
                  sodipodi:rx="22.627417"
                  sodipodi:ry="5.6568542"
-                 d="m 45.961941,41.63604 a 22.627417,5.6568542 0 1 1 -45.25483346,0 22.627417,5.6568542 0 1 1 45.25483346,0 z"
+                 d="m 45.961941,41.63604 c 0,3.124194 -10.13064,5.656854 -22.627417,5.656854 -12.496777,0 -22.62741646,-2.53266 -22.62741646,-5.656854 0,-3.124195 10.13063946,-5.656854 22.62741646,-5.656854 12.496777,0 22.627417,2.532659 22.627417,5.656854 z"
                  inkscape:r_cx="true"
                  inkscape:r_cy="true"
                  transform="matrix(0.522313,0,0,0.530331,17.99348,22.91911)" />
@@ -23570,7 +23569,7 @@
                  sodipodi:cy="41.87933"
                  sodipodi:rx="5.6637621"
                  sodipodi:ry="1.8473293"
-                 d="m 39.449857,41.87933 a 5.6637621,1.8473293 0 1 1 -11.327524,0 5.6637621,1.8473293 0 1 1 11.327524,0 z"
+                 d="m 39.449857,41.87933 c 0,1.020251 -2.535753,1.847329 -5.663762,1.847329 -3.12801,0 -5.663762,-0.827078 -5.663762,-1.847329 0,-1.020252 2.535752,-1.84733 5.663762,-1.84733 3.128009,0 5.663762,0.827078 5.663762,1.84733 z"
                  transform="matrix(0.966787,0,0,1.068809,-2.672022,-1.261024)" />
               <g
                  style="display:inline"
@@ -23749,7 +23748,7 @@
                sodipodi:cy="42.188465"
                sodipodi:rx="1.1932427"
                sodipodi:ry="1.0827572"
-               d="m 11.048544,42.188465 a 1.1932427,1.0827572 0 1 1 -2.3864858,0 1.1932427,1.0827572 0 1 1 2.3864858,0 z"
+               d="m 11.048544,42.188465 c 0,0.59799 -0.534233,1.082757 -1.1932431,1.082757 -0.6590097,0 -1.1932427,-0.484767 -1.1932427,-1.082757 0,-0.59799 0.534233,-1.082757 1.1932427,-1.082757 0.6590101,0 1.1932431,0.484767 1.1932431,1.082757 z"
                transform="matrix(0.4216252,0,0,0.4766032,5.3634688,21.39228)" />
           </g>
           <text
@@ -24244,7 +24243,7 @@
                sodipodi:cy="42.188465"
                sodipodi:rx="1.1932427"
                sodipodi:ry="1.0827572"
-               d="m 11.048544,42.188465 a 1.1932427,1.0827572 0 1 1 -2.3864858,0 1.1932427,1.0827572 0 1 1 2.3864858,0 z"
+               d="m 11.048544,42.188465 c 0,0.59799 -0.534233,1.082757 -1.1932431,1.082757 -0.6590097,0 -1.1932427,-0.484767 -1.1932427,-1.082757 0,-0.59799 0.534233,-1.082757 1.1932427,-1.082757 0.6590101,0 1.1932431,0.484767 1.1932431,1.082757 z"
                transform="matrix(0.4216252,0,0,0.4766032,5.3634688,21.39228)" />
           </g>
           <text
@@ -24750,7 +24749,7 @@
                inkscape:connector-curvature="0" />
             <path
                transform="matrix(0.4216252,0,0,0.4766032,5.3634688,21.39228)"
-               d="m 11.048544,42.188465 a 1.1932427,1.0827572 0 1 1 -2.3864858,0 1.1932427,1.0827572 0 1 1 2.3864858,0 z"
+               d="m 11.048544,42.188465 c 0,0.59799 -0.534233,1.082757 -1.1932431,1.082757 -0.6590097,0 -1.1932427,-0.484767 -1.1932427,-1.082757 0,-0.59799 0.534233,-1.082757 1.1932427,-1.082757 0.6590101,0 1.1932431,0.484767 1.1932431,1.082757 z"
                sodipodi:ry="1.0827572"
                sodipodi:rx="1.1932427"
                sodipodi:cy="42.188465"
@@ -25171,7 +25170,7 @@
                    ry="7.8000002" />
                 <path
                    transform="matrix(0.64680538,-0.64680538,0.29716347,0.29716347,7.3594367,104.10629)"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    sodipodi:ry="8.5"
                    sodipodi:rx="8.5"
                    sodipodi:cy="86.5"
@@ -25181,7 +25180,7 @@
                    sodipodi:type="arc" />
                 <path
                    transform="matrix(0.25300786,-0.25300786,0.11624006,0.11624006,50.336327,85.060075)"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    sodipodi:ry="8.5"
                    sodipodi:rx="8.5"
                    sodipodi:cy="86.5"
@@ -25191,7 +25190,7 @@
                    sodipodi:type="arc" />
                 <path
                    transform="matrix(0.32617031,-0.32617031,0.14985327,0.14985327,166.35178,248.59862)"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    sodipodi:ry="8.5"
                    sodipodi:rx="8.5"
                    sodipodi:cy="86.5"
@@ -25226,7 +25225,7 @@
                    id="g31976">
                   <path
                      transform="matrix(2.042553,0,0,2.0425529,-171.31912,-218.2127)"
-                     d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                     d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                      sodipodi:ry="11.75"
                      sodipodi:rx="11.75"
                      sodipodi:cy="216.5"
@@ -25250,12 +25249,12 @@
                      sodipodi:cy="216.5"
                      sodipodi:rx="11.75"
                      sodipodi:ry="11.75"
-                     d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                     d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                      transform="matrix(1.8723397,0,0,1.8723396,-144.04244,-187.36153)" />
                 </g>
                 <path
                    transform="matrix(1.53519,0,0,1.5351899,-84.052697,-106.36862)"
-                   d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                   d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                    sodipodi:ry="11.75"
                    sodipodi:rx="11.75"
                    sodipodi:cy="216.5"
@@ -25279,7 +25278,7 @@
                      sodipodi:cy="155.25"
                      sodipodi:rx="63.25"
                      sodipodi:ry="63.25"
-                     d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                     d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                      transform="matrix(0.69565202,0,0,0.69565202,44.000022,32.000033)" />
                   <path
                      inkscape:connector-curvature="0"
@@ -25334,7 +25333,7 @@
                    style="opacity:0.4;color:#000000;fill:none;stroke:url(#radialGradient30739-9-8);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
                 <path
                    transform="matrix(0.0474309,0,0,0.0474309,313.1818,64.636357)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -25348,7 +25347,7 @@
                    transform="matrix(0.20052071,0,0,0.19505429,291.12501,44.281689)">
                   <path
                      transform="matrix(-0.18972328,0,0,-0.18972328,171.27272,170.45456)"
-                     d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                     d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                      sodipodi:ry="63.25"
                      sodipodi:rx="63.25"
                      sodipodi:cy="155.25"
@@ -25382,7 +25381,7 @@
                    sodipodi:cy="155.25"
                    sodipodi:rx="63.25"
                    sodipodi:ry="63.25"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    transform="matrix(0.37934416,-3.1351523e-5,-3.1335757e-5,0.37923558,265.47415,13.120253)" />
                 <path
                    sodipodi:type="arc"
@@ -25392,7 +25391,7 @@
                    sodipodi:cy="155.25"
                    sodipodi:rx="63.25"
                    sodipodi:ry="63.25"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    transform="matrix(0.31617066,-2.6124054e-5,-2.6117082e-5,0.31608017,274.55453,22.92438)" />
                 <path
                    sodipodi:type="arc"
@@ -25402,7 +25401,7 @@
                    sodipodi:cy="155.25"
                    sodipodi:rx="63.25"
                    sodipodi:ry="63.25"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    transform="matrix(0.25291149,-2.0898618e-5,-2.0894046e-5,0.25283909,283.64722,32.741808)" />
                 <path
                    sodipodi:type="arc"
@@ -25412,7 +25411,7 @@
                    sodipodi:cy="155.25"
                    sodipodi:rx="63.25"
                    sodipodi:ry="63.25"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    transform="matrix(0.18965228,-1.5671374e-5,-1.5667945e-5,0.18959798,292.73992,42.559238)" />
               </g>
               <g
@@ -25749,7 +25748,7 @@
                sodipodi:cy="33.636894"
                sodipodi:rx="15.291184"
                sodipodi:ry="3.9332814"
-               d="m 35.443728,33.636894 a 15.291184,3.9332814 0 1 1 -30.5823684,0 15.291184,3.9332814 0 1 1 30.5823684,0 z"
+               d="m 35.443728,33.636894 c 0,2.172292 -6.846096,3.933282 -15.291184,3.933282 -8.445088,0 -15.2911844,-1.76099 -15.2911844,-3.933282 0,-2.172291 6.8460964,-3.933281 15.2911844,-3.933281 8.445088,0 15.291184,1.76099 15.291184,3.933281 z"
                transform="matrix(1.565915,0,0,1.279986,-7.565521,-3.434433)" />
             <path
                sodipodi:nodetypes="czzzz"
@@ -25789,7 +25788,7 @@
                inkscape:connector-curvature="0" />
             <path
                transform="matrix(-0.69968,0,0,0.499691,36.92371,12.80796)"
-               d="m 43.125,40.4375 a 19.5625,6.8125 0 1 1 -39.125,0 19.5625,6.8125 0 1 1 39.125,0 z"
+               d="m 43.125,40.4375 c 0,3.76244 -8.75843,6.8125 -19.5625,6.8125 C 12.75843,47.25 4,44.19994 4,40.4375 4,36.67506 12.75843,33.625 23.5625,33.625 c 10.80407,0 19.5625,3.05006 19.5625,6.8125 z"
                sodipodi:ry="6.8125"
                sodipodi:rx="19.5625"
                sodipodi:cy="40.4375"
@@ -25899,7 +25898,7 @@
                  sodipodi:cy="41.63604"
                  sodipodi:rx="22.627417"
                  sodipodi:ry="5.6568542"
-                 d="m 45.961941,41.63604 a 22.627417,5.6568542 0 1 1 -45.25483346,0 22.627417,5.6568542 0 1 1 45.25483346,0 z"
+                 d="m 45.961941,41.63604 c 0,3.124194 -10.13064,5.656854 -22.627417,5.656854 -12.496777,0 -22.62741646,-2.53266 -22.62741646,-5.656854 0,-3.124195 10.13063946,-5.656854 22.62741646,-5.656854 12.496777,0 22.627417,2.532659 22.627417,5.656854 z"
                  inkscape:r_cx="true"
                  inkscape:r_cy="true"
                  transform="matrix(1,0,0,1.066291,-0.707108,-4.942179)" />
@@ -25940,7 +25939,7 @@
                    sodipodi:cy="24.930641"
                    sodipodi:rx="6.0987959"
                    sodipodi:ry="6.0987959"
-                   d="m 30.405591,24.930641 a 6.0987959,6.0987959 0 1 1 -12.197592,0 6.0987959,6.0987959 0 1 1 12.197592,0 z"
+                   d="m 30.405591,24.930641 c 0,3.368272 -2.730524,6.098796 -6.098796,6.098796 -3.368272,0 -6.098796,-2.730524 -6.098796,-6.098796 0,-3.368272 2.730524,-6.098796 6.098796,-6.098796 3.368272,0 6.098796,2.730524 6.098796,6.098796 z"
                    transform="translate(-0.496132,-0.891381)" />
               </g>
               <path
@@ -26075,7 +26074,7 @@
                  transform="matrix(0.522313,0,0,0.530331,17.99348,22.91911)"
                  inkscape:r_cy="true"
                  inkscape:r_cx="true"
-                 d="m 45.961941,41.63604 a 22.627417,5.6568542 0 1 1 -45.25483346,0 22.627417,5.6568542 0 1 1 45.25483346,0 z"
+                 d="m 45.961941,41.63604 c 0,3.124194 -10.13064,5.656854 -22.627417,5.656854 -12.496777,0 -22.62741646,-2.53266 -22.62741646,-5.656854 0,-3.124195 10.13063946,-5.656854 22.62741646,-5.656854 12.496777,0 22.627417,2.532659 22.627417,5.656854 z"
                  sodipodi:ry="5.6568542"
                  sodipodi:rx="22.627417"
                  sodipodi:cy="41.63604"
@@ -26091,7 +26090,7 @@
                  inkscape:connector-curvature="0" />
               <path
                  transform="matrix(0.966787,0,0,1.068809,-2.672022,-1.261024)"
-                 d="m 39.449857,41.87933 a 5.6637621,1.8473293 0 1 1 -11.327524,0 5.6637621,1.8473293 0 1 1 11.327524,0 z"
+                 d="m 39.449857,41.87933 c 0,1.020251 -2.535753,1.847329 -5.663762,1.847329 -3.12801,0 -5.663762,-0.827078 -5.663762,-1.847329 0,-1.020252 2.535752,-1.84733 5.663762,-1.84733 3.128009,0 5.663762,0.827078 5.663762,1.84733 z"
                  sodipodi:ry="1.8473293"
                  sodipodi:rx="5.6637621"
                  sodipodi:cy="41.87933"
@@ -26270,7 +26269,7 @@
                inkscape:connector-curvature="0" />
             <path
                transform="matrix(0.4216252,0,0,0.4766032,5.3634688,21.39228)"
-               d="m 11.048544,42.188465 a 1.1932427,1.0827572 0 1 1 -2.3864858,0 1.1932427,1.0827572 0 1 1 2.3864858,0 z"
+               d="m 11.048544,42.188465 c 0,0.59799 -0.534233,1.082757 -1.1932431,1.082757 -0.6590097,0 -1.1932427,-0.484767 -1.1932427,-1.082757 0,-0.59799 0.534233,-1.082757 1.1932427,-1.082757 0.6590101,0 1.1932431,0.484767 1.1932431,1.082757 z"
                sodipodi:ry="1.0827572"
                sodipodi:rx="1.1932427"
                sodipodi:cy="42.188465"
@@ -26765,7 +26764,7 @@
                inkscape:connector-curvature="0" />
             <path
                transform="matrix(0.4216252,0,0,0.4766032,5.3634688,21.39228)"
-               d="m 11.048544,42.188465 a 1.1932427,1.0827572 0 1 1 -2.3864858,0 1.1932427,1.0827572 0 1 1 2.3864858,0 z"
+               d="m 11.048544,42.188465 c 0,0.59799 -0.534233,1.082757 -1.1932431,1.082757 -0.6590097,0 -1.1932427,-0.484767 -1.1932427,-1.082757 0,-0.59799 0.534233,-1.082757 1.1932427,-1.082757 0.6590101,0 1.1932431,0.484767 1.1932431,1.082757 z"
                sodipodi:ry="1.0827572"
                sodipodi:rx="1.1932427"
                sodipodi:cy="42.188465"
@@ -27298,7 +27297,7 @@
                sodipodi:cy="42.188465"
                sodipodi:rx="1.1932427"
                sodipodi:ry="1.0827572"
-               d="m 11.048544,42.188465 a 1.1932427,1.0827572 0 1 1 -2.3864858,0 1.1932427,1.0827572 0 1 1 2.3864858,0 z"
+               d="m 11.048544,42.188465 c 0,0.59799 -0.534233,1.082757 -1.1932431,1.082757 -0.6590097,0 -1.1932427,-0.484767 -1.1932427,-1.082757 0,-0.59799 0.534233,-1.082757 1.1932427,-1.082757 0.6590101,0 1.1932431,0.484767 1.1932431,1.082757 z"
                transform="matrix(0.4216252,0,0,0.4766032,5.3634688,21.39228)" />
           </g>
           <text
@@ -27598,7 +27597,7 @@
                    sodipodi:cy="86.5"
                    sodipodi:rx="8.5"
                    sodipodi:ry="8.5"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    transform="matrix(0.64680538,-0.64680538,0.29716347,0.29716347,7.3594367,104.10629)" />
                 <path
                    sodipodi:type="arc"
@@ -27608,7 +27607,7 @@
                    sodipodi:cy="86.5"
                    sodipodi:rx="8.5"
                    sodipodi:ry="8.5"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    transform="matrix(0.25300786,-0.25300786,0.11624006,0.11624006,50.336327,85.060075)" />
                 <path
                    sodipodi:type="arc"
@@ -27618,7 +27617,7 @@
                    sodipodi:cy="86.5"
                    sodipodi:rx="8.5"
                    sodipodi:ry="8.5"
-                   d="m 87.25,86.5 a 8.5,8.5 0 1 1 -17,0 8.5,8.5 0 1 1 17,0 z"
+                   d="m 87.25,86.5 c 0,4.69442 -3.80558,8.5 -8.5,8.5 -4.69442,0 -8.5,-3.80558 -8.5,-8.5 0,-4.69442 3.80558,-8.5 8.5,-8.5 4.69442,0 8.5,3.80558 8.5,8.5 z"
                    transform="matrix(0.32617031,-0.32617031,0.14985327,0.14985327,166.35178,248.59862)" />
                 <path
                    d="m 105.5625,44.59375 c -8.805711,0 -16.379622,4.70254 -20.46875,11.65625 L 77.65625,74 A 2.6002601,2.6002601 0 0 1 77.5,74.3125 C 75.153793,78.342238 73.78125,83.003622 73.78125,88 l 0,132 c 0,15.20797 12.325502,27.40625 27.75,27.40625 l 84.9375,0 c 15.4245,0 27.75,-12.19828 27.75,-27.40625 l 0,-132 c 0,-4.996409 -1.37248,-9.657806 -3.71875,-13.6875 A 2.6002601,2.6002601 0 0 1 210.34375,74 l -7.4375,-17.75 C 198.81701,49.296253 191.24321,44.59375 182.4375,44.59375 l -76.875,0 z"
@@ -27654,7 +27653,7 @@
                      sodipodi:cy="216.5"
                      sodipodi:rx="11.75"
                      sodipodi:ry="11.75"
-                     d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                     d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                      transform="matrix(2.042553,0,0,2.0425529,-171.31912,-218.2127)" />
                 </g>
                 <g
@@ -27665,7 +27664,7 @@
                    transform="matrix(0.81818181,0,0,0.81818181,34.36364,47.636363)">
                   <path
                      transform="matrix(1.8723397,0,0,1.8723396,-144.04244,-187.36153)"
-                     d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                     d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                      sodipodi:ry="11.75"
                      sodipodi:rx="11.75"
                      sodipodi:cy="216.5"
@@ -27682,7 +27681,7 @@
                    sodipodi:cy="216.5"
                    sodipodi:rx="11.75"
                    sodipodi:ry="11.75"
-                   d="m 183.75,216.5 a 11.75,11.75 0 1 1 -23.5,0 11.75,11.75 0 1 1 23.5,0 z"
+                   d="m 183.75,216.5 c 0,6.48935 -5.26065,11.75 -11.75,11.75 -6.48935,0 -11.75,-5.26065 -11.75,-11.75 0,-6.48935 5.26065,-11.75 11.75,-11.75 6.48935,0 11.75,5.26065 11.75,11.75 z"
                    transform="matrix(1.53519,0,0,1.5351899,-84.052697,-106.36862)" />
               </g>
               <g
@@ -27694,7 +27693,7 @@
                    transform="matrix(0.18181828,0,0,0.18181828,293.81817,46.545441)">
                   <path
                      transform="matrix(0.69565202,0,0,0.69565202,44.000022,32.000033)"
-                     d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                     d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                      sodipodi:ry="63.25"
                      sodipodi:rx="63.25"
                      sodipodi:cy="155.25"
@@ -27761,7 +27760,7 @@
                    sodipodi:cy="155.25"
                    sodipodi:rx="63.25"
                    sodipodi:ry="63.25"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    transform="matrix(0.0474309,0,0,0.0474309,313.1818,64.636357)" />
                 <g
                    transform="matrix(0.20052071,0,0,0.19505429,291.12501,44.281689)"
@@ -27775,7 +27774,7 @@
                      sodipodi:cy="155.25"
                      sodipodi:rx="63.25"
                      sodipodi:ry="63.25"
-                     d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                     d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                      transform="matrix(-0.18972328,0,0,-0.18972328,171.27272,170.45456)" />
                   <path
                      sodipodi:nodetypes="cccc"
@@ -27797,7 +27796,7 @@
                  id="g6033-02">
                 <path
                    transform="matrix(0.37934416,-3.1351523e-5,-3.1335757e-5,0.37923558,265.47415,13.120253)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -27807,7 +27806,7 @@
                    sodipodi:type="arc" />
                 <path
                    transform="matrix(0.31617066,-2.6124054e-5,-2.6117082e-5,0.31608017,274.55453,22.92438)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -27817,7 +27816,7 @@
                    sodipodi:type="arc" />
                 <path
                    transform="matrix(0.25291149,-2.0898618e-5,-2.0894046e-5,0.25283909,283.64722,32.741808)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -27827,7 +27826,7 @@
                    sodipodi:type="arc" />
                 <path
                    transform="matrix(0.18965228,-1.5671374e-5,-1.5667945e-5,0.18959798,292.73992,42.559238)"
-                   d="m 207,155.25 a 63.25,63.25 0 1 1 -126.5,0 63.25,63.25 0 1 1 126.5,0 z"
+                   d="m 207,155.25 c 0,34.93201 -28.31799,63.25 -63.25,63.25 C 108.81799,218.5 80.5,190.18201 80.5,155.25 80.5,120.31799 108.81799,92 143.75,92 178.68201,92 207,120.31799 207,155.25 z"
                    sodipodi:ry="63.25"
                    sodipodi:rx="63.25"
                    sodipodi:cy="155.25"
@@ -28353,7 +28352,7 @@
                inkscape:connector-curvature="0" />
             <path
                transform="matrix(1,0,0,1.005714,-3.625004,1.76858)"
-               d="m 43.125,29.5625 a 6.5,10.9375 0 1 1 -13,0 6.5,10.9375 0 1 1 13,0 z"
+               d="m 43.125,29.5625 c 0,6.040614 -2.910149,10.9375 -6.5,10.9375 -3.589851,0 -6.5,-4.896886 -6.5,-10.9375 0,-6.040614 2.910149,-10.9375 6.5,-10.9375 3.589851,0 6.5,4.896886 6.5,10.9375 z"
                sodipodi:ry="10.9375"
                sodipodi:rx="6.5"
                sodipodi:cy="29.5625"
@@ -28391,9 +28390,9 @@
                sodipodi:cy="31.953125"
                sodipodi:rx="1.78125"
                sodipodi:ry="3.046875"
-               d="m 35.5625,31.953125 a 1.78125,3.046875 0 1 1 -3.5625,0 1.78125,3.046875 0 1 1 3.5625,0 z" />
+               d="M 35.5625,31.953125 C 35.5625,33.635868 34.765007,35 33.78125,35 32.797493,35 32,33.635868 32,31.953125 c 0,-1.682743 0.797493,-3.046875 1.78125,-3.046875 0.983757,0 1.78125,1.364132 1.78125,3.046875 z" />
             <path
-               d="m 35.5625,31.953125 a 1.78125,3.046875 0 1 1 -3.5625,0 1.78125,3.046875 0 1 1 3.5625,0 z"
+               d="M 35.5625,31.953125 C 35.5625,33.635868 34.765007,35 33.78125,35 32.797493,35 32,33.635868 32,31.953125 c 0,-1.682743 0.797493,-3.046875 1.78125,-3.046875 0.983757,0 1.78125,1.364132 1.78125,3.046875 z"
                sodipodi:ry="3.046875"
                sodipodi:rx="1.78125"
                sodipodi:cy="31.953125"
@@ -28437,7 +28436,7 @@
                inkscape:connector-curvature="0" />
             <path
                transform="matrix(0.3099463,0,0,0.3099463,31.493952,6.4917696)"
-               d="m 45.696776,10.258176 a 1.0606601,1.0606601 0 1 1 -2.12132,0 1.0606601,1.0606601 0 1 1 2.12132,0 z"
+               d="m 45.696776,10.258176 c 0,0.585786 -0.474874,1.06066 -1.06066,1.06066 -0.585786,0 -1.06066,-0.474874 -1.06066,-1.06066 0,-0.5857866 0.474874,-1.0606603 1.06066,-1.0606603 0.585786,0 1.06066,0.4748737 1.06066,1.0606603 z"
                sodipodi:ry="1.0606601"
                sodipodi:rx="1.0606601"
                sodipodi:cy="10.258176"
@@ -28463,7 +28462,7 @@
                sodipodi:cy="10.258176"
                sodipodi:rx="1.0606601"
                sodipodi:ry="1.0606601"
-               d="m 45.696776,10.258176 a 1.0606601,1.0606601 0 1 1 -2.12132,0 1.0606601,1.0606601 0 1 1 2.12132,0 z"
+               d="m 45.696776,10.258176 c 0,0.585786 -0.474874,1.06066 -1.06066,1.06066 -0.585786,0 -1.06066,-0.474874 -1.06066,-1.06066 0,-0.5857866 0.474874,-1.0606603 1.06066,-1.0606603 0.585786,0 1.06066,0.4748737 1.06066,1.0606603 z"
                transform="matrix(0.2526545,0,0,0.2526545,9.7196677,7.1512934)" />
             <path
                sodipodi:nodetypes="ccc"
@@ -28478,7 +28477,7 @@
                inkscape:connector-curvature="0" />
             <path
                transform="matrix(1.2222222,0,0,1,-9.2654717,0.02209709)"
-               d="m 41.71875,9.4375 a 0.703125,1.15625 0 1 1 -1.40625,0 0.703125,1.15625 0 1 1 1.40625,0 z"
+               d="m 41.71875,9.4375 c 0,0.638579 -0.3148,1.15625 -0.703125,1.15625 -0.388325,0 -0.703125,-0.517671 -0.703125,-1.15625 0,-0.6385792 0.3148,-1.15625 0.703125,-1.15625 0.388325,0 0.703125,0.5176708 0.703125,1.15625 z"
                sodipodi:ry="1.15625"
                sodipodi:rx="0.703125"
                sodipodi:cy="9.4375"
@@ -30214,7 +30213,7 @@
              id="g7325-4">
             <path
                transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-37.271259)"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                sodipodi:ry="1.9003495"
                sodipodi:rx="1.9003495"
                sodipodi:cy="617.14966"
@@ -30230,7 +30229,7 @@
                sodipodi:cy="617.14966"
                sodipodi:rx="1.9003495"
                sodipodi:ry="1.9003495"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                transform="matrix(0.78932957,0,0,0.78932789,-289.14046,-37.271259)" />
             <path
                sodipodi:type="arc"
@@ -30240,11 +30239,11 @@
                sodipodi:cy="617.14966"
                sodipodi:rx="1.9003495"
                sodipodi:ry="1.9003495"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-41.271259)" />
             <path
                transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-45.271259)"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                sodipodi:ry="1.9003495"
                sodipodi:rx="1.9003495"
                sodipodi:cy="617.14966"
@@ -30254,7 +30253,7 @@
                sodipodi:type="arc" />
             <path
                transform="matrix(0.78932957,0,0,0.78932789,-293.14046,-37.271259)"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                sodipodi:ry="1.9003495"
                sodipodi:rx="1.9003495"
                sodipodi:cy="617.14966"
@@ -30264,7 +30263,7 @@
                sodipodi:type="arc" />
             <path
                transform="matrix(0.78932957,0,0,0.78932789,-289.14046,-41.271259)"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                sodipodi:ry="1.9003495"
                sodipodi:rx="1.9003495"
                sodipodi:cy="617.14966"
@@ -31135,11 +31134,11 @@
                sodipodi:cy="617.14966"
                sodipodi:rx="1.9003495"
                sodipodi:ry="1.9003495"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-37.271259)" />
             <path
                transform="matrix(0.78932957,0,0,0.78932789,-289.14046,-37.271259)"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                sodipodi:ry="1.9003495"
                sodipodi:rx="1.9003495"
                sodipodi:cy="617.14966"
@@ -31149,7 +31148,7 @@
                sodipodi:type="arc" />
             <path
                transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-41.271259)"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                sodipodi:ry="1.9003495"
                sodipodi:rx="1.9003495"
                sodipodi:cy="617.14966"
@@ -31165,7 +31164,7 @@
                sodipodi:cy="617.14966"
                sodipodi:rx="1.9003495"
                sodipodi:ry="1.9003495"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                transform="matrix(0.78932957,0,0,0.78932789,-285.14046,-45.271259)" />
             <path
                sodipodi:type="arc"
@@ -31175,7 +31174,7 @@
                sodipodi:cy="617.14966"
                sodipodi:rx="1.9003495"
                sodipodi:ry="1.9003495"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                transform="matrix(0.78932957,0,0,0.78932789,-293.14046,-37.271259)" />
             <path
                sodipodi:type="arc"
@@ -31185,7 +31184,7 @@
                sodipodi:cy="617.14966"
                sodipodi:rx="1.9003495"
                sodipodi:ry="1.9003495"
-               d="m 870.53682,617.14966 a 1.9003495,1.9003495 0 1 1 -3.80069,0 1.9003495,1.9003495 0 1 1 3.80069,0 z"
+               d="m 870.53682,617.14966 c 0,1.04953 -0.85081,1.90035 -1.90035,1.90035 -1.04953,0 -1.90034,-0.85082 -1.90034,-1.90035 0,-1.04954 0.85081,-1.90035 1.90034,-1.90035 1.04954,0 1.90035,0.85081 1.90035,1.90035 z"
                transform="matrix(0.78932957,0,0,0.78932789,-289.14046,-41.271259)" />
           </g>
           <g
@@ -32273,11 +32272,11 @@
              sodipodi:cy="33.9375"
              sodipodi:rx="18.25"
              sodipodi:ry="5.1875"
-             d="m 41.25,33.9375 a 18.25,5.1875 0 1 1 -36.5,0 18.25,5.1875 0 1 1 36.5,0 z"
+             d="m 41.25,33.9375 c 0,2.864977 -8.170803,5.1875 -18.25,5.1875 -10.079197,0 -18.25,-2.322523 -18.25,-5.1875 0,-2.864977 8.170803,-5.1875 18.25,-5.1875 10.079197,0 18.25,2.322523 18.25,5.1875 z"
              transform="matrix(0.6220471,0,0,0.9518067,337.31792,1.385546)" />
           <path
              transform="matrix(1,0,0,1.53012,328.625,-17.99096)"
-             d="m 41.25,33.9375 a 18.25,5.1875 0 1 1 -36.5,0 18.25,5.1875 0 1 1 36.5,0 z"
+             d="m 41.25,33.9375 c 0,2.864977 -8.170803,5.1875 -18.25,5.1875 -10.079197,0 -18.25,-2.322523 -18.25,-5.1875 0,-2.864977 8.170803,-5.1875 18.25,-5.1875 10.079197,0 18.25,2.322523 18.25,5.1875 z"
              sodipodi:ry="5.1875"
              sodipodi:rx="18.25"
              sodipodi:cy="33.9375"
@@ -32299,7 +32298,7 @@
              inkscape:connector-curvature="0" />
           <path
              transform="matrix(0.810984,-0.585069,0.585069,0.810984,313.22209,6.947121)"
-             d="m 10.429825,27.228739 a 4.3310289,6.0987959 0 1 1 -8.662058,0 4.3310289,6.0987959 0 1 1 8.662058,0 z"
+             d="m 10.429825,27.228739 c 0,3.368272 -1.9390679,6.098796 -4.3310291,6.098796 -2.3919612,0 -4.3310289,-2.730524 -4.3310289,-6.098796 0,-3.368272 1.9390677,-6.098796 4.3310289,-6.098796 2.3919612,0 4.3310291,2.730524 4.3310291,6.098796 z"
              sodipodi:ry="6.0987959"
              sodipodi:rx="4.3310289"
              sodipodi:cy="27.228739"
@@ -32318,7 +32317,7 @@
              inkscape:radius="-1.044355"
              sodipodi:type="inkscape:offset" />
           <path
-             d="m 5.833631,23.251263 a 1.767767,2.1213202 0 1 1 -3.5355339,0 1.767767,2.1213202 0 1 1 3.5355339,0 z"
+             d="m 5.833631,23.251263 c 0,1.171572 -0.7914562,2.12132 -1.7677669,2.12132 -0.9763107,0 -1.767767,-0.949748 -1.767767,-2.12132 0,-1.171573 0.7914563,-2.121321 1.767767,-2.121321 0.9763107,0 1.7677669,0.949748 1.7677669,2.121321 z"
              sodipodi:ry="2.1213202"
              sodipodi:rx="1.767767"
              sodipodi:cy="23.251263"
@@ -32336,7 +32335,7 @@
              inkscape:connector-curvature="0" />
           <path
              transform="translate(272.13855,0)"
-             d="m 72.655224,21.837049 a 3.1819806,3.1819806 0 1 1 -6.363961,0 3.1819806,3.1819806 0 1 1 6.363961,0 z"
+             d="m 72.655224,21.837049 c 0,1.75736 -1.424621,3.181981 -3.18198,3.181981 -1.75736,0 -3.181981,-1.424621 -3.181981,-3.181981 0,-1.757359 1.424621,-3.18198 3.181981,-3.18198 1.757359,0 3.18198,1.424621 3.18198,3.18198 z"
              sodipodi:ry="3.1819806"
              sodipodi:rx="3.1819806"
              sodipodi:cy="21.837049"
@@ -32352,11 +32351,11 @@
              sodipodi:cy="21.837049"
              sodipodi:rx="3.1819806"
              sodipodi:ry="3.1819806"
-             d="m 72.655224,21.837049 a 3.1819806,3.1819806 0 1 1 -6.363961,0 3.1819806,3.1819806 0 1 1 6.363961,0 z"
+             d="m 72.655224,21.837049 c 0,1.75736 -1.424621,3.181981 -3.18198,3.181981 -1.75736,0 -3.181981,-1.424621 -3.181981,-3.181981 0,-1.757359 1.424621,-3.18198 3.181981,-3.18198 1.757359,0 3.18198,1.424621 3.18198,3.18198 z"
              transform="matrix(1.5,0,0,1.5,245.8318,-10.91852)" />
           <path
              transform="translate(329.41422,0.707108)"
-             d="m 24.041631,21.837049 a 2.2980971,2.2980971 0 1 1 -4.596194,0 2.2980971,2.2980971 0 1 1 4.596194,0 z"
+             d="m 24.041631,21.837049 c 0,1.269204 -1.028893,2.298098 -2.298097,2.298098 -1.269204,0 -2.298097,-1.028894 -2.298097,-2.298098 0,-1.269204 1.028893,-2.298097 2.298097,-2.298097 1.269204,0 2.298097,1.028893 2.298097,2.298097 z"
              sodipodi:ry="2.2980971"
              sodipodi:rx="2.2980971"
              sodipodi:cy="21.837049"
@@ -32366,7 +32365,7 @@
              sodipodi:type="arc" />
           <path
              transform="matrix(0.9,0,0,0.9,331.02288,2.625648)"
-             d="m 23.157747,20.953165 a 1.767767,1.767767 0 1 1 -3.535534,0 1.767767,1.767767 0 1 1 3.535534,0 z"
+             d="m 23.157747,20.953165 c 0,0.976311 -0.791456,1.767767 -1.767767,1.767767 -0.97631,0 -1.767767,-0.791456 -1.767767,-1.767767 0,-0.976311 0.791457,-1.767767 1.767767,-1.767767 0.976311,0 1.767767,0.791456 1.767767,1.767767 z"
              sodipodi:ry="1.767767"
              sodipodi:rx="1.767767"
              sodipodi:cy="20.953165"
@@ -32383,7 +32382,7 @@
              sodipodi:cy="21.837049"
              sodipodi:rx="2.2980971"
              sodipodi:ry="2.2980971"
-             d="m 24.041631,21.837049 a 2.2980971,2.2980971 0 1 1 -4.596194,0 2.2980971,2.2980971 0 1 1 4.596194,0 z" />
+             d="m 24.041631,21.837049 c 0,1.269204 -1.028893,2.298098 -2.298097,2.298098 -1.269204,0 -2.298097,-1.028894 -2.298097,-2.298098 0,-1.269204 1.028893,-2.298097 2.298097,-2.298097 1.269204,0 2.298097,1.028893 2.298097,2.298097 z" />
           <path
              sodipodi:type="arc"
              style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9999997;marker:none;visibility:visible;display:inline;overflow:visible"
@@ -32392,7 +32391,7 @@
              sodipodi:cy="20.953165"
              sodipodi:rx="1.767767"
              sodipodi:ry="1.767767"
-             d="m 23.157747,20.953165 a 1.767767,1.767767 0 1 1 -3.535534,0 1.767767,1.767767 0 1 1 3.535534,0 z"
+             d="m 23.157747,20.953165 c 0,0.976311 -0.791456,1.767767 -1.767767,1.767767 -0.97631,0 -1.767767,-0.791456 -1.767767,-1.767767 0,-0.976311 0.791457,-1.767767 1.767767,-1.767767 0.976311,0 1.767767,0.791456 1.767767,1.767767 z"
              transform="matrix(0.553846,0,0,0.553846,330.24885,10.02145)" />
           <path
              sodipodi:nodetypes="ccccc"
@@ -32422,7 +32421,7 @@
              transform="matrix(-0.23154,-1.039181,1.039181,-0.23154,333.25433,54.09927)"
              inkscape:r_cy="true"
              inkscape:r_cx="true"
-             d="m 8.8749989,37.75 a 1.2499999,1.2499999 0 1 1 -2.4999997,0 1.2499999,1.2499999 0 1 1 2.4999997,0 z"
+             d="m 8.8749989,37.75 c 0,0.690356 -0.559644,1.25 -1.2499999,1.25 -0.6903558,0 -1.2499998,-0.559644 -1.2499998,-1.25 0,-0.690356 0.559644,-1.25 1.2499998,-1.25 0.6903559,0 1.2499999,0.559644 1.2499999,1.25 z"
              sodipodi:ry="1.2499999"
              sodipodi:rx="1.2499999"
              sodipodi:cy="37.75"
@@ -32660,9 +32659,9 @@
              sodipodi:cy="727.61218"
              sodipodi:rx="3.375"
              sodipodi:ry="3.375"
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z" />
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z" />
           <path
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z"
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z"
              sodipodi:ry="3.375"
              sodipodi:rx="3.375"
              sodipodi:cy="727.61218"
@@ -32680,7 +32679,7 @@
              sodipodi:cy="727.61218"
              sodipodi:rx="3.375"
              sodipodi:ry="3.375"
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z" />
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z" />
         </g>
         <text
            id="text24842"
@@ -33224,11 +33223,11 @@
              sodipodi:cy="33.9375"
              sodipodi:rx="18.25"
              sodipodi:ry="5.1875"
-             d="m 41.25,33.9375 a 18.25,5.1875 0 1 1 -36.5,0 18.25,5.1875 0 1 1 36.5,0 z"
+             d="m 41.25,33.9375 c 0,2.864977 -8.170803,5.1875 -18.25,5.1875 -10.079197,0 -18.25,-2.322523 -18.25,-5.1875 0,-2.864977 8.170803,-5.1875 18.25,-5.1875 10.079197,0 18.25,2.322523 18.25,5.1875 z"
              transform="matrix(0.6220471,0,0,0.9518067,337.31792,1.385546)" />
           <path
              transform="matrix(1,0,0,1.53012,328.625,-17.99096)"
-             d="m 41.25,33.9375 a 18.25,5.1875 0 1 1 -36.5,0 18.25,5.1875 0 1 1 36.5,0 z"
+             d="m 41.25,33.9375 c 0,2.864977 -8.170803,5.1875 -18.25,5.1875 -10.079197,0 -18.25,-2.322523 -18.25,-5.1875 0,-2.864977 8.170803,-5.1875 18.25,-5.1875 10.079197,0 18.25,2.322523 18.25,5.1875 z"
              sodipodi:ry="5.1875"
              sodipodi:rx="18.25"
              sodipodi:cy="33.9375"
@@ -33250,7 +33249,7 @@
              inkscape:connector-curvature="0" />
           <path
              transform="matrix(0.810984,-0.585069,0.585069,0.810984,313.22209,6.947121)"
-             d="m 10.429825,27.228739 a 4.3310289,6.0987959 0 1 1 -8.662058,0 4.3310289,6.0987959 0 1 1 8.662058,0 z"
+             d="m 10.429825,27.228739 c 0,3.368272 -1.9390679,6.098796 -4.3310291,6.098796 -2.3919612,0 -4.3310289,-2.730524 -4.3310289,-6.098796 0,-3.368272 1.9390677,-6.098796 4.3310289,-6.098796 2.3919612,0 4.3310291,2.730524 4.3310291,6.098796 z"
              sodipodi:ry="6.0987959"
              sodipodi:rx="4.3310289"
              sodipodi:cy="27.228739"
@@ -33269,7 +33268,7 @@
              inkscape:radius="-1.044355"
              sodipodi:type="inkscape:offset" />
           <path
-             d="m 5.833631,23.251263 a 1.767767,2.1213202 0 1 1 -3.5355339,0 1.767767,2.1213202 0 1 1 3.5355339,0 z"
+             d="m 5.833631,23.251263 c 0,1.171572 -0.7914562,2.12132 -1.7677669,2.12132 -0.9763107,0 -1.767767,-0.949748 -1.767767,-2.12132 0,-1.171573 0.7914563,-2.121321 1.767767,-2.121321 0.9763107,0 1.7677669,0.949748 1.7677669,2.121321 z"
              sodipodi:ry="2.1213202"
              sodipodi:rx="1.767767"
              sodipodi:cy="23.251263"
@@ -33287,7 +33286,7 @@
              inkscape:connector-curvature="0" />
           <path
              transform="translate(272.13855,0)"
-             d="m 72.655224,21.837049 a 3.1819806,3.1819806 0 1 1 -6.363961,0 3.1819806,3.1819806 0 1 1 6.363961,0 z"
+             d="m 72.655224,21.837049 c 0,1.75736 -1.424621,3.181981 -3.18198,3.181981 -1.75736,0 -3.181981,-1.424621 -3.181981,-3.181981 0,-1.757359 1.424621,-3.18198 3.181981,-3.18198 1.757359,0 3.18198,1.424621 3.18198,3.18198 z"
              sodipodi:ry="3.1819806"
              sodipodi:rx="3.1819806"
              sodipodi:cy="21.837049"
@@ -33303,11 +33302,11 @@
              sodipodi:cy="21.837049"
              sodipodi:rx="3.1819806"
              sodipodi:ry="3.1819806"
-             d="m 72.655224,21.837049 a 3.1819806,3.1819806 0 1 1 -6.363961,0 3.1819806,3.1819806 0 1 1 6.363961,0 z"
+             d="m 72.655224,21.837049 c 0,1.75736 -1.424621,3.181981 -3.18198,3.181981 -1.75736,0 -3.181981,-1.424621 -3.181981,-3.181981 0,-1.757359 1.424621,-3.18198 3.181981,-3.18198 1.757359,0 3.18198,1.424621 3.18198,3.18198 z"
              transform="matrix(1.5,0,0,1.5,245.8318,-10.91852)" />
           <path
              transform="translate(329.41422,0.707108)"
-             d="m 24.041631,21.837049 a 2.2980971,2.2980971 0 1 1 -4.596194,0 2.2980971,2.2980971 0 1 1 4.596194,0 z"
+             d="m 24.041631,21.837049 c 0,1.269204 -1.028893,2.298098 -2.298097,2.298098 -1.269204,0 -2.298097,-1.028894 -2.298097,-2.298098 0,-1.269204 1.028893,-2.298097 2.298097,-2.298097 1.269204,0 2.298097,1.028893 2.298097,2.298097 z"
              sodipodi:ry="2.2980971"
              sodipodi:rx="2.2980971"
              sodipodi:cy="21.837049"
@@ -33317,7 +33316,7 @@
              sodipodi:type="arc" />
           <path
              transform="matrix(0.9,0,0,0.9,331.02288,2.625648)"
-             d="m 23.157747,20.953165 a 1.767767,1.767767 0 1 1 -3.535534,0 1.767767,1.767767 0 1 1 3.535534,0 z"
+             d="m 23.157747,20.953165 c 0,0.976311 -0.791456,1.767767 -1.767767,1.767767 -0.97631,0 -1.767767,-0.791456 -1.767767,-1.767767 0,-0.976311 0.791457,-1.767767 1.767767,-1.767767 0.976311,0 1.767767,0.791456 1.767767,1.767767 z"
              sodipodi:ry="1.767767"
              sodipodi:rx="1.767767"
              sodipodi:cy="20.953165"
@@ -33334,7 +33333,7 @@
              sodipodi:cy="21.837049"
              sodipodi:rx="2.2980971"
              sodipodi:ry="2.2980971"
-             d="m 24.041631,21.837049 a 2.2980971,2.2980971 0 1 1 -4.596194,0 2.2980971,2.2980971 0 1 1 4.596194,0 z" />
+             d="m 24.041631,21.837049 c 0,1.269204 -1.028893,2.298098 -2.298097,2.298098 -1.269204,0 -2.298097,-1.028894 -2.298097,-2.298098 0,-1.269204 1.028893,-2.298097 2.298097,-2.298097 1.269204,0 2.298097,1.028893 2.298097,2.298097 z" />
           <path
              sodipodi:type="arc"
              style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9999997;marker:none;visibility:visible;display:inline;overflow:visible"
@@ -33343,7 +33342,7 @@
              sodipodi:cy="20.953165"
              sodipodi:rx="1.767767"
              sodipodi:ry="1.767767"
-             d="m 23.157747,20.953165 a 1.767767,1.767767 0 1 1 -3.535534,0 1.767767,1.767767 0 1 1 3.535534,0 z"
+             d="m 23.157747,20.953165 c 0,0.976311 -0.791456,1.767767 -1.767767,1.767767 -0.97631,0 -1.767767,-0.791456 -1.767767,-1.767767 0,-0.976311 0.791457,-1.767767 1.767767,-1.767767 0.976311,0 1.767767,0.791456 1.767767,1.767767 z"
              transform="matrix(0.553846,0,0,0.553846,330.24885,10.02145)" />
           <path
              sodipodi:nodetypes="ccccc"
@@ -33373,7 +33372,7 @@
              transform="matrix(-0.23154,-1.039181,1.039181,-0.23154,333.25433,54.09927)"
              inkscape:r_cy="true"
              inkscape:r_cx="true"
-             d="m 8.8749989,37.75 a 1.2499999,1.2499999 0 1 1 -2.4999997,0 1.2499999,1.2499999 0 1 1 2.4999997,0 z"
+             d="m 8.8749989,37.75 c 0,0.690356 -0.559644,1.25 -1.2499999,1.25 -0.6903558,0 -1.2499998,-0.559644 -1.2499998,-1.25 0,-0.690356 0.559644,-1.25 1.2499998,-1.25 0.6903559,0 1.2499999,0.559644 1.2499999,1.25 z"
              sodipodi:ry="1.2499999"
              sodipodi:rx="1.2499999"
              sodipodi:cy="37.75"
@@ -33604,9 +33603,9 @@
              sodipodi:cy="727.61218"
              sodipodi:rx="3.375"
              sodipodi:ry="3.375"
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z" />
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z" />
           <path
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z"
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z"
              sodipodi:ry="3.375"
              sodipodi:rx="3.375"
              sodipodi:cy="727.61218"
@@ -33624,7 +33623,7 @@
              sodipodi:cy="727.61218"
              sodipodi:rx="3.375"
              sodipodi:ry="3.375"
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z" />
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z" />
         </g>
         <text
            id="text24842-7"
@@ -34149,7 +34148,7 @@
            style="display:inline;enable-background:new">
           <path
              transform="matrix(0.6220471,0,0,0.9518067,337.31792,1.385546)"
-             d="m 41.25,33.9375 a 18.25,5.1875 0 1 1 -36.5,0 18.25,5.1875 0 1 1 36.5,0 z"
+             d="m 41.25,33.9375 c 0,2.864977 -8.170803,5.1875 -18.25,5.1875 -10.079197,0 -18.25,-2.322523 -18.25,-5.1875 0,-2.864977 8.170803,-5.1875 18.25,-5.1875 10.079197,0 18.25,2.322523 18.25,5.1875 z"
              sodipodi:ry="5.1875"
              sodipodi:rx="18.25"
              sodipodi:cy="33.9375"
@@ -34165,7 +34164,7 @@
              sodipodi:cy="33.9375"
              sodipodi:rx="18.25"
              sodipodi:ry="5.1875"
-             d="m 41.25,33.9375 a 18.25,5.1875 0 1 1 -36.5,0 18.25,5.1875 0 1 1 36.5,0 z"
+             d="m 41.25,33.9375 c 0,2.864977 -8.170803,5.1875 -18.25,5.1875 -10.079197,0 -18.25,-2.322523 -18.25,-5.1875 0,-2.864977 8.170803,-5.1875 18.25,-5.1875 10.079197,0 18.25,2.322523 18.25,5.1875 z"
              transform="matrix(1,0,0,1.53012,328.625,-17.99096)" />
           <path
              inkscape:connector-curvature="0"
@@ -34187,7 +34186,7 @@
              sodipodi:cy="27.228739"
              sodipodi:rx="4.3310289"
              sodipodi:ry="6.0987959"
-             d="m 10.429825,27.228739 a 4.3310289,6.0987959 0 1 1 -8.662058,0 4.3310289,6.0987959 0 1 1 8.662058,0 z"
+             d="m 10.429825,27.228739 c 0,3.368272 -1.9390679,6.098796 -4.3310291,6.098796 -2.3919612,0 -4.3310289,-2.730524 -4.3310289,-6.098796 0,-3.368272 1.9390677,-6.098796 4.3310289,-6.098796 2.3919612,0 4.3310291,2.730524 4.3310291,6.098796 z"
              transform="matrix(0.810984,-0.585069,0.585069,0.810984,313.22209,6.947121)" />
           <path
              sodipodi:type="inkscape:offset"
@@ -34208,7 +34207,7 @@
              sodipodi:cy="23.251263"
              sodipodi:rx="1.767767"
              sodipodi:ry="2.1213202"
-             d="m 5.833631,23.251263 a 1.767767,2.1213202 0 1 1 -3.5355339,0 1.767767,2.1213202 0 1 1 3.5355339,0 z" />
+             d="m 5.833631,23.251263 c 0,1.171572 -0.7914562,2.12132 -1.7677669,2.12132 -0.9763107,0 -1.767767,-0.949748 -1.767767,-2.12132 0,-1.171573 0.7914563,-2.121321 1.767767,-2.121321 0.9763107,0 1.7677669,0.949748 1.7677669,2.121321 z" />
           <path
              inkscape:connector-curvature="0"
              sodipodi:nodetypes="ccc"
@@ -34224,11 +34223,11 @@
              sodipodi:cy="21.837049"
              sodipodi:rx="3.1819806"
              sodipodi:ry="3.1819806"
-             d="m 72.655224,21.837049 a 3.1819806,3.1819806 0 1 1 -6.363961,0 3.1819806,3.1819806 0 1 1 6.363961,0 z"
+             d="m 72.655224,21.837049 c 0,1.75736 -1.424621,3.181981 -3.18198,3.181981 -1.75736,0 -3.181981,-1.424621 -3.181981,-3.181981 0,-1.757359 1.424621,-3.18198 3.181981,-3.18198 1.757359,0 3.18198,1.424621 3.18198,3.18198 z"
              transform="translate(272.13855,0)" />
           <path
              transform="matrix(1.5,0,0,1.5,245.8318,-10.91852)"
-             d="m 72.655224,21.837049 a 3.1819806,3.1819806 0 1 1 -6.363961,0 3.1819806,3.1819806 0 1 1 6.363961,0 z"
+             d="m 72.655224,21.837049 c 0,1.75736 -1.424621,3.181981 -3.18198,3.181981 -1.75736,0 -3.181981,-1.424621 -3.181981,-3.181981 0,-1.757359 1.424621,-3.18198 3.181981,-3.18198 1.757359,0 3.18198,1.424621 3.18198,3.18198 z"
              sodipodi:ry="3.1819806"
              sodipodi:rx="3.1819806"
              sodipodi:cy="21.837049"
@@ -34244,7 +34243,7 @@
              sodipodi:cy="21.837049"
              sodipodi:rx="2.2980971"
              sodipodi:ry="2.2980971"
-             d="m 24.041631,21.837049 a 2.2980971,2.2980971 0 1 1 -4.596194,0 2.2980971,2.2980971 0 1 1 4.596194,0 z"
+             d="m 24.041631,21.837049 c 0,1.269204 -1.028893,2.298098 -2.298097,2.298098 -1.269204,0 -2.298097,-1.028894 -2.298097,-2.298098 0,-1.269204 1.028893,-2.298097 2.298097,-2.298097 1.269204,0 2.298097,1.028893 2.298097,2.298097 z"
              transform="translate(329.41422,0.707108)" />
           <path
              sodipodi:type="arc"
@@ -34254,10 +34253,10 @@
              sodipodi:cy="20.953165"
              sodipodi:rx="1.767767"
              sodipodi:ry="1.767767"
-             d="m 23.157747,20.953165 a 1.767767,1.767767 0 1 1 -3.535534,0 1.767767,1.767767 0 1 1 3.535534,0 z"
+             d="m 23.157747,20.953165 c 0,0.976311 -0.791456,1.767767 -1.767767,1.767767 -0.97631,0 -1.767767,-0.791456 -1.767767,-1.767767 0,-0.976311 0.791457,-1.767767 1.767767,-1.767767 0.976311,0 1.767767,0.791456 1.767767,1.767767 z"
              transform="matrix(0.9,0,0,0.9,331.02288,2.625648)" />
           <path
-             d="m 24.041631,21.837049 a 2.2980971,2.2980971 0 1 1 -4.596194,0 2.2980971,2.2980971 0 1 1 4.596194,0 z"
+             d="m 24.041631,21.837049 c 0,1.269204 -1.028893,2.298098 -2.298097,2.298098 -1.269204,0 -2.298097,-1.028894 -2.298097,-2.298098 0,-1.269204 1.028893,-2.298097 2.298097,-2.298097 1.269204,0 2.298097,1.028893 2.298097,2.298097 z"
              sodipodi:ry="2.2980971"
              sodipodi:rx="2.2980971"
              sodipodi:cy="21.837049"
@@ -34268,7 +34267,7 @@
              transform="matrix(0.615385,0,0,0.615385,329.2589,8.840808)" />
           <path
              transform="matrix(0.553846,0,0,0.553846,330.24885,10.02145)"
-             d="m 23.157747,20.953165 a 1.767767,1.767767 0 1 1 -3.535534,0 1.767767,1.767767 0 1 1 3.535534,0 z"
+             d="m 23.157747,20.953165 c 0,0.976311 -0.791456,1.767767 -1.767767,1.767767 -0.97631,0 -1.767767,-0.791456 -1.767767,-1.767767 0,-0.976311 0.791457,-1.767767 1.767767,-1.767767 0.976311,0 1.767767,0.791456 1.767767,1.767767 z"
              sodipodi:ry="1.767767"
              sodipodi:rx="1.767767"
              sodipodi:cy="20.953165"
@@ -34308,7 +34307,7 @@
              sodipodi:cy="37.75"
              sodipodi:rx="1.2499999"
              sodipodi:ry="1.2499999"
-             d="m 8.8749989,37.75 a 1.2499999,1.2499999 0 1 1 -2.4999997,0 1.2499999,1.2499999 0 1 1 2.4999997,0 z"
+             d="m 8.8749989,37.75 c 0,0.690356 -0.559644,1.25 -1.2499999,1.25 -0.6903558,0 -1.2499998,-0.559644 -1.2499998,-1.25 0,-0.690356 0.559644,-1.25 1.2499998,-1.25 0.6903559,0 1.2499999,0.559644 1.2499999,1.25 z"
              inkscape:r_cx="true"
              inkscape:r_cy="true"
              transform="matrix(-0.23154,-1.039181,1.039181,-0.23154,333.25433,54.09927)" />
@@ -34527,7 +34526,7 @@
              sodipodi:nodetypes="csssc"
              inkscape:connector-curvature="0" />
           <path
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z"
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z"
              sodipodi:ry="3.375"
              sodipodi:rx="3.375"
              sodipodi:cy="727.61218"
@@ -34545,9 +34544,9 @@
              sodipodi:cy="727.61218"
              sodipodi:rx="3.375"
              sodipodi:ry="3.375"
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z" />
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z" />
           <path
-             d="m 187.625,727.61218 a 3.375,3.375 0 1 1 -6.75,0 3.375,3.375 0 1 1 6.75,0 z"
+             d="m 187.625,727.61218 c 0,1.86396 -1.51104,3.375 -3.375,3.375 -1.86396,0 -3.375,-1.51104 -3.375,-3.375 0,-1.86396 1.51104,-3.375 3.375,-3.375 1.86396,0 3.375,1.51104 3.375,3.375 z"
              sodipodi:ry="3.375"
              sodipodi:rx="3.375"
              sodipodi:cy="727.61218"
@@ -35077,6 +35076,36 @@
            height="1"
            width="1" />
       </g>
+      <text
+         sodipodi:linespacing="125%"
+         id="text23993-4"
+         y="21.542971"
+         x="512.23926"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium"
+         xml:space="preserve"
+         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/rect2996.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"><tspan
+           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium"
+           y="21.542971"
+           x="512.23926"
+           id="tspan23995-2"
+           sodipodi:role="line">Mon 20:07</tspan></text>
+      <text
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-shell-design/mockups/rect2996.png"
+         xml:space="preserve"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;display:inline;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium"
+         x="512.23926"
+         y="20.542971"
+         id="text3003-6-5"
+         sodipodi:linespacing="125%"><tspan
+           sodipodi:role="line"
+           id="tspan3005-8-2"
+           x="512.23926"
+           y="20.542971"
+           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;font-family:Cantarell;-inkscape-font-specification:Cantarell Medium">Mon 20:07</tspan></text>
     </g>
     <g
        style="display:none"
@@ -36357,11 +36386,12 @@
        inkscape:groupmode="layer"
        id="layer48"
        inkscape:label="Calendar"
-       style="display:inline">
+       style="display:none">
       <g
          inkscape:groupmode="layer"
          id="layer49"
-         inkscape:label="Today">
+         inkscape:label="Today"
+         style="display:inline">
         <path
            sodipodi:open="true"
            transform="matrix(0.91071429,0,0,0.7458835,466.28462,6.6386503)"
@@ -37604,7 +37634,7 @@
              sodipodi:cy="30"
              sodipodi:rx="42"
              sodipodi:ry="16"
-             d="M 9,29.999999 C 9.0000011,21.163443 27.804042,14 51.000002,14 74.195961,14 93,21.163444 93,30"
+             d="M 9,29.999999 A 42,16 0 0 1 93,30"
              sodipodi:start="3.1415927"
              sodipodi:end="6.2831853"
              transform="matrix(0.33108123,0,0,0.7458835,426.02027,184.57119)"
@@ -38064,7 +38094,7 @@
          inkscape:groupmode="layer"
          id="layer50"
          inkscape:label="someday"
-         style="display:inline">
+         style="display:none">
         <rect
            style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            id="rect42940"
@@ -38730,7 +38760,7 @@
            ry="1.375" />
         <path
            transform="matrix(1.9336865,0,0,1.9336865,-851.59236,-143.41159)"
-           d="m 856.7519,116.95945 a 3.6702957,3.6702957 0 1 1 -7.34059,0 3.6702957,3.6702957 0 1 1 7.34059,0 z"
+           d="m 856.7519,116.95945 c 0,2.02705 -1.64325,3.6703 -3.6703,3.6703 -2.02704,0 -3.67029,-1.64325 -3.67029,-3.6703 0,-2.02705 1.64325,-3.6703 3.67029,-3.6703 2.02705,0 3.6703,1.64325 3.6703,3.6703 z"
            sodipodi:ry="3.6702957"
            sodipodi:rx="3.6702957"
            sodipodi:cy="116.95945"
diff --git a/mockups/static/workspace-switcher.png b/mockups/static/workspace-switcher.png
new file mode 100644
index 0000000..a395dcc
Binary files /dev/null and b/mockups/static/workspace-switcher.png differ



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]