diff --git a/icons.svg b/icons.svg
index 2537ab9..c9f217a 100644
--- a/icons.svg
+++ b/icons.svg
@@ -13,7 +13,7 @@
    height="600px"
    id="svg2987"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
+   inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="icons.svg">
   <defs
      id="defs2989" />
@@ -24,21 +24,21 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="254.95084"
-     inkscape:cy="437.73267"
+     inkscape:zoom="32"
+     inkscape:cx="54.935514"
+     inkscape:cy="557.22556"
      inkscape:current-layer="layer1"
      inkscape:document-units="px"
-     showgrid="false"
+     showgrid="true"
      showguides="false"
      inkscape:guide-bbox="true"
      inkscape:object-paths="true"
      inkscape:snap-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="851"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-width="1018"
+     inkscape:window-height="810"
+     inkscape:window-x="93"
+     inkscape:window-y="154"
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
        id="grid2995"
@@ -330,7 +330,7 @@
        ry="0.5" />
     <path
        style="fill:#808080;stroke:none"
-       d="m 323,90 c -2,-1 0,-5 5,-5 5,0 7,4 5,5 -2.52982,1.264911 -10,0 -10,0 z"
+       d="m 339,90 c -2,-1 0,-5 5,-5 5,0 7,4 5,5 -2.52982,1.264911 -10,0 -10,0 z"
        id="path4360"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cssc" />
@@ -745,13 +745,15 @@
        inkscape:label="#rect3164" />
     <path
        style="fill:#000000;stroke:none"
-       d="m 54,36 c -1.662,0 -3,1.338 -3,3 l 10,0 c 0,-1.662 -1.338,-3 -3,-3 l -4,0 z m -3.5,4 c -0.276142,0 -0.5,0.223858 -0.5,0.5 0,0.276142 0.223858,0.5 0.5,0.5 l 1.5,0 4,2 4,-2 1.5,0 C 61.776142,41 62,40.776142 62,40.5 62,40.223858 61.776142,40 61.5,40 l -11,0 z m 0.5,2 c 0,1.662 1.338,3 3,3 l 4,0 c 1.662,0 3,-1.338 3,-3 L 56,44.5 51,42 z"
+       d="m 54,36 c -1.662,0 -3,1.338 -3,3 l 10,0 c 0,-1.662 -1.338,-3 -3,-3 z m -3.5,4 c -0.276142,0 -0.5,0.223858 -0.5,0.5 0,0.276142 0.223858,0.5 0.5,0.5 l 1.5,0 4,2 4,-2 1.5,0 C 61.776142,41 62,40.776142 62,40.5 62,40.223858 61.776142,40 61.5,40 z M 51,41.625 C 51,43.287 52.338,45 54,45 l 4,0 c 1.662,0 3,-1.713 3,-3.375 l -5,2.5 z"
        id="fast_food"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccssssscccsssscssccc" />
     <path
        style="fill:#000000;stroke:none"
-       d="M 261.5 97 C 260.67157 97 260 97.671573 260 98.5 C 260 99.155838 260.41359 99.70241 261 99.90625 L 261 106.5 C 261 107.88071 262.11929 109 263.5 109 C 264.88071 109 266 107.88071 266 106.5 L 267.5 106.5 L 265.5 104 L 263.5 106.5 L 265 106.5 C 265 107.32843 264.32843 108 263.5 108 C 262.67157 108 262 107.32843 262 106.5 L 262 99.90625 C 262.58641 99.70241 263 99.155838 263 98.5 C 263 97.671573 262.32843 97 261.5 97 z M 261.5 98 C 261.77614 98 262 98.223858 262 98.5 C 262 98.776142 261.77614 99 261.5 99 C 261.22386 99 261 98.776142 261 98.5 C 261 98.223858 261.22386 98 261.5 98 z "
-       id="fishing" />
+       d="m 277.5,97 c -0.82843,0 -1.5,0.671573 -1.5,1.5 0,0.655838 0.41359,1.20241 1,1.40625 l 0,6.59375 c 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 l 1.5,0 -2,-2.5 -2,2.5 1.5,0 c 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 l 0,-6.59375 c 0.58641,-0.20384 1,-0.750412 1,-1.40625 0,-0.828427 -0.67157,-1.5 -1.5,-1.5 z m 0,1 c 0.27614,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.22386,-0.5 0.5,-0.5 z"
+       id="fishing"
+       inkscape:connector-curvature="0" />
     <path
        style="fill:#d40000;stroke:none"
        d="m 72.1875,132 c -2.48242,-0.0645 -4.92106,1.19822 -6.25,3.5 l 0.875,0.5 c 1.65685,-2.86976 5.31774,-3.84436 8.1875,-2.1875 0.91212,0.52661 1.66089,1.27538 2.1875,2.1875 l 0.875,-0.5 C 77.44812,134.43587 76.56413,133.55188 75.5,132.9375 74.45373,132.33344 73.31587,132.02931 72.1875,132 z m -0.53125,2 c -1.60109,0.11315 -3.13706,1.00534 -4,2.5 l 0.875,0.5 c 1.10457,-1.91317 3.55558,-2.57332 5.46875,-1.46875 0.60808,0.35107 1.11768,0.86067 1.46875,1.46875 l 0.875,-0.5 C 75.90491,135.7399 75.2601,135.09509 74.5,134.65625 73.6032,134.13848 72.6169,133.93211 71.65625,134 z m 0.125,2 c -0.96065,0.0679 -1.85723,0.6032 -2.375,1.5 l 0.875,0.5 c 0.55228,-0.95659 1.76216,-1.27104 2.71875,-0.71875 0.30404,0.17554 0.54321,0.41471 0.71875,0.71875 l 0.875,-0.5 C 74.33044,137.04394 73.95606,136.66956 73.5,136.40625 72.96192,136.09559 72.35764,135.95927 71.78125,136 z M 72,138 c -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 z"
@@ -794,9 +796,9 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccc" />
     <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
        d="m 70.5,99 c -0.80556,0 -1.35497,0.14289 -1.75,0.40625 -0.39503,0.26336 -0.5625,0.625 -0.6875,0.875 -0.125,0.25 -0.207535,0.38836 -0.375,0.5 C 67.520035,100.89289 67.194444,101 66.5,101 l -0.5,0 0,0.5 0,7 0,0.5 0.5,0 4,0 0.5,0 0,-0.5 0,-9 0,-0.5 z m 2.5,0 0,0.5 0,9 0,0.5 0.5,0 4,0 0.5,0 0,-0.5 0,-7 0,-0.5 -0.5,0 c -0.69444,0 -1.02003,-0.10711 -1.1875,-0.21875 -0.16747,-0.11164 -0.25,-0.25 -0.375,-0.5 -0.125,-0.25 -0.29247,-0.61164 -0.6875,-0.875 C 74.85497,99.14289 74.30556,99 73.5,99 z m -3,1.09375 0,7.90625 -1,0 0,-7.40625 c 0.0905,-0.16699 0.17852,-0.28569 0.3125,-0.375 0.0969,-0.0646 0.44274,-0.0805 0.6875,-0.125 z m 4,0 c 0.24476,0.0445 0.59059,0.0604 0.6875,0.125 0.13398,0.0893 0.22201,0.20801 0.3125,0.375 L 75,108 l -1,0 z m -6,1.625 0,6.28125 -1,0 0,-6.125 c 0.355897,-0.0407 0.720038,-0.0635 1,-0.15625 z m 8,0 c 0.27996,0.0928 0.6441,0.11553 1,0.15625 l 0,6.125 -1,0 z"
-       id="gate"
+       id="gate_2"
        inkscape:label="#path3133"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssccccccccccsccccccccccsssssccccccccccccccccccccccc" />
@@ -838,7 +840,7 @@
        inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;stroke:none"
-       d="m 198,111 4,0 2,-2 -8,0 z"
+       d="m 214,111 4,0 2,-2 -8,0 z"
        id="urban_tree_pot"
        inkscape:connector-curvature="0"
        inkscape:label="#path3953"
@@ -1135,58 +1137,58 @@
        inkscape:connector-curvature="0" />
     <path
        style="fill:#808080;stroke:none"
-       d="m 115,84 1,1 1,0 0,7 -1,0 -1,-1 z"
+       d="m 131,84 1,1 1,0 0,7 -1,0 -1,-1 z"
        id="path4101"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="path4103"
-       d="m 119,84 1,1 1,0 0,7 -1,0 -1,-1 z"
+       d="m 135,84 1,1 1,0 0,7 -1,0 -1,-1 z"
        style="fill:#808080;stroke:none" />
     <path
        style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 119,84 -1.5,0 -1,1 0.5,1 1,-1 1,0"
+       d="m 135,84 -1.5,0 -1,1 0.5,1 1,-1 1,0"
        id="path4107"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc" />
     <path
        inkscape:connector-curvature="0"
        id="path4109"
-       d="m 119,90 -1.5,0 -1,1 0.5,1 1,-1 1,0"
+       d="m 135,90 -1.5,0 -1,1 0.5,1 1,-1 1,0"
        style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        sodipodi:nodetypes="cccccc" />
     <path
        inkscape:connector-curvature="0"
        id="path4111"
-       d="m 123,84 -1.5,0 -1,1 0.5,1 1,-1 1,0"
+       d="m 139,84 -1.5,0 -1,1 0.5,1 1,-1 1,0"
        style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        sodipodi:nodetypes="cccccc" />
     <path
        style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 123,90 -1.5,0 -0.5,0.5 0,1.5 1,-1 1,0"
+       d="m 139,90 -1.5,0 -0.5,0.5 0,1.5 1,-1 1,0"
        id="path4113"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc" />
     <path
        inkscape:connector-curvature="0"
        id="path4115"
-       d="m 123,84 1,1 1,0 0,7 -1,0 -1,-1 z"
+       d="m 139,84 1,1 1,0 0,7 -1,0 -1,-1 z"
        style="fill:#808080;stroke:none" />
     <path
        style="fill:#000000;stroke:none"
-       d="m 115,100 0,7 1,1 1,0 1,-1 1,0 1,1 1,0 1,-1 1,0 1,1 1,0 0,-7 -1,0 -1,-1 -1.5,0 -1,1 -0.5,0 -1,-1 -1.5,0 -1,1 -0.5,0 -1,-1 z m 3,1 1,0 0,5 -1.5,0 -0.5,0.5 0,-4.5 1,-1 z m 4,0 1,0 0,5 -1.5,0 -0.5,0.5 0,-4.5 1,-1 z"
+       d="m 131,100 0,7 1,1 1,0 1,-1 1,0 1,1 1,0 1,-1 1,0 1,1 1,0 0,-7 -1,0 -1,-1 -1.5,0 -1,1 -0.5,0 -1,-1 -1.5,0 -1,1 -0.5,0 -1,-1 z m 3,1 1,0 0,5 -1.5,0 -0.5,0.5 0,-4.5 1,-1 z m 4,0 1,0 0,5 -1.5,0 -0.5,0.5 0,-4.5 1,-1 z"
        id="metal_roof"
        inkscape:label="#path4117"
        inkscape:connector-curvature="0" />
     <path
        style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 186,93 0,2 5,0 0,-1 -4,0 0,-1 z"
+       d="m 202,93 0,2 5,0 0,-1 -4,0 0,-1 z"
        id="path4132"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="avenue_tree"
