diff --git a/doc/grid.png b/doc/grid.png
index 22a53e8..ab31f88 100644
Binary files a/doc/grid.png and b/doc/grid.png differ
diff --git a/icons/config.json b/icons/config.json
index b9a3121..0cf4dc1 100644
--- a/icons/config.json
+++ b/icons/config.json
@@ -66,6 +66,7 @@
   "binoculars_on_pole": {
     "name": "binoculars on pole"
   },
+  "bleachers": {},
   "block": {},
   "bollard": {},
   "book": {
@@ -129,6 +130,9 @@
   "car_and_bed": {},
   "car_on_ferry": {},
   "car_repair": {},
+  "car_sharing": {
+    "name": "car sharing"
+  },
   "car_wash": {
     "name": "car_wash"
   },
@@ -467,6 +471,7 @@
     "emoji": "📷"
   },
   "picture": {},
+  "pipeline": {},
   "plane": {
     "emoji": "✈️",
     "name": "plane"
diff --git a/icons/icons.svg b/icons/icons.svg
index 8df9fd9..1c806e7 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -147,9 +147,9 @@
      showgrid="true"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     inkscape:cy="438.23864"
-     inkscape:cx="93.567577"
-     inkscape:zoom="16"
+     inkscape:cy="104.45554"
+     inkscape:cx="248.84932"
+     inkscape:zoom="22.627417"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      borderopacity="1.0"
@@ -20046,7 +20046,7 @@
        d="m 93,131 a 5,5 0 0 1 -2.5,4.33013 5,5 0 0 1 -5,0 A 5,5 0 0 1 83,131" />
     <path
        style="opacity:1;fill:none;fill-opacity:1;stroke:#cccccc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 88,136 0,5"
+       d="m 88,137 0,4"
        id="path7376"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cc" />
@@ -20646,5 +20646,297 @@
        cx="93"
        id="circle7774"
        style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09999997;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#cccccc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 164,131 0,9"
+       id="path7776"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path7778"
+       d="m 171,131 0,9"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#cccccc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path7780"
+       d="m 163,132 9,0"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#cccccc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#cccccc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 163,139 9,0"
+       id="path7782"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 82 147 C 82 149.14199 83.144982 151.12432 85 152.19531 C 85.627593 152.55766 86.306524 152.78713 87 152.9043 L 87 153 L 87 157 L 87 158 L 89 158 L 89 157 L 89 153 L 89 152.9043 C 89.693476 152.78713 90.372407 152.55766 91 152.19531 C 92.855018 151.12432 94 149.14199 94 147 L 92 147 C 92 148.43067 91.238993 149.74951 90 150.46484 C 88.761007 151.18018 87.238993 151.18018 86 150.46484 C 84.761007 149.74951 84 148.43067 84 147 L 82 147 z "
+       id="path7784" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 101.17578 146.59766 L 99.597656 147.82422 L 100.21094 148.61328 L 103.23438 152.5 L 100.21094 156.38672 L 99.597656 157.17578 L 101.17578 158.40234 L 101.78906 157.61328 L 104.5 154.12695 L 107.21094 157.61328 L 107.82422 158.40234 L 109.40234 157.17578 L 108.78906 156.38672 L 105.76562 152.5 L 108.78906 148.61328 L 109.40234 147.82422 L 107.82422 146.59766 L 107.21094 147.38672 L 104.5 150.87305 L 101.78906 147.38672 L 101.17578 146.59766 z "
+       id="path7789" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 120 145.69727 L 113.13086 156 L 119 156 L 119 158 L 119 159 L 121 159 L 121 158 L 121 156 L 126.86914 156 L 120 145.69727 z M 120 149.30273 L 123.13086 154 L 121 154 L 119 154 L 116.86914 154 L 120 149.30273 z "
+       id="path7793" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 130 147 C 130 149.14199 131.14498 151.12432 133 152.19531 C 133.20035 152.31098 133.40779 152.40931 133.61719 152.5 C 133.40806 152.5906 133.2001 152.68721 133 152.80273 C 131.14498 153.87373 130 155.85801 130 158 L 132 158 C 132 156.56933 132.76101 155.25049 134 154.53516 C 134.31805 154.35153 134.65423 154.21631 135 154.12695 L 135 157 L 135 158 L 137 158 L 137 157 L 137 154.12695 C 137.34577 154.21631 137.68195 154.35153 138 154.53516 C 139.23899 155.25049 140 156.56933 140 158 L 142 158 C 142 155.85801 140.85502 153.87373 139 152.80273 C 138.7999 152.68721 138.59194 152.5906 138.38281 152.5 C 138.59221 152.40931 138.79965 152.31098 139 152.19531 C 140.85502 151.12432 142 149.14199 142 147 L 140 147 C 140 148.43067 139.23899 149.74951 138 150.46484 C 137.68195 150.64847 137.34577 150.78369 137 150.87305 L 137 148 L 137 147 L 135 147 L 135 148 L 135 150.87305 C 134.65423 150.78369 134.31805 150.64847 134 150.46484 C 132.76101 149.74951 132 148.43067 132 147 L 130 147 z "
+       id="path7795" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 146 147 L 146 149 L 147 149 L 147 157 L 147 158 L 149 158 L 149 157 L 149 152 L 155 152 L 155 157 L 155 158 L 157 158 L 157 157 L 157 149 L 158 149 L 158 147 L 157 147 L 147 147 L 146 147 z M 149 149 L 155 149 L 155 150 L 149 150 L 149 149 z "
+       id="path7801" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 163 146 L 163 147 L 162 147 L 162 149 L 163 149 L 163 154 L 162 154 L 162 156 L 163 156 L 163 157 L 165 157 L 165 156 L 170 156 L 170 157 L 172 157 L 172 156 L 173 156 L 173 154 L 172 154 L 172 149 L 173 149 L 173 147 L 172 147 L 172 146 L 170 146 L 170 147 L 165 147 L 165 146 L 163 146 z M 165 149 L 170 149 L 170 154 L 165 154 L 165 149 z "
+       id="path7856" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7873"
+       width="3"
+       height="1"
+       x="211"
+       y="490"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7875"
+       width="1"
+       height="2.5"
+       x="212"
+       y="490.5"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       ry="0.5"
+       rx="0.5"
+       y="488"
+       x="214"
+       height="1"
+       width="3"
+       id="rect7877"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="0.5"
+       rx="0.45580584"
+       y="488.5"
+       x="215"
+       height="4.5"
+       width="1"
+       id="rect7879"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7881"
+       width="3"
+       height="1"
+       x="217"
+       y="486"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7883"
+       width="1"
+       height="6.5"
+       x="218"
+       y="486.5"
+       rx="0.36741748"
+       ry="0.5" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7885"
+       width="10"
+       height="1"
+       x="212"
+       y="492"
+       rx="0.36741701"
+       ry="0.5" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7887"
+       width="1"
+       height="11"
+       x="221"
+       y="482"
+       rx="0.36741701"
+       ry="0.5" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7889"
+       width="2"
+       height="3"
+       x="220"
+       y="482"
+       rx="0.36741701"
+       ry="0.5" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7936"
+       width="6"
+       height="1"
+       x="232.5"
+       y="489"
+       rx="0.5"
+       ry="0.47790292" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7938"
+       width="5"
+       height="5"
+       x="233"
+       y="483"
+       rx="2"
+       ry="2" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7940"
+       width="5"
+       height="2.5"
+       x="233"
+       y="485.5"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       ry="0.47790301"
+       rx="0.5"
+       y="491"
+       x="225"
+       height="1"
+       width="14"
+       id="rect7948"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="0.47790292"
+       rx="0.5"
+       y="489"
+       x="225.5"
+       height="1"
+       width="6"
+       id="rect7951"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="2"
+       rx="2"
+       y="483"
+       x="226"
+       height="5"
+       width="5"
+       id="rect7953"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       ry="0.5"
+       rx="0.5"
+       y="485.5"
+       x="226"
+       height="2.5"
+       width="5"
+       id="rect7955"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7957"
+       width="1"
+       height="2"
+       x="228"
+       y="489.5"
+       rx="0.5"
+       ry="0.5" />
+    <rect
+       ry="0.5"
+       rx="0.5"
+       y="489.5"
+       x="235"
+       height="2"
+       width="1"
+       id="rect7960"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 228,499 c -1.108,0 -2,0.892 -2,2 l 0,1 0,1.5 c 0,0.277 0.223,0.5 0.5,0.5 l 4,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.5 0,-1 c 0,-1.108 -0.892,-2 -2,-2 l -1,0 z m 7,0 c -1.108,0 -2,0.892 -2,2 l 0,1 0,1.5 c 0,0.277 0.223,0.5 0.5,0.5 l 4,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-1.5 0,-1 c 0,-1.108 -0.892,-2 -2,-2 l -1,0 z m -9,6 c -0.277,0 -0.5,0.21376 -0.5,0.47852 l 0,0.043 c 0,0.26476 0.223,0.47852 0.5,0.47852 l 2,0 0,1 -2.5,0 c -0.277,0 -0.5,0.21376 -0.5,0.47852 l 0,0.043 c 0,0.26476 0.223,0.47852 0.5,0.47852 l 13,0 c 0.277,0 0.5,-0.21376 0.5,-0.47852 l 0,-0.043 C 239,507.21376 238.777,507 238.5,507 l -2.5,0 0,-1 2,0 c 0.277,0 0.5,-0.21376 0.5,-0.47852 l 0,-0.043 C 238.5,505.21376 238.277,505 238,505 l -5,0 c -0.277,0 -0.5,0.21376 -0.5,0.47852 l 0,0.043 c 0,0.26476 0.223,0.47852 0.5,0.47852 l 2,0 0,1 -6,0 0,-1 2,0 c 0.277,0 0.5,-0.21376 0.5,-0.47852 l 0,-0.043 C 231.5,505.21376 231.277,505 231,505 l -5,0 z"
+       id="bleachers"
+       inkscape:label="#rect7962"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7981"
+       width="5"
+       height="1"
+       x="245"
+       y="483"
+       rx="0.5"
+       ry="0.47790301" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7983"
+       width="1"
+       height="1"
+       x="247"
+       y="482.5"
+       rx="0.5"
+       ry="0.47790298" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7985"
+       width="5.0000153"
+       height="5"
+       x="244.99998"
+       y="486"
+       rx="0.5"
+       ry="0.47790301" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7987"
+       width="4"
+       height="3"
+       x="242.49998"
+       y="487"
+       rx="0"
+       ry="0" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7989"
+       width="1"
+       height="5"
+       x="252"
+       y="486"
+       rx="0.5"
+       ry="0.47790301" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7991"
+       width="1"
+       height="5"
+       x="242"
+       y="486"
+       rx="0.5"
+       ry="0.47790301" />
+    <rect
+       ry="0"
+       rx="0"
+       y="487"
+       x="248.49998"
+       height="3"
+       width="4"
+       id="rect7993"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.10000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 247.5 498.5 C 247.223 498.5 247 498.71376 247 498.97852 L 247 499 L 245.5 499 C 245.223 499 245 499.21376 245 499.47852 L 245 499.52148 C 245 499.78624 245.223 500 245.5 500 L 247 500 L 247 501 L 248 501 L 248 500 L 249.5 500 C 249.777 500 250 499.78624 250 499.52148 L 250 499.47852 C 250 499.21376 249.777 499 249.5 499 L 248 499 L 248 498.97852 C 248 498.71376 247.777 498.5 247.5 498.5 z M 242.5 502 C 242.223 502 242 502.21376 242 502.47852 L 242 506.52148 C 242 506.78624 242.223 507 242.5 507 C 242.777 507 243 506.78624 243 506.52148 L 243 506 L 245 506 L 245 506.52148 C 245 506.78624 245.223 507 245.5 507 L 249.5 507 C 249.777 507 250 506.78624 250 506.52148 L 250 506 L 252 506 L 252 506.52148 C 252 506.78624 252.223 507 252.5 507 C 252.777 507 253 506.78624 253 506.52148 L 253 502.47852 C 253 502.21376 252.777 502 252.5 502 C 252.223 502 252 502.21376 252 502.47852 L 252 503 L 250 503 L 250 502.47852 C 250 502.21376 249.777 502 249.5 502 L 245.5 502 C 245.223 502 245 502.21376 245 502.47852 L 245 503 L 243 503 L 243 502.47852 C 243 502.21376 242.777 502 242.5 502 z "
+       id="pipeline" />
+    <rect
+       ry="3.0517578e-05"
+       rx="0"
+       y="483.49997"
+       x="247"
+       height="1.5000305"
+       width="1"
+       id="rect8011"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.09999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/scheme/default.yml b/scheme/default.yml
index 4b30979..81588df 100644
--- a/scheme/default.yml
+++ b/scheme/default.yml
@@ -311,6 +311,8 @@ node_icons:
       shapes: [dumbbell]
     - tags: {leisure: fitness_station}
       shapes: [dumbbell]
+    - tags: {leisure: bleachers}
+      shapes: [bleachers]
     - tags: {leisure: bowling_alley}
       shapes: [bowling_ball]
     - tags: {leisure: dog_park}
@@ -1108,6 +1110,11 @@ roads:
     default_width: 2
     border_color: road_border_color
     priority: 41
+  - tags: {leisure: track}
+    color: pitch_color
+    border_color: pitch_border_color
+    default_width: 5
+    priority: 21
 
 ways:
   - tags: {indoor: area}
@@ -1451,7 +1458,13 @@ ways:
       stroke: pitch_border_color
       stroke-width: 1
     priority: 21
-  - tags: {leisure: track}
+  - tags: {leisure: bleachers}
+    style:
+      fill: pitch_color
+      stroke: pitch_border_color
+      stroke-width: 1
+    priority: 21
+  - tags: {leisure: track, area: "yes"}
     style:
       fill: pitch_color
       stroke: pitch_border_color