-       d="m 186,110 0,1 5,0 0,-1 z"
+       d="m 202,110 0,1 5,0 0,-1 z"
        style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:label="#path4134"
        sodipodi:nodetypes="ccccc" />
@@ -1194,17 +1196,17 @@
        style="fill:#808080"
        inkscape:connector-curvature="0"
        id="path4136"
-       d="m 184,84 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 0.5625,0 0,3 0.875,0 0,-3 0.5625,0 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 l -2,0 z" />
+       d="m 200,84 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 0.5625,0 0,3 0.875,0 0,-3 0.5625,0 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 l -2,0 z" />
     <path
        style="fill:#808080"
        inkscape:connector-curvature="0"
        id="path4140"
-       d="m 199,84 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 0.5625,0 0,3 0.875,0 0,-3 0.5625,0 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 l -2,0 z" />
+       d="m 215,84 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,3 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 0.5625,0 0,3 0.875,0 0,-3 0.5625,0 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-3 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 l -2,0 z" />
     <path
        inkscape:label="#path3953"
        inkscape:connector-curvature="0"
        id="path4138"
-       d="m 198,95 4,0 1,-3 -6,0 z"
+       d="m 214,95 4,0 1,-3 -6,0 z"
        style="fill:#808080;stroke:none" />
     <rect
        style="fill:#808080;fill-opacity:1;stroke:none"
@@ -1389,12 +1391,13 @@
        inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"
-       d="M 129.5 101 C 129.223 101 129 101.223 129 101.5 L 129 108.5 C 129 108.777 129.223 109 129.5 109 L 130.5 109 C 130.777 109 131 108.777 131 108.5 L 131 101.5 C 131 101.223 130.777 101 130.5 101 L 129.5 101 z M 140.5 101 C 140.223 101 140 101.223 140 101.5 L 140 108.5 C 140 108.777 140.223 109 140.5 109 L 141.5 109 C 141.777 109 142 108.777 142 108.5 L 142 101.5 C 142 101.223 141.777 101 141.5 101 L 140.5 101 z M 132.5 102 C 132.223 102 132 102.223 132 102.5 L 132 105.5 L 132 107.5 C 132 107.777 132.223 108 132.5 108 C 132.777 108 133 107.777 133 107.5 L 133 106 L 134.5 106 C 134.777 106 135 105.777 135 105.5 L 135 102.5 C 135 102.223 134.777 102 134.5 102 L 132.5 102 z M 136.5 102 C 136.223 102 136 102.223 136 102.5 L 136 105.5 C 136 105.777 136.223 106 136.5 106 L 138 106 L 138 107.5 C 138 107.777 138.223 108 138.5 108 C 138.777 108 139 107.777 139 107.5 L 139 105.5 L 139 102.5 C 139 102.223 138.777 102 138.5 102 L 136.5 102 z "
-       id="turnstile" />
+       d="m 145.5,101 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,7 c 0,0.277 0.223,0.5 0.5,0.5 l 1,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-7 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1,0 z m 11,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,7 c 0,0.277 0.223,0.5 0.5,0.5 l 1,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-7 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -1,0 z m -8,1 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,3 0,2 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.5 1.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-3 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m 4,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,3 c 0,0.277 0.223,0.5 0.5,0.5 l 1.5,0 0,1.5 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 0,-3 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z"
+       id="turnstile"
+       inkscape:connector-curvature="0" />
     <rect
        ry="0.5"
        y="86"
-       x="131"
+       x="147"
        height="7"
        width="1"
        id="rect4428"
@@ -1403,7 +1406,7 @@
     <rect
        ry="0.5"
        y="86"
-       x="140"
+       x="156"
        height="7"
        width="1"
        id="rect4430"
@@ -1412,7 +1415,7 @@
     <rect
        ry="0.5"
        y="87"
-       x="133"
+       x="149"
        height="5"
        width="1"
        id="rect4432"
@@ -1421,7 +1424,7 @@
     <rect
        ry="0.5"
        y="87"
-       x="138"
+       x="154"
        height="5"
        width="1"
        id="rect4434"
@@ -1430,7 +1433,7 @@
     <rect
        ry="0.5"
        y="87"
-       x="133"
+       x="149"
        height="3"
        width="2"
        id="rect4436"
@@ -1439,7 +1442,7 @@
     <rect
        ry="0.5"
        y="87"
-       x="137"
+       x="153"
        height="3"
        width="2"
        id="rect4438"
@@ -1622,24 +1625,24 @@
        rx="1" />
     <path
        style="fill:#d40000"
-       d="m 85.875,96.90625 c -0.10225,0.005 -0.21359,0.009 -0.3125,0.0312 -0.39565,0.0901 -0.75357,0.31607 -1.03125,0.59375 -0.55535,0.55535 -0.87561,1.46773 -0.40625,2.25 0.42247,0.70412 1.36028,1.10981 2.875,1.1875 l 0,0.0312 0.5,0 0.5,0 0,-0.0312 c 1.51472,-0.0777 2.45253,-0.48338 2.875,-1.1875 0.46936,-0.78227 0.1491,-1.69465 -0.40625,-2.25 -0.27768,-0.27768 -0.6356,-0.50367 -1.03125,-0.59375 -0.39565,-0.0901 -0.82762,-0.0472 -1.21875,0.1875 C 87.9254,97.30096 87.69132,97.55227 87.5,97.9062 87.30868,97.55227 87.0746,97.30096 86.78125,97.12495 86.4879,96.94894 86.18174,96.89126 85.875,96.9062 z M 86,97.875 c 0.0863,0.0103 0.17213,0.047 0.25,0.0937 0.26033,0.1562 0.55054,0.8064 0.65625,1.9375 -1.1311,-0.10571 -1.7813,-0.39592 -1.9375,-0.65625 -0.18689,-0.31148 -0.0696,-0.7116 0.25,-1.03125 C 85.45849,97.97896 85.74108,97.84406 86,97.87495 z m 3,0 c 0.25892,-0.0309 0.54151,0.10405 0.78125,0.34375 0.31965,0.31965 0.43689,0.71977 0.25,1.03125 -0.1562,0.26033 -0.8064,0.55054 -1.9375,0.65625 0.10571,-1.1311 0.39592,-1.7813 0.65625,-1.9375 0.0779,-0.0467 0.16369,-0.0835 0.25,-0.0937 z M 84,102 c -0.554,0 -1,0.446 -1,1 l 0,7 c 0,0.554 0.446,1 1,1 l 7,0 c 0.554,0 1,-0.446 1,-1 l 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -7,0 z m 0,1 3,0 0,3 -3,0 0,-3 z m 4,0 3,0 0,3 -3,0 0,-3 z m -4,4 3,0 0,3 -3,0 0,-3 z m 4,0 3,0 0,3 -3,0 0,-3 z"
+       d="m 101.875,96.90625 c -0.10225,0.005 -0.21359,0.009 -0.3125,0.0312 -0.39565,0.0901 -0.75357,0.31607 -1.03125,0.59375 -0.55535,0.55535 -0.87561,1.46773 -0.40625,2.25 0.42247,0.70412 1.36028,1.10981 2.875,1.1875 l 0,0.0312 0.5,0 0.5,0 0,-0.0312 c 1.51472,-0.0777 2.45253,-0.48338 2.875,-1.1875 0.46936,-0.78227 0.1491,-1.69465 -0.40625,-2.25 -0.27768,-0.27768 -0.6356,-0.50367 -1.03125,-0.59375 -0.39565,-0.0901 -0.82762,-0.0472 -1.21875,0.1875 -0.29335,0.17601 -0.52743,0.42732 -0.71875,0.78125 -0.19132,-0.35393 -0.4254,-0.60524 -0.71875,-0.78125 -0.29335,-0.17601 -0.59951,-0.23369 -0.90625,-0.21875 z M 102,97.875 c 0.0863,0.0103 0.17213,0.047 0.25,0.0937 0.26033,0.1562 0.55054,0.8064 0.65625,1.9375 -1.1311,-0.10571 -1.7813,-0.39592 -1.9375,-0.65625 -0.18689,-0.31148 -0.0696,-0.7116 0.25,-1.03125 0.23974,-0.23974 0.52233,-0.37464 0.78125,-0.34375 z m 3,0 c 0.25892,-0.0309 0.54151,0.10405 0.78125,0.34375 0.31965,0.31965 0.43689,0.71977 0.25,1.03125 -0.1562,0.26033 -0.8064,0.55054 -1.9375,0.65625 0.10571,-1.1311 0.39592,-1.7813 0.65625,-1.9375 0.0779,-0.0467 0.16369,-0.0835 0.25,-0.0937 z M 100,102 c -0.554,0 -1,0.446 -1,1 l 0,7 c 0,0.554 0.446,1 1,1 l 7,0 c 0.554,0 1,-0.446 1,-1 l 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -7,0 z m 0,1 3,0 0,3 -3,0 0,-3 z m 4,0 3,0 0,3 -3,0 0,-3 z m -4,4 3,0 0,3 -3,0 0,-3 z m 4,0 3,0 0,3 -3,0 0,-3 z"
        id="gift_2"
        inkscape:label="#rect3287"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="path3303"
-       d="m 84,86 c -0.554,0 -1,0.446 -1,1 l 0,7 c 0,0.554 0.446,1 1,1 l 7,0 c 0.554,0 1,-0.446 1,-1 l 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -7,0 z m 0,1 3,0 0,3 -3,0 0,-3 z m 4,0 3,0 0,3 -3,0 0,-3 z m -4,4 3,0 0,3 -3,0 0,-3 z m 4,0 3,0 0,3 -3,0 0,-3 z"
+       d="m 100,86 c -0.554,0 -1,0.446 -1,1 l 0,7 c 0,0.554 0.446,1 1,1 l 7,0 c 0.554,0 1,-0.446 1,-1 l 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -7,0 z m 0,1 3,0 0,3 -3,0 0,-3 z m 4,0 3,0 0,3 -3,0 0,-3 z m -4,4 3,0 0,3 -3,0 0,-3 z m 4,0 3,0 0,3 -3,0 0,-3 z"
        style="fill:#808080" />
     <path
        sodipodi:nodetypes="cc"
        inkscape:connector-curvature="0"
        id="path3305"
-       d="m 87.5,84.5 c 7,0 0,-7 0,0 z"
+       d="m 103.5,84.5 c 7,0 0,-7 0,0 z"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 87.5,84.5 c -7,0 0,-7 0,0 z"
+       d="m 103.5,84.5 c -7,0 0,-7 0,0 z"
        id="path3307"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
@@ -2015,7 +2018,7 @@
        id="rect4439"
        width="4"
        height="6"
-       x="214"
+       x="230"
        y="82"
        rx="1"
        ry="1" />
@@ -2024,7 +2027,7 @@
        id="rect4445"
        width="6"
        height="7"
-       x="213"
+       x="229"
        y="83"
        rx="1"
        ry="1" />
@@ -2033,118 +2036,118 @@
        id="rect4447"
        width="8"
        height="4"
-       x="212"
+       x="228"
        y="85"
        rx="1"
        ry="1" />
     <path
        style="fill:#808080;stroke:none"
-       d="m 215,90 1,1.5 1,-1.5 1,0 -1,2 -0.5,3 -1,0 -0.5,-3 -1,-2 z"
+       d="m 231,90 1,1.5 1,-1.5 1,0 -1,2 -0.5,3 -1,0 -0.5,-3 -1,-2 z"
        id="path4449"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccc" />
     <path
        style="fill:#000000;stroke:none"
-       d="m 215,97 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,1 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 1,2 0.5,3 1,0 0.5,-3 1,-2 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l 0,-1 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 l -2,0 z m 0,8 2,0 -1,1.5 -1,-1.5 z"
+       d="m 231,97 c -0.554,0 -1,0.446 -1,1 -0.554,0 -1,0.446 -1,1 l 0,1 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 0,0.554 0.446,1 1,1 l 1,2 0.5,3 1,0 0.5,-3 1,-2 c 0.554,0 1,-0.446 1,-1 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l 0,-1 c 0,-0.554 -0.446,-1 -1,-1 0,-0.554 -0.446,-1 -1,-1 l -2,0 z m 0,8 2,0 -1,1.5 -1,-1.5 z"
        id="broadleaved"
        inkscape:label="#rect4452"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 168,95 0,-9"
+       d="m 184,95 0,-9"
        id="path4462"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
        inkscape:connector-curvature="0"
        id="path4497"
-       d="m 174,90 c 0,-2 -1,-3 -3,-3"
+       d="m 190,90 c 0,-2 -1,-3 -3,-3"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        sodipodi:nodetypes="cc" />
     <path
        sodipodi:nodetypes="cc"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 171,90 c -2,0 -3,1 -3,3"
+       d="m 187,90 c -2,0 -3,1 -3,3"
        id="path4499"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="path4501"
-       d="m 165,88 c 2,0 3,1 3,3"
+       d="m 181,88 c 2,0 3,1 3,3"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        sodipodi:nodetypes="cc" />
     <path
        inkscape:connector-curvature="0"
        id="path4503"
-       d="m 171,87 c -2,0 -3,1 -3,3"
+       d="m 187,87 c -2,0 -3,1 -3,3"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        sodipodi:nodetypes="cc" />
     <path
        sodipodi:nodetypes="cc"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 168,88 c 0,-2 -1,-3 -3,-3"
+       d="m 184,88 c 0,-2 -1,-3 -3,-3"
        id="path4505"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="cc"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 165,85 c -2,0 -3,1 -3,3"
+       d="m 181,85 c -2,0 -3,1 -3,3"
        id="path4507"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="cc"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 174,84 c 0,2 -1,3 -3,3"
+       d="m 190,84 c 0,2 -1,3 -3,3"
        id="path4509"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="path4511"
-       d="m 168,86.5 c 0,-2 1,-3 3,-3"
+       d="m 184,86.5 c 0,-2 1,-3 3,-3"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        sodipodi:nodetypes="cc" />
     <path
        sodipodi:nodetypes="cc"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 165,82.5 c 2,0 3,1 3,3"
+       d="m 181,82.5 c 2,0 3,1 3,3"
        id="path4515"
        inkscape:connector-curvature="0" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#d40000;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 165.34375,97.5 a 0.50606671,0.50606671 0 1 0 0.15625,1 c 0.91667,0 1.5241,0.2116 1.90625,0.59375 0.35356,0.35356 0.56467,0.91303 0.59375,1.71875 -0.60628,-0.54853 -1.45519,-0.80711 -2.46875,-0.8125 a 0.50005,0.50005 0 0 0 -0.0312,0 c -0.0323,0 -0.0618,-5.1e-4 -0.0937,0 a 0.50219246,0.50219246 0 0 0 -0.0625,0 c -1.0113,0.0273 -1.85035,0.3191 -2.4375,0.90625 C 162.2884,101.5241 162,102.41667 162,103.5 a 0.50005,0.50005 0 1 0 1,0 c 0,-0.91667 0.2116,-1.5241 0.59375,-1.90625 0.35356,-0.35356 0.91303,-0.56467 1.71875,-0.59375 a 0.50219246,0.50219246 0 0 0 0.1875,0 0.50005,0.50005 0 0 0 0.0625,0 c 0.87882,0.0103 1.47113,0.22113 1.84375,0.59375 C 167.78845,101.9759 168,102.58333 168,103.5 a 0.50005,0.50005 0 0 0 0,0.0937 l 0,0.25 C 167.38632,103.28015 166.53617,103 165.5,103 a 0.50005,0.50005 0 0 0 -0.0937,0 0.50219246,0.50219246 0 1 0 0.0937,1 c 0.91667,0 1.5241,0.2116 1.90625,0.59375 C 167.78845,104.9759 168,105.58333 168,106.5 a 0.50005,0.50005 0 0 0 0,0.0937 l 0,1.90625 a 0.50005,0.50005 0 0 0 0,0.0937 l 0,1.90625 a 0.50005,0.50005 0 1 0 1,0 l 0,-1.90625 0,-0.0625 a 0.50005,0.50005 0 0 0 0,-0.0312 c 0,-0.91667 0.2116,-1.5241 0.59375,-1.90625 C 169.9759,106.2116 170.58333,106 171.5,106 a 0.50005,0.50005 0 1 0 0,-1 c -1.02792,0 -1.88729,0.25813 -2.5,0.8125 l 0,-0.21875 a 0.50005,0.50005 0 0 0 0,-0.0937 c 0,-0.91667 0.2116,-1.5241 0.59375,-1.90625 0.35357,-0.35357 0.91301,-0.56468 1.71875,-0.59375 a 0.50219246,0.50219246 0 0 0 0.125,0 0.50005,0.50005 0 0 0 0.0625,0 c 0.0215,0 0.0411,2.3e-4 0.0625,0 0.87882,0.0103 1.47113,0.22113 1.84375,0.59375 0.3822,0.38215 0.59375,0.98958 0.59375,1.90625 a 0.50005,0.50005 0 1 0 1,0 c 0,-1.08333 -0.2884,-1.9759 -0.90625,-2.59375 -0.15446,-0.15446 -0.31251,-0.29233 -0.5,-0.40625 0.18749,-0.11392 0.34554,-0.25179 0.5,-0.40625 C 174.7116,101.4759 175,100.58333 175,99.5 A 0.50005,0.50005 0 0 0 174.40625,99 0.50005,0.50005 0 0 0 174,99.5 c 0,0.91667 -0.2116,1.5241 -0.59375,1.90625 -0.36786,0.36786 -0.95228,0.57857 -1.8125,0.59375 -0.0213,-3.4e-4 -0.0411,1.1e-4 -0.0625,0 -0.0113,7e-5 -0.0198,0 -0.0312,0 -0.0215,0 -0.0411,-2.3e-4 -0.0625,0 a 0.50005,0.50005 0 0 0 -0.0312,0 0.50219246,0.50219246 0 0 0 -0.15625,0.0312 c -0.91383,0.0405 -1.68916,0.2738 -2.25,0.78125 l 0,-0.71875 a 0.50005,0.50005 0 0 0 0,-0.0937 c 0,-0.91667 0.2116,-1.5241 0.59375,-1.90625 C 169.9759,99.7116 170.58333,99.5 171.5,99.5 a 0.50005,0.50005 0 1 0 0,-1 c -1.08333,0 -1.9759,0.2884 -2.59375,0.90625 -0.0422,0.0422 -0.0859,0.0803 -0.125,0.125 -0.14933,-0.43579 -0.37857,-0.81607 -0.6875,-1.125 C 167.4759,97.7884 166.58333,97.5 165.5,97.5 a 0.50005,0.50005 0 0 0 -0.0937,0 0.50219246,0.50219246 0 0 0 -0.0625,0 z"
+       d="m 181.34375,97.5 a 0.50606671,0.50606671 0 1 0 0.15625,1 c 0.91667,0 1.5241,0.2116 1.90625,0.59375 0.35356,0.35356 0.56467,0.91303 0.59375,1.71875 -0.60628,-0.54853 -1.45519,-0.80711 -2.46875,-0.8125 a 0.50005,0.50005 0 0 0 -0.0312,0 c -0.0323,0 -0.0618,-5.1e-4 -0.0937,0 a 0.50219246,0.50219246 0 0 0 -0.0625,0 c -1.0113,0.0273 -1.85035,0.3191 -2.4375,0.90625 C 178.2884,101.5241 178,102.41667 178,103.5 a 0.50005,0.50005 0 1 0 1,0 c 0,-0.91667 0.2116,-1.5241 0.59375,-1.90625 0.35356,-0.35356 0.91303,-0.56467 1.71875,-0.59375 a 0.50219246,0.50219246 0 0 0 0.1875,0 0.50005,0.50005 0 0 0 0.0625,0 c 0.87882,0.0103 1.47113,0.22113 1.84375,0.59375 C 183.78845,101.9759 184,102.58333 184,103.5 a 0.50005,0.50005 0 0 0 0,0.0937 l 0,0.25 C 183.38632,103.28015 182.53617,103 181.5,103 a 0.50005,0.50005 0 0 0 -0.0937,0 0.50219246,0.50219246 0 1 0 0.0937,1 c 0.91667,0 1.5241,0.2116 1.90625,0.59375 C 183.78845,104.9759 184,105.58333 184,106.5 a 0.50005,0.50005 0 0 0 0,0.0937 l 0,1.90625 a 0.50005,0.50005 0 0 0 0,0.0937 l 0,1.90625 a 0.50005,0.50005 0 1 0 1,0 l 0,-1.90625 0,-0.0625 a 0.50005,0.50005 0 0 0 0,-0.0312 c 0,-0.91667 0.2116,-1.5241 0.59375,-1.90625 C 185.9759,106.2116 186.58333,106 187.5,106 a 0.50005,0.50005 0 1 0 0,-1 c -1.02792,0 -1.88729,0.25813 -2.5,0.8125 l 0,-0.21875 a 0.50005,0.50005 0 0 0 0,-0.0937 c 0,-0.91667 0.2116,-1.5241 0.59375,-1.90625 0.35357,-0.35357 0.91301,-0.56468 1.71875,-0.59375 a 0.50219246,0.50219246 0 0 0 0.125,0 0.50005,0.50005 0 0 0 0.0625,0 c 0.0215,0 0.0411,2.3e-4 0.0625,0 0.87882,0.0103 1.47113,0.22113 1.84375,0.59375 0.3822,0.38215 0.59375,0.98958 0.59375,1.90625 a 0.50005,0.50005 0 1 0 1,0 c 0,-1.08333 -0.2884,-1.9759 -0.90625,-2.59375 -0.15446,-0.15446 -0.31251,-0.29233 -0.5,-0.40625 0.18749,-0.11392 0.34554,-0.25179 0.5,-0.40625 C 190.7116,101.4759 191,100.58333 191,99.5 A 0.50005,0.50005 0 0 0 190.40625,99 0.50005,0.50005 0 0 0 190,99.5 c 0,0.91667 -0.2116,1.5241 -0.59375,1.90625 -0.36786,0.36786 -0.95228,0.57857 -1.8125,0.59375 -0.0213,-3.4e-4 -0.0411,1.1e-4 -0.0625,0 -0.0113,7e-5 -0.0198,0 -0.0312,0 -0.0215,0 -0.0411,-2.3e-4 -0.0625,0 a 0.50005,0.50005 0 0 0 -0.0312,0 0.50219246,0.50219246 0 0 0 -0.15625,0.0312 c -0.91383,0.0405 -1.68916,0.2738 -2.25,0.78125 l 0,-0.71875 a 0.50005,0.50005 0 0 0 0,-0.0937 c 0,-0.91667 0.2116,-1.5241 0.59375,-1.90625 C 185.9759,99.7116 186.58333,99.5 187.5,99.5 a 0.50005,0.50005 0 1 0 0,-1 c -1.08333,0 -1.9759,0.2884 -2.59375,0.90625 -0.0422,0.0422 -0.0859,0.0803 -0.125,0.125 -0.14933,-0.43579 -0.37857,-0.81607 -0.6875,-1.125 C 183.4759,97.7884 182.58333,97.5 181.5,97.5 a 0.50005,0.50005 0 0 0 -0.0937,0 0.50219246,0.50219246 0 0 0 -0.0625,0 z"
        id="tree_2"
        inkscape:label="#path4517"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 151.5,95 0,-3 -2,-4 -4,-3"
+       d="m 167.5,95 0,-3 -2,-4 -4,-3"
        id="path4558"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 151.5,95 0,-3 2,-4 4,-3 0,0 0,0"
+       d="m 167.5,95 0,-3 2,-4 4,-3 0,0 0,0"
        id="path4560"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccc" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 149.5,88 0,-5"
+       d="m 165.5,88 0,-5"
        id="path4562"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 153.5,88 0,-5"
+       d="m 169.5,88 0,-5"
        id="path4564"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 147.5,87 -2,1"
+       d="m 163.5,87 -2,1"
        id="path4566"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 155.5,87 2,1"
+       d="m 171.5,87 2,1"
        id="path4568"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
@@ -2210,7 +2213,7 @@
        inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;stroke:none"
-       d="m 246,98 c -0.554,0 -1,0.446 -1,1 l 0,5 c 0,0.554 0.446,1 1,1 l 1,2 0.5,3 1,0 0.5,-3 1,-2 c 0.554,0 1,-0.446 1,-1 l 0,-5 c 0,-0.554 -0.446,-1 -1,-1 l -4,0 z m 1,7 2,0 -1,1.5 -1,-1.5 z"
+       d="m 262,98 c -0.554,0 -1,0.446 -1,1 l 0,5 c 0,0.554 0.446,1 1,1 l 1,2 0.5,3 1,0 0.5,-3 1,-2 c 0.554,0 1,-0.446 1,-1 l 0,-5 c 0,-0.554 -0.446,-1 -1,-1 l -4,0 z m 1,7 2,0 -1,1.5 -1,-1.5 z"
        id="tree"
        inkscape:label="#rect4612"
        inkscape:connector-curvature="0" />
@@ -2433,7 +2436,7 @@
     <path
        sodipodi:nodetypes="cccccccccccccccc"
        style="fill:#000000;stroke:none"
-       d="m 232,99 c -0.5,1.25 -1.75,2.25 -3,3 l 2,0 c -0.5,1.25 -1.75,2.25 -3,3 l 2,0 c -0.5,1.25 -1.75,2.25 -3,3 l 4,0 0,2 2,0 0,-2 4,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 l 2,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 l 2,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 z"
+       d="m 248,99 c -0.5,1.25 -1.75,2.25 -3,3 l 2,0 c -0.5,1.25 -1.75,2.25 -3,3 l 2,0 c -0.5,1.25 -1.75,2.25 -3,3 l 4,0 0,2 2,0 0,-2 4,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 l 2,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 l 2,0 c -1.25,-0.75 -2.5,-1.75 -3,-3 z"
        id="needleleaved"
        inkscape:connector-curvature="0"
        inkscape:label="#path3178" />
@@ -2921,29 +2924,29 @@
        d="m 292,130 0,10 1,0 0,-9 6,0 0,9 1,0 0,-10 -8,0 z m 6,2 -4,2 0,8 4,-2 0,-8 z"
        style="fill:#d40000;fill-opacity:1;stroke:none" />
     <rect
-       style="color:#000000;fill:#808080;stroke:none;stroke-width:0.30000000999999998;stroke-linecap:butt;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"
+       style="color:#000000;fill:#808080;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3460"
        width="10"
        height="12"
-       x="275"
+       x="291"
        y="82" />
     <rect
        style="color:#000000;fill:#ffd5d5;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3462"
        width="3"
        height="1"
-       x="276"
+       x="292"
        y="84" />
     <rect
        y="84"
-       x="281"
+       x="297"
        height="1"
        width="3"
        id="rect3464"
        style="color:#000000;fill:#ffd5d5;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
        y="86"
-       x="276"
+       x="292"
        height="1"
        width="3"
        id="rect3466"
@@ -2953,25 +2956,25 @@
        id="rect3468"
        width="3"
        height="1"
-       x="281"
+       x="297"
        y="86" />
     <rect
        style="color:#000000;fill:#ffd5d5;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3470"
        width="3"
        height="1"
-       x="276"
+       x="292"
        y="88" />
     <rect
        y="88"
-       x="281"
+       x="297"
        height="1"
        width="3"
        id="rect3472"
        style="color:#000000;fill:#ffd5d5;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
        y="90"
-       x="276"
+       x="292"
        height="1"
        width="3"
        id="rect3474"
@@ -2981,23 +2984,24 @@
        id="rect3476"
        width="3"
        height="1"
-       x="281"
+       x="297"
        y="90" />
     <path
-       style="color:#000000;fill:#d40000;stroke:none;stroke-width:0.30000000999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 275 98 L 275 110 L 285 110 L 285 98 L 275 98 z M 276 100 L 279 100 L 279 101 L 276 101 L 276 100 z M 281 100 L 284 100 L 284 101 L 281 101 L 281 100 z M 276 102 L 279 102 L 279 103 L 276 103 L 276 102 z M 281 102 L 284 102 L 284 103 L 281 103 L 281 102 z M 276 104 L 279 104 L 279 105 L 276 105 L 276 104 z M 281 104 L 284 104 L 284 105 L 281 105 L 281 104 z M 276 106 L 279 106 L 279 107 L 276 107 L 276 106 z M 281 106 L 284 106 L 284 107 L 281 107 L 281 106 z "
+       style="color:#000000;fill:#d40000;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 291,98 0,12 10,0 0,-12 -10,0 z m 1,2 3,0 0,1 -3,0 0,-1 z m 5,0 3,0 0,1 -3,0 0,-1 z m -5,2 3,0 0,1 -3,0 0,-1 z m 5,0 3,0 0,1 -3,0 0,-1 z m -5,2 3,0 0,1 -3,0 0,-1 z m 5,0 3,0 0,1 -3,0 0,-1 z m -5,2 3,0 0,1 -3,0 0,-1 z m 5,0 3,0 0,1 -3,0 0,-1 z"
        id="apartments2"
-       inkscape:label="#rect3478" />
+       inkscape:label="#rect3478"
+       inkscape:connector-curvature="0" />
     <rect
        y="82"
-       x="291"
+       x="307"
        height="12"
        width="10"
        id="rect3498"
        style="color:#000000;fill:#808080;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
        y="84"
-       x="293"
+       x="309"
        height="2"
        width="2"
        id="rect3500"
@@ -3007,25 +3011,25 @@
        id="rect3502"
        width="2"
        height="2"
-       x="297"
+       x="313"
        y="84" />
     <rect
        style="color:#000000;fill:#ffd5d5;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3516"
        width="2"
        height="2"
-       x="293"
+       x="309"
        y="87" />
     <rect
        y="87"
-       x="297"
+       x="313"
        height="2"
        width="2"
        id="rect3518"
        style="color:#000000;fill:#ffd5d5;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
        y="90"
-       x="293"
+       x="309"
        height="2"
        width="2"
        id="rect3520"
@@ -3035,11 +3039,11 @@
        id="rect3522"
        width="2"
        height="2"
-       x="297"
+       x="313"
        y="90" />
     <path
        style="color:#000000;fill:#000000;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 291,98 0,13 10,0 0,-13 z m 2,2 2,0 0,2 -2,0 z m 4,0 2,0 0,2 -2,0 z m -4,3 2,0 0,2 -2,0 z m 4,0 2,0 0,2 -2,0 z m -4,3 2,0 0,2 -2,0 z m 4,0 2,0 0,2 -2,0 z"
+       d="m 307,98 0,13 10,0 0,-13 z m 2,2 2,0 0,2 -2,0 z m 4,0 2,0 0,2 -2,0 z m -4,3 2,0 0,2 -2,0 z m 4,0 2,0 0,2 -2,0 z m -4,3 2,0 0,2 -2,0 z m 4,0 2,0 0,2 -2,0 z"
        id="apartments"
        inkscape:label="#rect3524"
        inkscape:connector-curvature="0"
@@ -3246,15 +3250,16 @@
        id="rect3492"
        width="9"
        height="9"
-       x="99"
+       x="115"
        y="86"
-       ry="2" />
+       ry="2"
+       rx="2" />
     <rect
        style="fill:#ffd5d5;stroke:none"
        id="rect3494"
        width="1"
        height="11"
-       x="103"
+       x="119"
        y="85"
        ry="0" />
     <rect
@@ -3262,11 +3267,11 @@
        id="rect3496"
        width="11"
        height="1"
-       x="98"
+       x="114"
        y="90" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 103.5,84.5 c 7,0 0,-7 0,0 z"
+       d="m 119.5,84.5 c 7,0 0,-7 0,0 z"
        id="path3498"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
@@ -3274,11 +3279,11 @@
        sodipodi:nodetypes="cc"
        inkscape:connector-curvature="0"
        id="path3500"
-       d="m 103.5,84.5 c -7,0 0,-7 0,0 z"
+       d="m 119.5,84.5 c -7,0 0,-7 0,0 z"
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:#000000;fill-rule:evenodd;stroke:none"
-       d="m 101.875,96.90625 c -0.10225,0.005 -0.21359,0.0087 -0.3125,0.03125 -0.39565,0.09008 -0.75357,0.316074 -1.03125,0.59375 -0.55535,0.555351 -0.87561,1.467735 -0.40625,2.25 0.42247,0.70412 1.36028,1.10981 2.875,1.1875 l 0,0.0312 1,0 0,-0.0312 c 1.51472,-0.0777 2.45253,-0.48338 2.875,-1.1875 0.46936,-0.782265 0.1491,-1.694649 -0.40625,-2.25 -0.27768,-0.277676 -0.6356,-0.503669 -1.03125,-0.59375 -0.39565,-0.09008 -0.82762,-0.04718 -1.21875,0.1875 -0.29335,0.17601 -0.52743,0.427325 -0.71875,0.78125 -0.19132,-0.353925 -0.4254,-0.60524 -0.71875,-0.78125 -0.29335,-0.17601 -0.59951,-0.233686 -0.90625,-0.21875 z m -0.0625,0.96875 c 0.0667,-0.01205 0.12277,-0.0077 0.1875,0 0.0863,0.0103 0.17213,0.04703 0.25,0.09375 0.26033,0.156197 0.55054,0.806403 0.65625,1.9375 -1.1311,-0.105712 -1.7813,-0.395922 -1.9375,-0.65625 -0.18689,-0.311485 -0.0696,-0.711601 0.25,-1.03125 0.17981,-0.179803 0.3938,-0.307602 0.59375,-0.34375 z m 3.1875,0 c 0.25892,-0.03089 0.54151,0.104012 0.78125,0.34375 0.31965,0.319649 0.43689,0.719765 0.25,1.03125 -0.1562,0.260328 -0.8064,0.550538 -1.9375,0.65625 0.10571,-1.131097 0.39592,-1.781303 0.65625,-1.9375 0.0779,-0.04672 0.16369,-0.08345 0.25,-0.09375 z M 101,102 c -1.108,0 -2,0.892 -2,2 l 0,2 4,0 0,-4 -2,0 z m 3,0 0,4 4,0 0,-2 c 0,-1.108 -0.892,-2 -2,-2 l -2,0 z m -5,5 0,2 c 0,1.108 0.892,2 2,2 l 2,0 0,-4 -4,0 z m 5,0 0,4 2,0 c 1.108,0 2,-0.892 2,-2 l 0,-2 -4,0 z"
+       d="m 117.875,96.90625 c -0.10225,0.005 -0.21359,0.0087 -0.3125,0.03125 -0.39565,0.09008 -0.75357,0.316074 -1.03125,0.59375 -0.55535,0.555351 -0.87561,1.467735 -0.40625,2.25 0.42247,0.70412 1.36028,1.10981 2.875,1.1875 l 0,0.0312 1,0 0,-0.0312 c 1.51472,-0.0777 2.45253,-0.48338 2.875,-1.1875 0.46936,-0.782265 0.1491,-1.694649 -0.40625,-2.25 -0.27768,-0.277676 -0.6356,-0.503669 -1.03125,-0.59375 -0.39565,-0.09008 -0.82762,-0.04718 -1.21875,0.1875 -0.29335,0.17601 -0.52743,0.427325 -0.71875,0.78125 -0.19132,-0.353925 -0.4254,-0.60524 -0.71875,-0.78125 -0.29335,-0.17601 -0.59951,-0.233686 -0.90625,-0.21875 z m -0.0625,0.96875 c 0.0667,-0.01205 0.12277,-0.0077 0.1875,0 0.0863,0.0103 0.17213,0.04703 0.25,0.09375 0.26033,0.156197 0.55054,0.806403 0.65625,1.9375 -1.1311,-0.105712 -1.7813,-0.395922 -1.9375,-0.65625 -0.18689,-0.311485 -0.0696,-0.711601 0.25,-1.03125 0.17981,-0.179803 0.3938,-0.307602 0.59375,-0.34375 z m 3.1875,0 c 0.25892,-0.03089 0.54151,0.104012 0.78125,0.34375 0.31965,0.319649 0.43689,0.719765 0.25,1.03125 -0.1562,0.260328 -0.8064,0.550538 -1.9375,0.65625 0.10571,-1.131097 0.39592,-1.781303 0.65625,-1.9375 0.0779,-0.04672 0.16369,-0.08345 0.25,-0.09375 z M 117,102 c -1.108,0 -2,0.892 -2,2 l 0,2 4,0 0,-4 -2,0 z m 3,0 0,4 4,0 0,-2 c 0,-1.108 -0.892,-2 -2,-2 l -2,0 z m -5,5 0,2 c 0,1.108 0.892,2 2,2 l 2,0 0,-4 -4,0 z m 5,0 0,4 2,0 c 1.108,0 2,-0.892 2,-2 l 0,-2 -4,0 z"
        id="gift"
        inkscape:label="#rect3503"
        inkscape:connector-curvature="0" />
@@ -3297,17 +3302,18 @@
        inkscape:connector-curvature="0"
        inkscape:label="#path3180"
        id="path4309"
-       d="m 261,83 0,7.5 c 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 l 1.5,0 -2,-2.5 -2,2.5 1.5,0 c 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 l 0,-7.5 z"
+       d="m 277,83 0,7.5 c 0,1.38071 1.11929,2.5 2.5,2.5 1.38071,0 2.5,-1.11929 2.5,-2.5 l 1.5,0 -2,-2.5 -2,2.5 1.5,0 c 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.67157 -1.5,-1.5 l 0,-7.5 z"
        style="fill:#666666;stroke:none" />
     <path
        sodipodi:type="arc"
-       style="fill:#666666;stroke:none;stroke-width:0.20000000000000001;stroke-miterlimit:4;stroke-dasharray:none"
+       style="fill:#666666;stroke:none"
        id="path4311"
        sodipodi:cx="261.5"
        sodipodi:cy="82.5"
        sodipodi:rx="1.5"
        sodipodi:ry="1.5"
-       d="m 263,82.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+       d="m 263,82.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+       transform="translate(16,0)" />
     <path
        sodipodi:type="arc"
        style="fill:#ffd5d5;stroke:none"
@@ -3316,13 +3322,14 @@
        sodipodi:cy="82.5"
        sodipodi:rx="0.5"
        sodipodi:ry="0.5"
-       d="m 262,82.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" />
+       d="m 262,82.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       transform="translate(16,0)" />
     <rect
        style="fill:#808080;stroke:none"
        id="rect4328"
        width="12"
        height="6"
-       x="306"
+       x="322"
        y="85" />
     <path
        sodipodi:type="arc"
@@ -3332,61 +3339,65 @@
        sodipodi:cy="88"
        sodipodi:rx="2"
        sodipodi:ry="2"
-       d="m 314,88 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z" />
+       d="m 314,88 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+       transform="translate(16,0)" />
     <rect
        style="fill:#ffd5d5;stroke:none"
        id="rect4343"
        width="1"
        height="2"
-       x="307"
+       x="323"
        y="88" />
     <rect
        style="fill:#ffd5d5;stroke:none"
        id="rect4345"
        width="1"
        height="2"
-       x="316"
+       x="332"
        y="86" />
     <path
        style="fill:#000000;stroke:none"
-       d="M 306 101 L 306 107 L 318 107 L 318 101 L 306 101 z M 311.5 102 L 312 102 L 312.5 102 C 313.331 102 314 102.669 314 103.5 L 314 104 L 314 104.5 C 314 105.331 313.331 106 312.5 106 L 312 106 L 311.5 106 C 310.669 106 310 105.331 310 104.5 L 310 104 L 310 103.5 C 310 102.669 310.669 102 311.5 102 z "
-       id="money" />
+       d="m 322,101 0,6 12,0 0,-6 -12,0 z m 5.5,1 0.5,0 0.5,0 c 0.831,0 1.5,0.669 1.5,1.5 l 0,0.5 0,0.5 c 0,0.831 -0.669,1.5 -1.5,1.5 l -0.5,0 -0.5,0 c -0.831,0 -1.5,-0.669 -1.5,-1.5 l 0,-0.5 0,-0.5 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
+       id="money"
+       inkscape:connector-curvature="0" />
     <path
        style="fill:#808080;stroke:none"
-       d="m 323,90 10,0 -2,5 -6,0 z"
+       d="m 339,90 10,0 -2,5 -6,0 z"
        id="path4356"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 321,91 c 0,0 1,0 2,-1 1,-1 2,-1 3,0 1,-1 3,-1 4,0 1,-1 2,-1 3,0 0.18896,0.18896 2,1 2,1"
+       d="m 337,91 c 0,0 1,0 2,-1 1,-1 2,-1 3,0 1,-1 3,-1 4,0 1,-1 2,-1 3,0 0.18896,0.18896 2,1 2,1"
        id="path4358"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="czccsc" />
     <path
        style="fill:#000000;stroke:none"
-       d="M 338 100 L 338 103 L 340 103 L 340 102 L 339 102 L 339 101 L 349 101 L 349 102 L 348 102 L 348 103 L 350 103 L 350 100 L 338 100 z M 341 102 L 341 111 L 347 111 L 347 102 L 341 102 z M 343.5 103 L 344 103 L 344.5 103 C 345.331 103 346 103.669 346 104.5 L 346 105 L 346 105.5 C 346 106.331 345.331 107 344.5 107 L 344 107 L 343.5 107 C 342.669 107 342 106.331 342 105.5 L 342 105 L 342 104.5 C 342 103.669 342.669 103 343.5 103 z "
-       id="atm" />
+       d="m 354,100 0,3 2,0 0,-1 -1,0 0,-1 10,0 0,1 -1,0 0,1 2,0 0,-3 -12,0 z m 3,2 0,9 6,0 0,-9 -6,0 z m 2.5,1 0.5,0 0.5,0 c 0.831,0 1.5,0.669 1.5,1.5 l 0,0.5 0,0.5 c 0,0.831 -0.669,1.5 -1.5,1.5 l -0.5,0 -0.5,0 c -0.831,0 -1.5,-0.669 -1.5,-1.5 l 0,-0.5 0,-0.5 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
+       id="atm"
+       inkscape:connector-curvature="0" />
     <rect
        ry="1.5"
        y="91"
-       x="310"
+       x="326"
        height="4"
        width="4"
        id="rect4390"
-       style="fill:#ffd5d5;stroke:none" />
+       style="fill:#ffd5d5;stroke:none"
+       rx="1.5" />
     <rect
        style="fill:#000000;stroke:none"
        id="rect4400"
        width="7"
        height="12"
-       x="356"
+       x="372"
        y="82"
        ry="0" />
     <path
        inkscape:connector-curvature="0"
        id="path4405"
-       d="m 361,84.5 3,0 c 0.82843,0 1.5,0.671573 1.5,1.5 l 0,4 c 0,0.828427 -0.68284,1.636193 -1.5,1.5 l -3,0 0,0 0,0 0,0"
+       d="m 377,84.5 3,0 c 0.82843,0 1.5,0.671573 1.5,1.5 l 0,4 c 0,0.828427 -0.68284,1.636193 -1.5,1.5 l -3,0 0,0 0,0 0,0"
        style="fill:none;stroke:#d4aa00"
        sodipodi:nodetypes="ccccscccc" />
     <rect
@@ -3394,39 +3405,42 @@
        id="rect4409"
        width="5"
        height="2"
-       x="357"
+       x="373"
        y="83"
-       ry="1" />
+       ry="1"
+       rx="1" />
     <rect
        ry="1"
-       y="-360"
+       y="-376"
        x="83"
        height="2"
        width="5"
        id="rect4411"
        style="fill:#ffd5d5;stroke:none"
-       transform="matrix(0,1,-1,0,0,0)" />
+       transform="matrix(0,1,-1,0,0,0)"
+       rx="1" />
     <path
        style="fill:#000000;stroke:none"
-       d="m 356,99 0,11 7,0 0,-2 0.90625,0 0.0937,0 0,-0.0312 c 0.54727,0.0521 1.06536,-0.1396 1.40625,-0.5 C 365.76971,107.08444 366,106.55159 366,106 l 0,-3 c 0,-1.09865 -1.01734,-1.50867 -2,-2 l -1,0 0,-2 z m 1.5,1 1,0 3,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -1.5,0 c -0.55228,0 -1,0.44772 -1,1 l 0,2.5 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-0.9375 c 0.003,-0.0216 0,-0.0401 0,-0.0625 0,-0.24069 -0.17967,-0.42115 -0.40625,-0.46875 C 357.56115,103.01055 357.5346,103 357.5,103 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-2 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 5.5,2 1,0 c 0.55821,0 1,0.44179 1,1 l 0,3 c 0,0.27684 -0.13025,0.58857 -0.3125,0.78125 -0.18225,0.19268 -0.36556,0.25678 -0.59375,0.21875 l -0.0625,0 -0.0312,0 -1,0 z"
+       d="m 372,99 0,11 7,0 0,-2 0.90625,0 0.0937,0 0,-0.0312 c 0.54727,0.0521 1.06536,-0.1396 1.40625,-0.5 C 381.76971,107.08444 382,106.55159 382,106 l 0,-3 c 0,-1.09865 -1.01734,-1.50867 -2,-2 l -1,0 0,-2 z m 1.5,1 1,0 3,0 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 l -1.5,0 c -0.55228,0 -1,0.44772 -1,1 l 0,2.5 c 0,0.277 -0.223,0.5 -0.5,0.5 -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-0.9375 c 0.003,-0.0216 0,-0.0401 0,-0.0625 0,-0.24069 -0.17967,-0.42115 -0.40625,-0.46875 C 373.56115,103.01055 373.5346,103 373.5,103 c -0.277,0 -0.5,-0.223 -0.5,-0.5 l 0,-2 c 0,-0.277 0.223,-0.5 0.5,-0.5 z m 5.5,2 1,0 c 0.55821,0 1,0.44179 1,1 l 0,3 c 0,0.27684 -0.13025,0.58857 -0.3125,0.78125 -0.18225,0.19268 -0.36556,0.25678 -0.59375,0.21875 l -0.0625,0 -0.0312,0 -1,0 z"
        id="beer"
        inkscape:label="#rect4413"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccssscccscsssssssscscsssscssssccccc" />
     <path
        style="fill:#ffd5d5;stroke:none"
-       d="m 357.5,89 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 0.0346,0 0.0611,0.01054 0.0937,0.03125 C 357.82028,92.07888 358,92.25931 358,92.5 c 0,0.02239 0.003,0.04089 0,0.0625 l 0,0.9375 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2.5 c 0,-0.55228 0.44772,-1 1,-1 l 1.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -3,0 -1,0 z"
+       d="m 373.5,89 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 0.0346,0 0.0611,0.01054 0.0937,0.03125 C 373.82028,92.07888 374,92.25931 374,92.5 c 0,0.02239 0.003,0.04089 0,0.0625 l 0,0.9375 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2.5 c 0,-0.55228 0.44772,-1 1,-1 l 1.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -3,0 -1,0 z"
        id="rect4421"
        inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;stroke:none"
-       d="M 372.5 98 C 372.223 98 372 98.223 372 98.5 L 372 99.5 C 372 99.777 372.223 100 372.5 100 L 379.5 100 C 379.777 100 380 99.777 380 99.5 L 380 98.5 C 380 98.223 379.777 98 379.5 98 L 372.5 98 z M 372.5 101 C 372.223 101 372 101.223 372 101.5 L 372 109.5 C 372 109.777 372.223 110 372.5 110 L 379.5 110 C 379.777 110 380 109.777 380 109.5 L 380 101.5 C 380 101.223 379.777 101 379.5 101 L 372.5 101 z M 375 102 L 377 102 L 377 104 L 379 104 L 379 106 L 377 106 L 377 108 L 375 108 L 375 106 L 373 106 L 373 104 L 375 104 L 375 102 z "
+       d="m 388.5,98 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,1 c 0,0.277 0.223,0.5 0.5,0.5 l 7,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -7,0 z m 0,3 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.277 0.223,0.5 0.5,0.5 l 7,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-8 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -7,0 z m 2.5,1 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 0,-2 z"
        id="pharmacy"
-       inkscape:label="#rect4460" />
+       inkscape:label="#rect4460"
+       inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="path4471"
-       d="m 386,86 4,4 0,4 -1,0 c -0.554,0 -1,0.446 -1,1 l 5,0 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-4 4,-4 z"
+       d="m 402,86 4,4 0,4 -1,0 c -0.554,0 -1,0.446 -1,1 l 5,0 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-4 4,-4 z"
        style="fill:#808080;fill-opacity:1;stroke:none"
        sodipodi:nodetypes="cccsccscccc" />
     <path
@@ -3440,51 +3454,53 @@
        d="m 393,100 a 3,3 0 1 1 0.87868,2.12132 L 396,100 z"
        sodipodi:start="3.1415927"
        sodipodi:end="8.6393798"
-       transform="translate(-1,-14)" />
+       transform="translate(15,-14)" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"
-       d="M 395 99 C 393.34315 99 392 100.34315 392 102 L 386 102 L 390 106 L 390 110 L 389 110 C 388.446 110 388 110.446 388 111 L 393 111 C 393 110.446 392.554 110 392 110 L 391 110 L 391 106 L 392.875 104.125 C 393.43761 104.68761 394.20435 105 395 105 C 396.65685 105 398 103.65685 398 102 C 398 100.34315 396.65685 99 395 99 z "
+       d="m 411,99 c -1.65685,0 -3,1.34315 -3,3 l -6,0 4,4 0,4 -1,0 c -0.554,0 -1,0.446 -1,1 l 5,0 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-4 1.875,-1.875 c 0.56261,0.56261 1.32935,0.875 2.125,0.875 1.65685,0 3,-1.34315 3,-3 0,-1.65685 -1.34315,-3 -3,-3 z"
        id="night_club"
-       inkscape:label="#path4477" />
+       inkscape:label="#path4477"
+       inkscape:connector-curvature="0" />
     <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.25000011999999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 404.5,89 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 0,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.25000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 420.5,89 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 0,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
        id="path4485"
        inkscape:connector-curvature="0" />
     <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.25000011999999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 411.5,89 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 0,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.25000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 427.5,89 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 0,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
        id="path4487"
        inkscape:connector-curvature="0" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 406,83.5 -1.5,1 0,3 5.5,0 1.5,2"
+       d="m 422,83.5 -1.5,1 0,3 5.5,0 1.5,2"
        id="path4493"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 410,88 0,-2"
+       d="m 426,88 0,-2"
        id="path4495"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 408.5,85.5 3,0"
+       d="m 424.5,85.5 3,0"
        id="path4498"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
     <path
        style="fill:none;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 410,91.5 -1.5,0 -2.5,-4"
+       d="m 426,91.5 -1.5,0 -2.5,-4"
        id="path4506"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccc" />
     <path
        style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.25000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="M 401.5 97 C 401.223 97 401 97.223 401 97.5 L 401 99.5 L 401 101.5 C 401 101.777 401.223 102 401.5 102 C 401.777 102 402 101.777 402 101.5 L 402 100 L 403.5 100 C 403.56925 100 403.62764 99.993984 403.6875 99.96875 C 404.42878 99.877717 405 99.265885 405 98.5 C 405 97.734115 404.42878 97.122283 403.6875 97.03125 C 403.62764 97.006016 403.56925 97 403.5 97 L 401.5 97 z M 402 98 L 403.5 98 C 403.77614 98 404 98.223858 404 98.5 C 404 98.776142 403.77614 99 403.5 99 L 402 99 L 402 98 z M 406.71875 100.09375 L 405.21875 101.09375 L 405 101.21875 L 405 101.5 L 405 104.5 L 405 105 L 405.5 105 L 406.71875 105 L 409.0625 108.75 L 409.21875 109 L 409.5 109 L 410.0625 109 C 410.29667 110.13637 411.29706 111 412.5 111 C 413.87479 111 415 109.87479 415 108.5 C 415 107.22171 414.02295 106.17411 412.78125 106.03125 L 411.5 104.3125 L 411.5 103 L 412.5 103 L 412.5 102 L 409.5 102 L 409.5 103 L 410.5 103 L 410.5 104 L 406 104 L 406 101.75 L 407.28125 100.90625 L 406.71875 100.09375 z M 407.90625 105 L 410.5 105 L 410.75 105 L 411.625 106.15625 C 410.83246 106.45625 410.23656 107.1553 410.0625 108 L 409.78125 108 L 407.90625 105 z M 405.5 106 C 404.12521 106 403 107.12521 403 108.5 C 403 109.87479 404.12521 111 405.5 111 C 406.87479 111 408 109.87479 408 108.5 C 408 107.12521 406.87479 106 405.5 106 z M 405.5 107 C 406.33435 107 407 107.66565 407 108.5 C 407 109.33435 406.33435 110 405.5 110 C 404.66565 110 404 109.33435 404 108.5 C 404 107.66565 404.66565 107 405.5 107 z M 412.5 107 C 413.33435 107 414 107.66565 414 108.5 C 414 109.33435 413.33435 110 412.5 110 C 411.66565 110 411 109.33435 411 108.5 C 411 107.66565 411.66565 107 412.5 107 z "
+       d="m 417.5,97 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 0,2 c 0,0.277 0.223,0.5 0.5,0.5 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.5 1.5,0 c 0.0693,0 0.12764,-0.006 0.1875,-0.03125 C 420.42878,99.87772 421,99.265885 421,98.5 421,97.734115 420.42878,97.122283 419.6875,97.03125 419.62764,97.006016 419.56925,97 419.5,97 l -2,0 z m 0.5,1 1.5,0 c 0.27614,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.22386,0.5 -0.5,0.5 l -1.5,0 0,-1 z m 4.71875,2.09375 -1.5,1 -0.21875,0.125 0,0.28125 0,3 0,0.5 0.5,0 1.21875,0 2.34375,3.75 0.15625,0.25 0.28125,0 0.5625,0 c 0.23417,1.13637 1.23456,2 2.4375,2 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.27829 -0.97705,-2.32589 -2.21875,-2.46875 L 427.5,104.3125 l 0,-1.3125 1,0 0,-1 -3,0 0,1 1,0 0,1 -4.5,0 0,-2.25 1.28125,-0.84375 -0.5625,-0.8125 z m 1.1875,4.90625 2.59375,0 0.25,0 0.875,1.15625 c -0.79254,0.3 -1.38844,0.99905 -1.5625,1.84375 l -0.28125,0 -1.875,-3 z M 421.5,106 c -1.37479,0 -2.5,1.12521 -2.5,2.5 0,1.37479 1.12521,2.5 2.5,2.5 1.37479,0 2.5,-1.12521 2.5,-2.5 0,-1.37479 -1.12521,-2.5 -2.5,-2.5 z m 0,1 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z m 7,0 c 0.83435,0 1.5,0.66565 1.5,1.5 0,0.83435 -0.66565,1.5 -1.5,1.5 -0.83435,0 -1.5,-0.66565 -1.5,-1.5 0,-0.83435 0.66565,-1.5 1.5,-1.5 z"
        id="bicycle_parking"
-       inkscape:label="#path4508" />
+       inkscape:label="#path4508"
+       inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;stroke:none"
        d="M 67.5 165 C 67.223 165 67 165.223 67 165.5 L 67 166 C 66.446 166 66 166.446 66 167 L 66 168 C 66 168.554 66.446 169 67 169 L 67 170 L 66.5 170 C 66.223 170 66 170.223 66 170.5 L 66 171.5 C 66 171.777 66.223 172 66.5 172 L 67 172 L 67 173.5 C 67 173.777 67.223 174 67.5 174 C 67.777 174 68 173.777 68 173.5 L 68 172 L 76 172 L 76 173.5 C 76 173.777 76.223 174 76.5 174 C 76.777 174 77 173.777 77 173.5 L 77 172 L 77.5 172 C 77.777 172 78 171.777 78 171.5 L 78 170.5 C 78 170.223 77.777 170 77.5 170 L 77 170 L 77 169 C 77.554 169 78 168.554 78 168 L 78 167 C 78 166.446 77.554 166 77 166 L 77 165.5 C 77 165.223 76.777 165 76.5 165 C 76.223 165 76 165.223 76 165.5 L 76 166 L 68 166 L 68 165.5 C 68 165.223 67.777 165 67.5 165 z M 68 169 L 76 169 L 76 170 L 68 170 L 68 169 z "
@@ -3903,9 +3919,10 @@
        inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;stroke:none"
-       d="M 328 101 C 323.38942 101 321.31847 104.40488 322.59375 105.71875 C 322.61685 105.69688 322.6331 105.6794 322.65625 105.65625 C 323.21518 105.09732 323.83333 104.75 324.5 104.75 C 325.02152 104.75 325.47787 105.11124 325.9375 105.46875 C 326.52808 105.01097 327.25388 104.75 328 104.75 C 328.74612 104.75 329.47192 105.01097 330.0625 105.46875 C 330.52213 105.11124 330.97848 104.75 331.5 104.75 C 332.16667 104.75 332.78482 105.09732 333.34375 105.65625 C 333.28941 105.60195 333.35175 105.62375 333.40625 105.65625 C 333.41212 105.65975 333.43124 105.6525 333.4375 105.65625 C 334.61048 104.30672 332.55048 101 328 101 z M 324.5 105.75 C 324.16667 105.75 323.78482 105.90268 323.34375 106.34375 C 323.2933 106.3942 323.23795 106.42252 323.1875 106.46875 L 325 111 L 331 111 L 332.8125 106.46875 C 332.76817 106.43492 332.72676 106.41426 332.65625 106.34375 C 332.21518 105.90268 331.83333 105.75 331.5 105.75 C 331.16667 105.75 330.78482 105.90268 330.34375 106.34375 L 330 106.71875 L 329.65625 106.34375 C 329.2741 105.9616 328.63889 105.75 328 105.75 C 327.36111 105.75 326.7259 105.9616 326.34375 106.34375 L 326 106.71875 L 325.65625 106.34375 C 325.21518 105.90268 324.83333 105.75 324.5 105.75 z "
+       d="m 344,101 c -4.61058,0 -6.68153,3.40488 -5.40625,4.71875 0.0231,-0.0219 0.0394,-0.0393 0.0625,-0.0625 0.55893,-0.55893 1.17708,-0.90625 1.84375,-0.90625 0.52152,0 0.97787,0.36124 1.4375,0.71875 0.59058,-0.45778 1.31638,-0.71875 2.0625,-0.71875 0.74612,0 1.47192,0.26097 2.0625,0.71875 0.45963,-0.35751 0.91598,-0.71875 1.4375,-0.71875 0.66667,0 1.28482,0.34732 1.84375,0.90625 -0.0543,-0.0543 0.008,-0.0325 0.0625,0 0.006,0.004 0.025,-0.004 0.0312,0 C 350.61048,104.30672 348.55048,101 344,101 z m -3.5,4.75 c -0.33333,0 -0.71518,0.15268 -1.15625,0.59375 -0.0505,0.0504 -0.1058,0.0788 -0.15625,0.125 L 341,111 l 6,0 1.8125,-4.53125 c -0.0443,-0.0338 -0.0857,-0.0545 -0.15625,-0.125 -0.44107,-0.44107 -0.82292,-0.59375 -1.15625,-0.59375 -0.33333,0 -0.71518,0.15268 -1.15625,0.59375 l -0.34375,0.375 -0.34375,-0.375 C 345.2741,105.9616 344.63889,105.75 344,105.75 c -0.63889,0 -1.2741,0.2116 -1.65625,0.59375 l -0.34375,0.375 -0.34375,-0.375 C 341.21518,105.90268 340.83333,105.75 340.5,105.75 z"
        id="cupcake"
-       inkscape:label="#path3575" />
+       inkscape:label="#path3575"
+       inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="path3587"
@@ -3962,9 +3979,9 @@
        y="242"
        ry="0.5" />
     <path
-       style="fill:#000000;stroke:none"
+       style="fill:#d40000;stroke:none"
        d="M 55.5 258 C 55.223 258 55 258.223 55 258.5 C 55 258.777 55.223 259 55.5 259 L 56 259 L 56 260 L 55 260 C 53.343146 260 52 261.34315 52 263 L 52 264 L 54 264 L 54 263 C 54 262.44772 54.447715 262 55 262 L 62 262 L 62 260 L 57 260 L 57 259 L 57.5 259 C 57.777 259 58 258.777 58 258.5 C 58 258.223 57.777 258 57.5 258 L 57 258 L 56 258 L 55.5 258 z M 50 265 L 51 271 L 55 271 L 56 265 L 50 265 z "
-       id="drinking_water"
+       id="drinking_water_2"
        inkscape:label="#path4419" />
     <rect
        style="fill:#808080;stroke:none"
@@ -3988,9 +4005,11 @@
        style="fill:#808080;stroke:none" />
     <path
        style="fill:#000000;stroke:none"
-       d="M 67.5 258 C 67.223 258 67 258.223 67 258.5 C 67 258.777 67.223 259 67.5 259 L 76.5 259 C 76.777 259 77 258.777 77 258.5 C 77 258.223 76.777 258 76.5 258 L 67.5 258 z M 67.5 260 C 67.223 260 67 260.223 67 260.5 L 67 268.5 C 67 268.777 67.223 269 67.5 269 L 68 269 L 68.5 269 L 70 269 C 70 266 69 264 69 264 C 69 264 72 263 72 260 L 68.5 260 L 68 260 L 67.5 260 z M 72 260 C 72 263 75 264 75 264 C 75 264 74 266 74 269 L 75.5 269 L 76 269 L 76.5 269 C 76.777 269 77 268.777 77 268.5 L 77 260.5 C 77 260.223 76.777 260 76.5 260 L 76 260 L 75.5 260 L 72 260 z "
+       d="m 66.5,258 c -0.277,0 -0.5,0.223 -0.5,0.5 0,0.277 0.223,0.5 0.5,0.5 l 10,0 c 0.277,0 0.5,-0.223 0.5,-0.5 0,-0.277 -0.223,-0.5 -0.5,-0.5 z m 0,2 c 0,0 -0.5,0.223 -0.5,0.5 l 0,8 c 0,0.277 0.223,0.5 0.5,0.5 l 0.5,0 0.5,0 1.5,0 c 0,-3 -1,-5 -1,-5 0,0 3,-1 3,-4 l -3.5,0 -0.5,0 z m 5.5,0 c 0,3 3,4 3,4 0,0 -1,2 -1,5 l 1.5,0 0.5,0 0.5,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-8 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -0.5,0 -0.5,0 z"
        id="theatre"
-       inkscape:label="#rect4443" />
+       inkscape:label="#rect4443"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssssssscccccccscccccssssccc" />
     <path
        style="fill:#000000;stroke:none"
        d="M 163.5 165 C 163.223 165 163 165.223 163 165.5 L 163 170.5 C 163 170.777 163.223 171 163.5 171 L 164.5 171 C 164.777 171 165 170.777 165 170.5 L 165 165.5 C 165 165.223 164.777 165 164.5 165 L 163.5 165 z M 167.5 165 C 167.223 165 167 165.223 167 165.5 L 167 170.5 C 167 170.777 167.223 171 167.5 171 L 168.5 171 C 168.777 171 169 170.777 169 170.5 L 169 165.5 C 169 165.223 168.777 165 168.5 165 L 167.5 165 z M 171.5 165 C 171.223 165 171 165.223 171 165.5 L 171 170.5 C 171 170.777 171.223 171 171.5 171 L 172.5 171 C 172.777 171 173 170.777 173 170.5 L 173 165.5 C 173 165.223 172.777 165 172.5 165 L 171.5 165 z "
@@ -4137,5 +4156,73 @@
        id="rect4577"
        style="fill:#808080;stroke:none"
        ry="0.5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path5340"
+       d="m 82,249 1,6 4,0 1,-6 z"
+       style="fill:#808080;stroke:none" />
+    <rect
+       y="242"
+       x="88"
+       height="3"
+       width="1"
+       id="rect5344"
+       style="fill:#808080;stroke:none" />
+    <rect
+       ry="0.5"
+       y="242"
+       x="87"
+       height="1"
+       width="3"
+       id="rect5346"
+       style="fill:#808080;stroke:none"
+       rx="0.5" />
+    <rect
+       style="color:#000000;fill:#808080;stroke:none;stroke-width:0.30000000999999998;stroke-linecap:butt;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="rect5348"
+       width="6"
+       height="2"
+       x="88"
+       y="244"
+       ry="0" />
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="M 88 244 C 85.790861 244 84 245.79086 84 248 L 86 248 C 86 246.89543 86.895431 246 88 246 L 88 244 z "
+       id="path5352" />
+    <path
+       style="fill:#000000;stroke:none"
+       d="M 87.5 258 C 87.223 258 87 258.223 87 258.5 C 87 258.777 87.223 259 87.5 259 L 88 259 L 88 260 C 85.790861 260 84 261.79086 84 264 L 86 264 C 86 262.89543 86.895431 262 88 262 L 94 262 L 94 260 L 89 260 L 89 259 L 89.5 259 C 89.777 259 90 258.777 90 258.5 C 90 258.223 89.777 258 89.5 258 L 87.5 258 z M 82 265 L 83 271 L 87 271 L 88 265 L 82 265 z "
+       id="drinking_water" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 82,85 0,8 5,0 0,-10 c -3,0 -2,2 -5,2 z m 7,-2 0,10 5,0 0,-8 c -3,0 -2,-2 -5,-2 z"
+       id="path5380"
+       inkscape:label="#path3133"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <rect
+       ry="0.5"
+       y="87"
+       x="85"
+       height="2"
+       width="1"
+       id="rect5382"
+       style="color:#000000;fill:#ffd5d5;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       rx="0.5" />
+    <rect
+       rx="0.5"
+       style="color:#000000;fill:#ffd5d5;stroke:none;stroke-width:0.30000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5384"
+       width="1"
+       height="2"
+       x="90"
+       y="87"
+       ry="0.5" />
+    <path
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="M 87 99 C 84 99 85 101 82 101 L 82 109 L 87 109 L 87 99 z M 89 99 L 89 109 L 94 109 L 94 101 C 91 101 92 99 89 99 z M 85.5 103 C 85.777 103 86 103.223 86 103.5 L 86 104.5 C 86 104.777 85.777 105 85.5 105 C 85.223 105 85 104.777 85 104.5 L 85 103.5 C 85 103.223 85.223 103 85.5 103 z M 90.5 103 C 90.777 103 91 103.223 91 103.5 L 91 104.5 C 91 104.777 90.777 105 90.5 105 C 90.223 105 90 104.777 90 104.5 L 90 103.5 C 90 103.223 90.223 103 90.5 103 z "
+       id="gate"
+       inkscape:label="#path5386" />
   </g>
 </svg>
diff --git a/process.py b/process.py
index 3744130..3ee0db5 100644
--- a/process.py
+++ b/process.py
@@ -1,4 +1,5 @@
 import copy
+import re
 
 def get_color(color, scheme):
     if color in scheme['colors']:
diff --git a/tags.yml b/tags.yml
index 30619da..951e8e0 100644
--- a/tags.yml
+++ b/tags.yml
@@ -1,29 +1,5 @@
 colors:
 
-  # Color names
-
-  'black': '000000'
-  'blue': '2233AA'
-  'brown': '964B00'
-  'darkgreen': '446722'
-  'gold': 'FFD700'  # Wikipedia
-  'gray': '888888'
-  'green': '4E9A06'
-  'grey': '888888'
-  'lightblue': '2288CC'
-  'slate_blue': '2288CC'  # The same
-  'lightgreen': '73D216'
-  'maroon': '800000'
-  'orange': 'FCAF3E'
-  'pink': '9D52A9'
-  'purple': '9D52A9'
-  'red': 'CC0000'
-  'silver': 'AAAAAA'
-  'tan': 'D2B48C'  # Wikipedia
-  'violet': '75507B'
-  'white': 'FFFFFF'
-  'yellow': 'EDD400'
-
   # Entity
 
   'background': 'EEEEEE'
@@ -39,71 +15,122 @@ colors:
   'water_border': '6688BB'
   'wood': 'B8CC84'
 
+  # Colors not in W3C
+
+  'rose': 'FF007F'  # Wikipedia
+  'slate_blue': '6A5ACD'  # W3C slateblue
+
 tags:
 
+  # No draw
+
+- tags: {type: multipolygon}
+  draw: false
 - tags: {place: quarter}
   draw: false
 - tags: {building: 'yes'}
   draw: false
+
+  # Street amenity
+
+- tags: {amenity: atm}
+  icon: [atm]
 - tags: {amenity: bench}
   icon: [bench]
 - tags: {amenity: bench, backrest: 'yes'}
   icon: [bench_backrest]
 - tags: {amenity: bench, backrest: 'no'}
   icon: [bench_no_backrest]
+- tags: {amenity: clock}
+  icon: [clock]
+- tags: {amenity: cinema}
+  icon: [film]
+- tags: {highway: street_lamp}
+  icon: [street_lamp]
+- tags: {amenity: waste_basket}
+  icon: [waste_basket]
+- tags: {amenity: telephone}
+  icon: [telephone]
+- tags: {emergency: phone}
+  icon: [sos_phone]
+- tags: {amenity: fountain}
+  icon: [fountain]
+  color: water_border
+- tags: {amenity: toilets}
+  icon: [toilets]
+- tags: {amenity: post_box}
+  icon: [letter]
+- tags: {amenity: prison}
+  icon: [prison]
+- tags: {man_made: pole}
+  icon: [pole]
+- tags: {power: pole}
+  icon: [pole]
+- tags: {power: tower}
+  icon: [power_tower]
+- tags: {man_made: pole, highway: street_lamp}
+  icon: [pole_lamp]
+- tags: {man_made: flagpole}
+  icon: [flagpole]
+
 - tags: {amenity: bicycle_parking}
   icon: [bicycle_parking]
+- tags: {amenity: parking}
+  icon: [parking]
+
+  # Eating and entertainment
+
 - tags: {amenity: cafe}
   icon: [cafe]
 - tags: {amenity: nightclub}
   icon: [night_club]
-- tags: {amenity: waste_basket}
-  icon: [waste_basket]
-- tags: {amenity: clinic}
-  icon: [clinic]
 - tags: {amenity: restaurant}
   icon: [restaurant]
 - tags: {amenity: restaurant;bar}
   icon: [restaurant]
   add_icon: [bar]
-- tags: {amenity: pharmacy}
-  icon: [pharmacy]
-- tags: {amenity: post_box}
-  icon: [letter]
 - tags: {amenity: drinking_water}
   icon: [drinking_water]
-- tags: {amenity: toilets}
-  icon: [toilets]
-- tags: {amenity: telephone}
-  icon: [telephone]
 - tags: {amenity: theatre}
   icon: [theatre]
 - tags: {amenity: bar}
   icon: [bar]
-- tags: {amenity: bank}
-  icon: [money]
 - tags: {amenity: pub}
   icon: [beer]
+- tags: {amenity: fast_food}
+  icon: [fast_food]
+- tags: {amenity: '*', karaoke: 'yes'}
+  add_icon: [microphone]
+
+  # Other buildings
+
+- tags: {building: apartments}
+  icon: [apartments]
+- tags: {tourism: hotel}
+  icon: [hotel]
+- tags: {tourism: hostel}
+  icon: [hostel]
+- tags: {tourism: motel}  # Tourism?
+  icon: [motel]
+- tags: {amenity: clinic}
+  icon: [clinic]
+- tags: {amenity: bank}
+  icon: [money]
 - tags: {amenity: kindergarten}
   icon: [kindergarten]
 - tags: {amenity: post_office}
   icon: [letter]
-- tags: {amenity: fast_food}
-  icon: [fast_food]
-- tags: {amenity: fountain}
-  icon: [fountain]
-  color: water_border
-- tags: {amenity: '*', karaoke: 'yes'}
-  add_icon: [microphone]
 
   # Shop
 
+- tags: {amenity: pharmacy}
+  icon: [pharmacy]
 - tags: {amenity: shop, shop: fishing}
   icon: [fishing]
 - tags: {shop: clothes}
   icon: [shop_clothes]
 - tags: {amenity: shop, shop: clothes}
-  icon: [clothes]
+  icon: [shop_clothes]
 - tags: {shop: bakery}
   icon: [cupcake]
 - tags: {shop: convenience}
@@ -112,8 +139,6 @@ tags:
   icon: [shop_convenience]
 - tags: {building: store}
   icon: [shop_convenience]
-- tags: {building: apartments}
-  icon: [apartments]
 - tags: {amenity: shop, shop: kiosk}
   icon: [kiosk]
 - tags: {shop: gift}
@@ -123,12 +148,20 @@ tags:
 
 - tags: {amenity: place_of_worship, religion: christian}
   icon: [christian]
+- tags: 
+    amenity: place_of_worship
+    religion: christian
+    denomination: russian_orthodox
+  icon: [orthodox]
 - tags: {amenity: place_of_worship, religion: muslim}
   icon: [muslim]
 - tags: {amenity: place_of_worship, religion: buddhist}
   icon: [buddhist]
 - tags: {amenity: place_of_worship, religion: hindu}
   icon: [hindu]
+
+  # Additions for buildings
+
 - tags: {building: '*', 'roof:material': metal}
   add_icon: [metal_roof]
 
@@ -165,21 +198,42 @@ tags:
   icon: [main_entrance]
 - tags: {entrance: staircase}
   icon: [staircase]
-- tags: {railway: subway_entrance}
-  icon: [train]
-- tags: {railway: subway_entrance, entrance: 'yes'}
-  icon: [train]
+
+  # Transport
 
 - tags: {highway: bus_stop}
   icon: [bus_stop]
   add_icon: [bus]
+- tags: {railway: station}
+  icon: [train]
+- tags: {railway: station, station: subway, transport: subway}
+  icon: [train]
+- tags: {railway: subway_entrance}
+  icon: [train]
+- tags: {railway: subway_entrance, entrance: 'yes'}
+  icon: [train]
+- tags: {bus: 'yes'}
+  add_icon: [bus]
+- tags: {trolleybus: 'yes'}
+  add_icon: [trolleybus]
+- tags: {railway: tram_station}
+  icon: [tram]
+- tags: {railway: tram_stop}
+  icon: [tram]
 - tags: {highway: bus_stop, shelter: 'yes'}
   icon: [bus_stop_sign]
   under_icon: [bus_stop_sign]
+  with_icon: [bus_stop_bench]
   over_icon: [bus_stop_shelter]
 - tags: {highway: bus_stop, bench: 'yes'}
   under_icon: [bus_stop_sign]
+  with_icon: [bus_stop_shelter]
   over_icon: [bus_stop_bench]
+- tags: {public_transport: platform}
+  icon: [railway_platform]
+
+  # Road signs
+
 - tags: {highway: crossing}
   icon: [crossing]
 - tags: {highway: crossing, crossing: zebra}
@@ -196,24 +250,44 @@ tags:
   icon: [turning_circle]
 - tags: {highway: traffic_signals}
   icon: [traffic_signals]
+- tags: {public_transport: stop_position}
+  icon: [bus_stop]
+- tags: {crossing_ref: toucan}
+  icon: [toucan_crossing]
 - tags: {traffic_calming: bump}
   icon: [bump]
-- tags: {highway: street_lamp}
-  icon: [street_lamp]
-- tags: {historic: memorial}
+- tags: {sloped_curb: yes}
+  icon: [lowered_kerb]
+- tags: {kerb: lowered}
+  icon: [lowered_kerb]
+- tags: {traffic_calming: cushion}
+  icon: [traffic_cushion]
+
+  # Tourism
+
+- tags: {historic: memorial}  # Before memorial:*
   icon: [memorial]
 - tags: {historic: memorial, memorial: statue}
   icon: [statue]
+- tags: {historic: memorial, memorial: plaque}
+  icon: [plaque]
+- tags: {historic: tomb}  # Before tomb:*
+  icon: [tomb]
+- tags: {historic: tomb, tomb: mausoleum}
+  icon: [mausoleum]
 - tags: {tourism: artwork, artwork_type: statue}
   icon: [statue]
 - tags: {tourism: artwork, artwork_type: sculpture}
   icon: [statue]
-- tags: {historic: memorial, memorial: plaque}
-  icon: [plaque]
-- tags: {historic: tomb}
-  icon: [tomb]
-- tags: {historic: tomb, tomb: mausoleum}
-  icon: [mausoleum]
+- tags: {tourism: attraction}  # Before attraction:*
+  icon: [attraction]
+- tags: {tourism: attraction, attraction: amusement_ride}
+  icon: [amusement_ride]
+- tags: {tourism: gallery}
+  icon: [picture]
+
+  # Barrier
+
 - tags: {barrier: gate}
   icon: [gate]
 - tags: {barrier: bollard}
@@ -224,30 +298,10 @@ tags:
   icon: [turnstile]
 - tags: {barrier: stile}
   icon: [stile]
-- tags: {man_made: pole}
-  icon: [pole]
-- tags: {power: pole}
-  icon: [pole]
-- tags: {power: tower}
-  icon: [power_tower]
-- tags: {man_made: pole, highway: street_lamp}
-  icon: [pole_lamp]
-- tags: {man_made: flagpole}
-  icon: [flagpole]
-- tags: {tourism: attraction}
-  icon: [attraction]
-- tags: {tourism: attraction, attraction: amusement_ride}
-  icon: [amusement_ride]
-- tags: {public_transport: platform}
-  icon: [railway_platform]
 - tags: {barrier: entrance}
   icon: [entrance]
-- tags: {amenity: atm}
-  icon: [atm]
-- tags: {public_transport: stop_position}
-  icon: [bus_stop]
-- tags: {crossing_ref: toucan}
-  icon: [toucan_crossing]
+
+  # Additions for everything
 
 - tags: {foot: 'yes'}
   add_icon: [foot]
@@ -260,14 +314,10 @@ tags:
 - tags: {internet_access: wlan, 'internet_access:fee': 'no'}
   add_icon: [free_wlan]
 - tags: {internet_access: wlan}
-  no_tags: {'internet_access:fee'}
+  no_tags: ['internet_access:fee']
   add_icon: [wlan]
 - tags: {material: wood}
   add_icon: [wood]
-- tags: {bus: 'yes'}
-  add_icon: [bus]
-- tags: {trolleybus: 'yes'}
-  add_icon: [trolleybus]
 - tags: {access: private}
   add_icon: [private]
 - tags: {direction: clockwise}
@@ -276,3 +326,5 @@ tags:
   add_icon: [contrclockwise]
 - tags: {smoking: 'no'}
   add_icon: [no_smoking]
+- tags: {atm: 'yes'}
+  add_icon: [atm]