From 8e35a178d2f26987a5d069700be3a70420f50b4f Mon Sep 17 00:00:00 2001
From: Gustl22 <user.rebo@gmx.de>
Date: Sun, 21 Jan 2018 23:01:48 +0100
Subject: [PATCH] Internal render theme improvements (#488)

---
 .../symbols/custom/amenity/fountain2.svg      |   6 +
 .../assets/symbols/custom/amenity/library.svg |   8 +
 .../assets/symbols/custom/amenity/toilets.svg |  11 +
 .../assets/symbols/custom/money/atm2.svg      |  10 +
 .../custom/tourist/archaeological2.svg        |   6 +
 .../symbols/custom/tourist/attraction.svg     |   6 +
 .../assets/symbols/custom/tourist/castle2.svg |   6 +
 .../assets/symbols/custom/tourist/cinema2.svg |   9 +
 .../symbols/custom/tourist/information.svg    |   6 +
 .../symbols/custom/tourist/memorial.svg       |  12 +
 .../symbols/custom/tourist/monument.svg       |  14 +
 .../assets/symbols/custom/tourist/museum.svg  |   6 +
 .../assets/symbols/custom/tourist/ruin.svg    |  10 +
 .../assets/symbols/custom/tourist/theatre.svg |   8 +
 .../symbols/custom/tourist/view_point.svg     |   6 +
 .../symbols/custom/tourist/windmill.svg       |  13 +
 .../assets/symbols/custom/tourist/zoo.svg     |   8 +
 .../assets/symbols/dot_blue_dark.svg          |  15 +
 vtm-themes/resources/assets/vtm/default.xml   | 632 ++++++++++--------
 vtm-themes/resources/assets/vtm/mapzen.xml    |  28 +-
 vtm-themes/resources/assets/vtm/newtron.xml   | 457 ++++++++-----
 .../resources/assets/vtm/openmaptiles.xml     |  88 ++-
 vtm-themes/resources/assets/vtm/osmagray.xml  | 463 +++++++------
 .../resources/assets/vtm/osmarender.xml       | 463 +++++++------
 .../resources/assets/vtm/tronrender.xml       | 458 ++++++++-----
 .../resources/assets/vtm/default_atlas.xml    | 571 +++++++++-------
 26 files changed, 2033 insertions(+), 1287 deletions(-)
 create mode 100644 vtm-themes/resources/assets/symbols/custom/amenity/fountain2.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/amenity/library.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/amenity/toilets.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/money/atm2.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/archaeological2.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/attraction.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/castle2.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/cinema2.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/information.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/memorial.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/monument.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/museum.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/ruin.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/theatre.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/view_point.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/windmill.svg
 create mode 100644 vtm-themes/resources/assets/symbols/custom/tourist/zoo.svg
 create mode 100644 vtm-themes/resources/assets/symbols/dot_blue_dark.svg

diff --git a/vtm-themes/resources/assets/symbols/custom/amenity/fountain2.svg b/vtm-themes/resources/assets/symbols/custom/amenity/fountain2.svg
new file mode 100644
index 00000000..f3a17501
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/amenity/fountain2.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path id="path4137" d="m 256,65.6 c -2.1,-4.9 -3.4,-10 -8.8,-12.7 -40,-5.9 -48,104 -51,141 10.2,-33.6 39.6,-163 50.7,-111 -5.4,14 -14.8,50 -9.5,101 4.9,-26.4 7.1,-53.8 14.7,-80 10.8,58.9 17,123 20.4,175 -5.4,-22.5 -8.4,-53.7 -22.4,-65 -6.3,-3.8 -18,3.9 -21,8 -8.9,-7.6 -17.2,-13.4 -31.4,-7.2 -7.8,-2.4 -16.2,-4.3 -23.6,-1.9 C 78,206 45,393 34,466 69,369 83,286 141,237 102,308 96,343 77,463 c 37,-96 49,-221 101,-229 -39,62 -51.8,164 -54.6,234 21,-78 30,-171 71.8,-226 7.9,6.1 14.6,13.6 20.5,21.8 -12.3,67 -21,135 -20.8,203 15,-62 18.2,-125 30.7,-187 29.7,67 36,137 47,194 -76,-5.4 -140,43 -209,40.8 0.8,6 -3.9,14 6.5,14 l 439,0 c 10.4,0.1 5.7,-8 6.5,-14 -68,2.3 -133,-46 -209,-40.8 11.3,-57 17.7,-128 47,-194 12.5,62 15.6,126 30.7,187 0.2,-68 -8.5,-136 -20.8,-203 5.9,-8.2 12.6,-15.7 20.5,-21.8 41.5,56 50.6,148 71.8,226 -2.8,-69.9 -15.4,-172 -54.6,-234 51,8.1 64,133 101,230 -19,-120 -25,-155 -64,-227 58,48.8 71.8,132 107,229 -10.9,-73 -43,-259 -140,-252 -7.4,-2.3 -15.8,-0.5 -23.6,1.9 -14.2,-6.2 -22.4,-0.4 -31.4,7.2 -3,-4.2 -14.9,-11.8 -21,-8 -14,11.3 -17,42.6 -22.4,65 3.3,-52 9.6,-116 20.4,-175 7.5,25.8 9.8,53 14.7,80 5.3,-51 -4.1,-87 -9.5,-101 11.2,-52 40.5,78 50.7,111 -2.9,-37.6 -10.8,-147 -51,-141 -5.4,2.7 -6.8,7.8 -8.9,12.7 -2.3,-5.5 -4.6,-13 -12,-13.7 C 302,54 295,69 290,92 285,69 278,54 268,51.9 c -7.5,0.7 -9.8,8.2 -12,13.7 z M 279,188 C 281,175 257,81 262.9,81.85 271,80.9 279,170 279,188 Z m 22,0 c 0,-18 8,-107.1 16,-106 4,-1 -12,75 -16,106 z m -57,44 c 16.9,22 22.7,74 25.7,101 -9.9,-34 -15.9,-66.8 -29.9,-97 1.16391,-1.46884 3.28268,-3.46903 4.2,-4 z m 97.2,3.4 c -14,30.6 -20,63 -29.9,97 3,-26 8.8,-79 25.7,-100.7 1.5,0.3 2.9,1.6 4.2,3.7 z m -89.3,63.9 c -6.4,-17.4 -11.2,-33.6 -18.8,-48 0.2,-1.1 0.6,-1.6 0.95,-1.65 C 238,249.1 250,291.6 251.9,299.3 Z m 97.2,-48 c -7.6,14.5 -12.4,30.7 -18.8,48 1.9,-7.4 13.9,-50 17.85,-49.7 0.35,0.2 0.65,0.7 0.95,1.7 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 256,65.6 c -2.1,-4.9 -3.4,-10 -8.8,-12.7 -40,-5.9 -48,104 -51,141 10.2,-33.6 39.6,-163 50.7,-111 -5.4,14 -14.8,50 -9.5,101 4.9,-26.4 7.1,-53.8 14.7,-80 10.8,58.9 17,123 20.4,175 -5.4,-22.5 -8.4,-53.7 -22.4,-65 -6.3,-3.8 -18,3.9 -21,8 -8.9,-7.6 -17.2,-13.4 -31.4,-7.2 -7.8,-2.4 -16.2,-4.3 -23.6,-1.9 C 78,206 45,393 34,466 69,369 83,286 141,237 102,308 96,343 77,463 c 37,-96 49,-221 101,-229 -39,62 -51.8,164 -54.6,234 21,-78 30,-171 71.8,-226 7.9,6.1 14.6,13.6 20.5,21.8 -12.3,67 -21,135 -20.8,203 15,-62 18.2,-125 30.7,-187 29.7,67 36,137 47,194 -76,-5.4 -140,43 -209,40.8 0.8,6 -3.9,14 6.5,14 l 439,0 c 10.4,0.1 5.7,-8 6.5,-14 -68,2.3 -133,-46 -209,-40.8 11.3,-57 17.7,-128 47,-194 12.5,62 15.6,126 30.7,187 0.2,-68 -8.5,-136 -20.8,-203 5.9,-8.2 12.6,-15.7 20.5,-21.8 41.5,56 50.6,148 71.8,226 -2.8,-69.9 -15.4,-172 -54.6,-234 51,8.1 64,133 101,230 -19,-120 -25,-155 -64,-227 58,48.8 71.8,132 107,229 -10.9,-73 -43,-259 -140,-252 -7.4,-2.3 -15.8,-0.5 -23.6,1.9 -14.2,-6.2 -22.4,-0.4 -31.4,7.2 -3,-4.2 -14.9,-11.8 -21,-8 -14,11.3 -17,42.6 -22.4,65 3.3,-52 9.6,-116 20.4,-175 7.5,25.8 9.8,53 14.7,80 5.3,-51 -4.1,-87 -9.5,-101 11.2,-52 40.5,78 50.7,111 -2.9,-37.6 -10.8,-147 -51,-141 -5.4,2.7 -6.8,7.8 -8.9,12.7 -2.3,-5.5 -4.6,-13 -12,-13.7 C 302,54 295,69 290,92 285,69 278,54 268,51.9 c -7.5,0.7 -9.8,8.2 -12,13.7 z M 279,188 C 281,175 257,81 262.9,81.85 271,80.9 279,170 279,188 Z m 22,0 c 0,-18 8,-107.1 16,-106 4,-1 -12,75 -16,106 z m -57,44 c 16.9,22 22.7,74 25.7,101 -9.9,-34 -15.9,-66.8 -29.9,-97 1.16391,-1.46884 3.28268,-3.46903 4.2,-4 z m 97.2,3.4 c -14,30.6 -20,63 -29.9,97 3,-26 8.8,-79 25.7,-100.7 1.5,0.3 2.9,1.6 4.2,3.7 z m -89.3,63.9 c -6.4,-17.4 -11.2,-33.6 -18.8,-48 0.2,-1.1 0.6,-1.6 0.95,-1.65 C 238,249.1 250,291.6 251.9,299.3 Z m 97.2,-48 c -7.6,14.5 -12.4,30.7 -18.8,48 1.9,-7.4 13.9,-50 17.85,-49.7 0.35,0.2 0.65,0.7 0.95,1.7 z" id="path4151" fill="#b7650c"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/amenity/library.svg b/vtm-themes/resources/assets/symbols/custom/amenity/library.svg
new file mode 100644
index 00000000..5c94d603
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/amenity/library.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4139" d="m 56,287 c 75,86 152,171 228,257 13.7,4.7 7.2,-16 8.5,-24.3 L 292,444 c -9,-14.6 -22.7,-26.4 -33.5,-39.9 0,0 -190,-218 -193,-219 -11.3,-4.9 -8.9,20.3 -9.25,24.85 C 55.9,235 55,261 56,287 Z M 70,157 c -4.9,5 9,15.9 15,23 l 214,243 c 9.5,3.4 18,-7.5 26.9,-10.8 L 524,298 c 6.6,-8.9 -6.2,-16.7 -12.4,-23.4 L 302,32.7 C 300.8,31.5 300,30.6 298,31 219,75.8 143,114 70,157 Z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4141" d="m 309,522 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.6,-18.4 C 448.78613,440.70065 370.7288,485.36996 309,522 Z m 0.4,-40.3 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -5.05,-17.85 -72.01734,39.87078 -148.55451,85.78517 -210.75,121.85 z m 0,-40 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.8,-18 -6.4,2 -149,86 -211,122 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 56,287 c 75,86 152,171 228,257 13.7,4.7 7.2,-16 8.5,-24.3 L 292,444 c -9,-14.6 -22.7,-26.4 -33.5,-39.9 0,0 -190,-218 -193,-219 -11.3,-4.9 -8.9,20.3 -9.25,24.85 C 55.9,235 55,261 56,287 Z M 70,157 c -4.9,5 9,15.9 15,23 l 214,243 c 9.5,3.4 18,-7.5 26.9,-10.8 L 524,298 c 6.6,-8.9 -6.2,-16.7 -12.4,-23.4 L 302,32.7 C 300.8,31.5 300,30.6 298,31 219,75.8 143,114 70,157 Z" id="path3474" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#39ac39" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 309,522 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.6,-18.4 C 448.78613,440.70065 370.7288,485.36996 309,522 Z m 0.4,-40.3 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -5.05,-17.85 -72.01734,39.87078 -148.55451,85.78517 -210.75,121.85 z m 0,-40 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.8,-18 -6.4,2 -149,86 -211,122 z" id="path3507" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#39ac39" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/amenity/toilets.svg b/vtm-themes/resources/assets/symbols/custom/amenity/toilets.svg
new file mode 100644
index 00000000..c59a57ce
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/amenity/toilets.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path id="path4145" d="M 543,290 A 253,253 0 0 1 290,543 253,253 0 0 1 37,290 253,253 0 0 1 290,37 253,253 0 0 1 543,290 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 543,290 A 253,253 0 0 1 290,543 253,253 0 0 1 37,290 253,253 0 0 1 290,37 253,253 0 0 1 543,290 Z" id="path3267" fill="#2d51bc"/>
+ <path d="m 305.6,471 0,-361 -28.6,0 0,361 z" id="path4143" fill="#ffffff"/>
+ <path d="m 133.2,176 c -9,0 -17,3.2 -24.3,9.7 -5.4,5 -9,10.6 -10.8,16.8 l -24.9,83 c -3.3816,9.92675 3.72505,17.15425 11.3,17.3 5.8,0 9.6,-3.2 11.4,-9.7 l 22.7,-76 12.4,0 -37,135 36,0 0,105 c 0,9.4 4.5,14 13.5,14 9,0 13.5,-4.7 13.5,-14 l 0,-105 13.5,0 0,106 c 0,9 4.5,13.5 13.5,13.5 9,0 13.5,-4.5 13.5,-13.5 l 0,-105 36,0 -37.8,-135 13,0 22.7,76 c 1.8,6.5 5.6,9.7 11.3,9.7 10.17001,-1.81294 15.15147,-8.88598 11.3,-17.3 l -24.9,-83 c -1.8,-5.8 -5.9,-11.4 -12.4,-16.8 -7.9,-6.5 -16.6,-9.7 -25.8,-10.2 z" id="path4141" fill="#ffffff"/>
+ <path d="m 192.9,142 c -1.30386,-17.62038 -13.69624,-29.38975 -29.7,-29.6 -17.28496,1.33431 -28.98803,13.98417 -29.2,29.6 1.32728,16.94133 13.77172,28.88968 29.2,29.1 17.16182,-1.21895 29.4786,-13.38168 29.7,-29.1 z" id="path4139" fill="#ffffff"/>
+ <path d="m 445.3,141.4 c -1.23748,-17.25187 -13.38979,-28.98634 -29.1,-29.2 -17.3663,1.32487 -28.89595,13.49205 -29.1,29.2 1.28754,16.8883 13.71941,28.98335 29.1,29.2 16.94133,-1.32728 28.88968,-13.77172 29.1,-29.2 z" id="path4137" fill="#ffffff"/>
+ <path d="m 377.2,176.5 c -10.4,0 -19.4,3.7 -26.8,11 -7.4,7.4 -11,16.5 -11,27.3 l 0,90 c 0,8.6 4,13 11.9,13 7.6,0 11.4,-4.3 11.4,-13 l 0,-87 14,0 0,238 c 0,10.8 5.4,16.2 16.2,16.2 10.8,0 16.2,-5.4 16.2,-16.2 l 0,-138 14,0 0,138 c 0,10.8 5.4,16.2 16.2,16.2 11.2,0 16.8,-5.4 16.8,-16.2 l 0,-238 13.5,0 0,88 c 0,9 3.8,13.5 11.4,13.5 7.6,0 11.4,-4.5 11.4,-13.5 l 0,-89 c 0,-10.4 -3.5,-19.5 -10.5,-27.3 -7,-7.8 -16,-11.6 -27.5,-12.3 z" id="flowRoot3192" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/money/atm2.svg b/vtm-themes/resources/assets/symbols/custom/money/atm2.svg
new file mode 100644
index 00000000..c246b2ad
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/money/atm2.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path d="m 112,91 c -12,-0.4 -19.9,11.90039 -18,22.90039 0.2,27 -0.499609,54 0.400391,81 1.9,11.3 13.999999,15.80039 23.999999,14.40039 15.21604,-0.14561 30.4324,0.0708 45.64844,-0.0273 -22.16972,96.03415 -44.88195,191.42959 -66.54883,287.62695 -0.5,9.6 10.00039,13.29922 17.90039,11.69922 120,-1.1 239,-1.89961 359,-3.09961 10,-0.9 12.00039,-12.5 8.40039,-20 -21.55868,-92.039 -42.9306,-184.07819 -64.58984,-276.11719 17.77394,-0.0948 35.61939,0.46308 53.28906,-0.38281 11.3,-1.9 15.80039,-14 14.40039,-24 -0.2,-26.4 0.49961,-53 -0.40039,-79 -1.3125,-10.5 -10.66309,-14.875 -19.67969,-15.134766 C 342.61016,91.130872 217.54591,91.00438 112,91 Z" id="path4140" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m112 91c-12-.4-19.9 11.9-18 22.9.2 27-.5 54 .4 81 1.9 11.3 14 15.8 24 14.4 20.9-.2 41.8.3 62.7-.3 17.5-3.5 16.3-24.5 19.8-38-1.2-10.2 4.6-11.9 13.2-10.7 54.7-.4 109-.7 164-1.1 2.6 12.8 4.6 25.8 7.7 38.6 4.3 12.6 18.4 11.9 29 11.6 18.9-.2 37.9.5 56.7-.4 11.3-1.9 15.8-14 14.4-24-.2-26.4.5-53-.4-79C484 94 472 90 462 91c-117 0-233 0-350 0" id="rect7186" fill="#734a08" opacity="0.5"/>
+ <path d="m393 146c-69 .6-201-.6-208 1.5-7.9 2.1-7.9 8.8-13.5 29.4-24.5 107-49.9 213-74 320-.5 9.6 10 13.3 17.9 11.7 120-1.1 239-1.9 359-3.1 10-.9 12-12.5 8.4-20-26-111-51.7-222-78-333-1.8-4-6.1-6.7-10.5-6.7m-9 22.9l74 314-335 2.8c24.6-105 49-210 73-316l188-1.3" id="path3163" fill="#734a08"/>
+ <path id="path3163-3-2" d="m187 159c-1.4 8.4-79 339-79 339l364-3.1-79-337-206 1.4" fill="#ffffff"/>
+ <path id="path3163-3" d="m187 159c-1.4 8.4-79 339-79 339l364-3.1-79-337-206 1.4" fill="#ac39ac" opacity="0.1"/>
+ <path d="m290 194c-9.9-.1-18 9.4-16.9 19-19.7 3-37.7 16.2-44.6 35-8.8 22.9-3.9 52.6 17.2 67 8.2 6.1 17.7 10 27.4 13l0 83C255 405 248 385 246 368l-26 4.6c5.8 37.9 21.9 51 53 63 .5 9.5-2.4 21 6.3 27.8 10 9 27.9 1.2 28-12.3.1-5.4 0-10.9 0-16.3 24.3-2.8 44.9-21.9 50.9-45.5 6.2-22.9.7-50.9-20-64.9-9.2-6.6-19.9-10.7-30.9-13.4l0-75c12.6 5.4 19 18.8 20.9 31.7l27-3.9c-2.4-20.5-15-40.6-35-47.6-13.5-5.4-13.9-3.6-14-5.1-.6-15.4-9.4-17.7-16.3-17.5m-16.9 42l0 65.9c-12.6-5.2-22.9-17-22.5-31-1.1-14.9 8.4-29.6 22.5-34.8m34 101c12.8 4.4 24.8 14.5 25.9 28.7 3.1 17.6-9.4 39-26 46l.3-10.4z" id="path4370" fill="#ac39ac"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/archaeological2.svg b/vtm-themes/resources/assets/symbols/custom/tourist/archaeological2.svg
new file mode 100644
index 00000000..1c7a128f
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/archaeological2.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path id="path4140" d="M 272.58789 49.798828 C 269.5625 49.85 266.375 50.175781 263 50.800781 C 240 55.700781 226 76.800781 215 95.800781 C 203 117.10078 187.10078 135.39961 168.30078 150.59961 C 126.30078 216.39961 120.29922 287.59961 128.69922 357.59961 C 113.09922 363.99961 89.799609 340.89961 75.099609 359.59961 C 61.199609 382.39961 80.399609 406.59961 93.099609 425.59961 C 104.09961 447.49961 123.49961 453.19961 146.09961 449.59961 C 200.89961 451.69961 256.09961 462.10039 310.09961 453.40039 C 371.09961 449.50039 430.09961 431.80039 463.09961 376.40039 C 483.69961 351.70039 520.09961 341.60039 532.09961 309.40039 C 540.39961 277.60039 516.49922 240.59961 483.19922 237.59961 C 481.99922 224.79961 504.59922 241.5 513.19922 233 C 545.09922 225.1 504.90039 202 496.40039 190 C 450.00039 146 403 102 354 61 C 336 40 328 79 334 92 C 336 113 325 88 321 80 C 307 62.5 293.76562 49.440625 272.58789 49.798828 z M 275 72.099609 C 306.8 72.499609 311.00039 119.80078 295.90039 132.80078 L 296 132.80078 C 274.7 137.30078 253 130.39922 233 125.69922 C 247.2 107.09922 255 80.899609 275 72.099609 z M 481 264.84961 C 506.6 265.19961 519 294 501 309 C 491.2 317 469 339.79922 461 331.69922 C 450.1 301.69922 440.2 264.69961 481 264.84961 z M 472.33398 468.53516 C 424.95334 468.72221 377.71875 473.81875 331 480 C 285 487.8 238 486.39961 192 481.09961 C 141 474.69961 89 479.70078 38 488.30078 L 44.199219 527.80078 C 95.199219 518.90078 147.19922 514.80039 199.19922 521.90039 C 248.19922 527.40039 298.19922 526.39922 347.19922 518.19922 C 406.09922 511.09922 466.19922 505.29922 525.19922 510.69922 L 528 470.80078 C 509.4375 469.14141 490.87424 468.46196 472.33398 468.53516 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 272.58789,49.798828 C 269.5625,49.85 266.375,50.175781 263,50.800781 c -23,4.9 -37,26 -48,45 -12,21.299999 -27.89922,39.598829 -46.69922,54.798829 -42,65.8 -48.00156,137 -39.60156,207 -15.6,6.4 -38.899611,-16.7 -53.599611,2 -13.9,22.8 5.3,47 18,66 11.000001,21.9 30.400001,27.6 53.000001,24 54.8,2.1 110,12.50078 164,3.80078 61,-3.9 120,-21.6 153,-77 20.6,-24.7 57,-34.8 69,-67 8.3,-31.8 -15.60039,-68.80078 -48.90039,-71.80078 -1.2,-12.8 21.4,3.90039 30,-4.59961 31.9,-7.9 -8.29883,-31 -16.79883,-43 C 450.00039,146 403,102 354,61 336,40 328,79 334,92 336,113 325,88 321,80 307,62.5 293.76562,49.440625 272.58789,49.798828 Z M 275,72.099609 c 31.8,0.4 36.00039,47.701171 20.90039,60.701171 l 0.0996,0 c -21.3,4.5 -43,-2.40156 -63,-7.10156 14.2,-18.6 22,-44.799611 42,-53.599611 z M 481,264.84961 c 25.6,0.35 38,29.15039 20,44.15039 -9.8,8 -32,30.79922 -40,22.69922 -10.9,-30 -20.8,-66.99961 20,-66.84961 z m -8.66602,203.68555 C 424.95334,468.72221 377.71875,473.81875 331,480 c -46,7.8 -93,6.39961 -139,1.09961 -51,-6.4 -103,-1.39883 -154,7.20117 l 6.199219,39.5 c 51,-8.9 103.000001,-13.00039 155.000001,-5.90039 49,5.5 99,4.49883 148,-3.70117 58.9,-7.1 119,-12.9 178,-7.5 L 528,470.80078 c -18.5625,-1.65937 -37.12576,-2.33882 -55.66602,-2.26562 z" id="path4170" fill="#b7650c"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/attraction.svg b/vtm-themes/resources/assets/symbols/custom/tourist/attraction.svg
new file mode 100644
index 00000000..d53ed626
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/attraction.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4136" d="m 217,211 c -48.6,7.6 -97,13.9 -146,22 -14.3,8.6 -0.2,21.6 7.9,28.4 l 93,89 c -7.6,48.6 -16.4,97 -23,146 3.8,16.2 20.5,7 29.5,1.3 l 114,-61 c 43.7,22.4 87,46 131,68 16.6,1.5 13,-17.3 10.4,-27.6 L 410,349 c 34.8,-34.6 71,-68 105,-104 6.5,-15.3 -12.5,-17.6 -23,-18.3 L 364,209 c -22,-43 -43,-87 -66,-131 -2,-2.3 -5,-3.6 -8.4,-3.8 -13,1.7 -14,17.2 -19.8,26.55 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 217,211 c -48.6,7.6 -97,13.9 -146,22 -14.3,8.6 -0.2,21.6 7.9,28.4 l 93,89 c -7.6,48.6 -16.4,97 -23,146 3.8,16.2 20.5,7 29.5,1.3 l 114,-61 c 43.7,22.4 87,46 131,68 16.6,1.5 13,-17.3 10.4,-27.6 L 410,349 c 34.8,-34.6 71,-68 105,-104 6.5,-15.3 -12.5,-17.6 -23,-18.3 L 364,209 c -22,-43 -43,-87 -66,-131 -2,-2.3 -5,-3.6 -8.4,-3.8 -13,1.7 -14,17.2 -19.8,26.55 z" id="path4631-1" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#b7650c" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/castle2.svg b/vtm-themes/resources/assets/symbols/custom/tourist/castle2.svg
new file mode 100644
index 00000000..08b8db63
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/castle2.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4134" d="m 45.8,235 c 11.6,7 35,-4.3 32,7.2 0.2,72 -0.3,145 0.2,217 54.4169,2.45038 118.39279,2.19512 164.7,1.4 1,-24.9 1.6,-57 1.6,-84 l 91,0 c 0.3,27.5 -0.5,55 0.4,82 56.19333,0.77119 117.51588,2.01203 164.8,1.2 0.88757,-69.5981 1.6,-151.44225 1.6,-224.8 10.4,-0.5 21.3,1.4 31.4,-0.4 -0.77968,-32.73315 1.33146,-71.32739 0.3,-101 -13.14773,-1.34997 -34.10567,-1.80022 -36.8,-0.5 -1.7,10 -0.1,20.7 -0.6,30.9 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -11.94657,0.94266 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -7.36136,-2.11414 -30.68532,-2.43142 -37,1.1 0,33 -0.5,66 0.3,99 12,6.9 35,-4 31.6,8.6 l 0,50.9 -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.41817,-0.0763 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.04179,-1.10111 -35.18591,-1.24022 -37.2,0.5 -0.8,10 -0.1,20.3 -0.3,30.4 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.92764,-0.0763 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 0,-58 c 10.2,-0.6 21,1.1 30.9,-0.7 -0.22337,-33.99478 1.65632,-70.31235 0.7,-100 -5.00387,-2.91205 -34.10863,-1.79879 -36.8,-0.5 -1.7,10 -0.1,20.7 -0.6,30.9 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -7.87792,-2.24135 -34.7007,-2.30736 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 C 86.8,154.2 87.2,143.4 86.7,133.5 75.001626,131.08985 57.402405,132.45162 45.186381,132.40947 43.78629,162.39926 45.777688,202.35077 45.8,235 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 45.8,235 c 11.6,7 35,-4.3 32,7.2 0.2,72 -0.3,145 0.2,217 54.4169,2.45038 118.39279,2.19512 164.7,1.4 1,-24.9 1.6,-57 1.6,-84 l 91,0 c 0.3,27.5 -0.5,55 0.4,82 56.19333,0.77119 117.51588,2.01203 164.8,1.2 0.88757,-69.5981 1.6,-151.44225 1.6,-224.8 10.4,-0.5 21.3,1.4 31.4,-0.4 -0.77968,-32.73315 1.33146,-71.32739 0.3,-101 -13.14773,-1.34997 -34.10567,-1.80022 -36.8,-0.5 -1.7,10 -0.1,20.7 -0.6,30.9 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -11.94657,0.94266 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -7.36136,-2.11414 -30.68532,-2.43142 -37,1.1 0,33 -0.5,66 0.3,99 12,6.9 35,-4 31.6,8.6 l 0,50.9 -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.41817,-0.0763 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.04179,-1.10111 -35.18591,-1.24022 -37.2,0.5 -0.8,10 -0.1,20.3 -0.3,30.4 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -10.92764,-0.0763 -35.27053,-1.41248 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 0,-58 c 10.2,-0.6 21,1.1 30.9,-0.7 -0.22337,-33.99478 1.65632,-70.31235 0.7,-100 -5.00387,-2.91205 -34.10863,-1.79879 -36.8,-0.5 -1.7,10 -0.1,20.7 -0.6,30.9 l -26,0 c -0.6,-10.2 1.1,-21 -0.7,-30.9 -7.87792,-2.24135 -34.7007,-2.30736 -37,1.1 -0.3,9.9 0,19.9 -0.1,29.8 l -26,0 C 86.8,154.2 87.2,143.4 86.7,133.5 75.001626,131.08985 57.402405,132.45162 45.186381,132.40947 43.78629,162.39926 45.777688,202.35077 45.8,235 Z" id="path2958-0-6" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#b7650c" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/cinema2.svg b/vtm-themes/resources/assets/symbols/custom/tourist/cinema2.svg
new file mode 100644
index 00000000..feb1a557
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/cinema2.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path id="path4158" d="M 323 52 C 319 55 316 57 313 60 L 324 83 L 307 92 L 299 73.900391 C 296 77.000391 293 79 290 81 C 287 83 285 85 283 86 C 264 94 239 90 220 98 C 201 106 188 125 171 133 C 149 142 135 134 115 143 C 108 147 101 153 95 159 L 109 152 L 123 180 L 105 189 L 92 162 C 90 164 87 166 85 169 L 254 521 L 264 511 L 260 513 L 246 485 L 264 476 L 276 502 C 277 501 278 500 280 500 C 282 499 285 498 287 497 C 303 493 320 496 335 490 C 353 482 366 462 384 454 C 403 446 428 451 447 442 C 451 440 456 438 459 435 C 471 426 480 413 493 406 L 323 52 z M 342 119 L 355 148 L 338 156 L 324 128 L 342 119 z M 373 184 L 386 212 L 369 221 L 355 193 L 373 184 z M 139 217 L 153 245 L 135 254 L 122 225 L 139 217 z M 403 249 L 417 277 L 399 285 L 386 257 L 403 249 z M 170 281 L 184 310 L 166 318 L 152 290 L 170 281 z M 434 313 L 448 341 L 430 350 L 417 322 L 434 313 z M 201 346 L 214 374 L 197 383 L 183 354 L 201 346 z M 465 378 L 479 406 L 461 414 L 447 386 L 465 378 z M 232 410 L 245 439 L 228 447 L 214 419 L 232 410 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 323 52 C 319 55 316 57 313 60 L 324 83 L 307 92 L 299 73.900391 C 296 77.000391 293 79 290 81 C 287 83 285 85 283 86 C 264 94 239 90 220 98 C 201 106 188 125 171 133 C 149 142 135 134 115 143 C 108 147 101 153 95 159 L 109 152 L 123 180 L 105 189 L 92 162 C 90 164 87 166 85 169 L 254 521 L 264 511 L 260 513 L 246 485 L 264 476 L 276 502 C 277 501 278 500 280 500 C 282 499 285 498 287 497 C 303 493 320 496 335 490 C 353 482 366 462 384 454 C 403 446 428 451 447 442 C 451 440 456 438 459 435 C 471 426 480 413 493 406 L 323 52 z M 342 119 L 355 148 L 338 156 L 324 128 L 342 119 z M 373 184 L 386 212 L 369 221 L 355 193 L 373 184 z M 139 217 L 153 245 L 135 254 L 122 225 L 139 217 z M 403 249 L 417 277 L 399 285 L 386 257 L 403 249 z M 170 281 L 184 310 L 166 318 L 152 290 L 170 281 z M 434 313 L 448 341 L 430 350 L 417 322 L 434 313 z M 201 346 L 214 374 L 197 383 L 183 354 L 201 346 z M 465 378 L 479 406 L 461 414 L 447 386 L 465 378 z M 232 410 L 245 439 L 228 447 L 214 419 L 232 410 z " id="path4155" fill="#b7650c"/>
+ <path d="m 221,98.2 c -19,8 -31.7,27.4 -49,35 -16.7,7 -36.5,1.9 -53,8.5 l 43,91 164,-78 -35,-73 c -2.1,1.4 -4.7,3.4 -7.5,4.4 -19.5,8.4 -44.2,4.1 -62.5,12.1 z" id="path4152" opacity="0.7" fill="#ffffff"/>
+ <path d="M 169,248 244,405 408,326 332,169 Z" id="path4150" opacity="0.7" fill="#ffffff"/>
+ <path d="m 251,421 36,76 c 15.3,-4 32.7,-1 47.7,-7.3 17.6,-7.7 30.6,-27.4 49,-35 18.8,-8 43,-3.7 62,-12.2 4.1,-1.9 8.8,-4.2 12.3,-7.1 l -44,-93 z" id="rect3445" opacity="0.7" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/information.svg b/vtm-themes/resources/assets/symbols/custom/tourist/information.svg
new file mode 100644
index 00000000..b4b51b79
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/information.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path id="path4142" d="m 254.10725,119.9768 c 0,-10.96722 3.54497,-19.94041 10.63489,-27.030335 7.08993,-6.979144 16.28467,-10.524106 27.47346,-10.524106 11.96425,0 22.04523,3.655743 29.91061,11.078007 7.97617,7.422264 11.96425,15.841554 11.96425,25.147074 0,6.97914 -1.55092,13.84751 -4.76354,20.71588 -3.21263,6.97914 -8.19773,12.51814 -14.95531,16.617 -6.86837,4.20965 -13.73673,6.31447 -20.93744,6.31447 -9.74864,0 -18.72183,-4.20965 -27.03033,-12.51815 -8.19772,-8.3085 -12.40737,-18.27871 -12.40737,-29.91062 m -42.7611,364.46642 -0.66468,-19.82963 34.34182,-4.54198 c 5.09588,-1.44014 8.64084,-3.54496 10.52411,-6.20368 3.414,-57.82818 3.27073,-115.44176 1.77249,-173.14925 -2.21561,-3.10184 -6.31447,-5.64978 -12.18581,-7.97617 -5.87134,-2.2156 -16.1739,-3.87729 -30.79686,-4.87432 l 0,-17.06012 c 20.93744,-1.21859 39.4377,-5.64979 55.27925,-13.07206 10.74567,-4.87432 22.48835,-13.51516 35.11729,-25.92253 l 20.49431,0 c -0.11922,91.42073 -0.30199,173.04456 0.33234,246.92877 6.31446,2.2156 16.617,4.4312 30.79686,6.75758 5.539,0.77546 9.85942,1.77248 13.18282,3.10184 l -0.33233,16.83858 c -8.8696,0.6013 -18.88424,0.18016 -26.25488,-0.33234 -42.09237,-0.41331 -73.73309,-3.58566 -111.88788,-0.44312 -9.30552,0.66467 -15.73077,1.10779 -19.27573,1.10779 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 254.10725,119.9768 c 0,-10.96722 3.54497,-19.94041 10.63489,-27.030335 7.08993,-6.979144 16.28467,-10.524106 27.47346,-10.524106 11.96425,0 22.04523,3.655743 29.91061,11.078007 7.97617,7.422264 11.96425,15.841554 11.96425,25.147074 0,6.97914 -1.55092,13.84751 -4.76354,20.71588 -3.21263,6.97914 -8.19773,12.51814 -14.95531,16.617 -6.86837,4.20965 -13.73673,6.31447 -20.93744,6.31447 -9.74864,0 -18.72183,-4.20965 -27.03033,-12.51815 -8.19772,-8.3085 -12.40737,-18.27871 -12.40737,-29.91062 m -42.7611,364.46642 -0.66468,-19.82963 34.34182,-4.54198 c 5.09588,-1.44014 8.64084,-3.54496 10.52411,-6.20368 3.414,-57.82818 3.27073,-115.44176 1.77249,-173.14925 -2.21561,-3.10184 -6.31447,-5.64978 -12.18581,-7.97617 -5.87134,-2.2156 -16.1739,-3.87729 -30.79686,-4.87432 l 0,-17.06012 c 20.93744,-1.21859 39.4377,-5.64979 55.27925,-13.07206 10.74567,-4.87432 22.48835,-13.51516 35.11729,-25.92253 l 20.49431,0 c -0.11922,91.42073 -0.30199,173.04456 0.33234,246.92877 6.31446,2.2156 16.617,4.4312 30.79686,6.75758 5.539,0.77546 9.85942,1.77248 13.18282,3.10184 l -0.33233,16.83858 c -8.8696,0.6013 -18.88424,0.18016 -26.25488,-0.33234 -42.09237,-0.41331 -73.73309,-3.58566 -111.88788,-0.44312 -9.30552,0.66467 -15.73077,1.10779 -19.27573,1.10779 z" id="flowRoot6828-2" fill="#b7650c"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/memorial.svg b/vtm-themes/resources/assets/symbols/custom/tourist/memorial.svg
new file mode 100644
index 00000000..4eb3140c
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/memorial.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="580" height="580" version="1.0">
+ <metadata id="metadata18"/>
+ <path id="path4141" d="m 164.3,115.9 0,284 c 0,1.8 252,0.9 252,0 l 0,-284 C 416.3,104.5 406.7,94 394.6,94 l -208.8,0 c -11.1,0 -21.5,10.5 -21.5,21.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4143" d="m 148.65,432.9 280.9,0 c 0.9,0 -13.9,-20.9 -13.9,-20.9 l -252.95,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4145" d="m 144.9,451.4 0,33 c 0,0.9 0.9,1.8 1.7,1.8 l 285,0 c 0.9,0 1.7,-0.9 1.7,-1.8 l 0,-33 c 0,-0.9 -0.9,-0.9 -1.7,-0.9 l -285,0 c -0.9,0 -1.7,0 -1.7,0.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4138" d="m 164.3,115.9 0,284 c 0,1.8 252,0.9 252,0 l 0,-284 C 416.3,104.5 406.7,94 394.6,94 l -208.8,0 c -11.1,0 -21.5,10.5 -21.5,21.9 z m -15.65,317 280.9,0 c 0.9,0 -13.9,-20.9 -13.9,-20.9 l -252.95,0 z m -3.75,18.5 0,33 c 0,0.9 0.9,1.8 1.7,1.8 l 285,0 c 0.9,0 1.7,-0.9 1.7,-1.8 l 0,-33 c 0,-0.9 -0.9,-0.9 -1.7,-0.9 l -285,0 c -0.9,0 -1.7,0 -1.7,0.9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 164.3,115.9 0,284 c 0,1.8 252,0.9 252,0 l 0,-284 C 416.3,104.5 406.7,94 394.6,94 l -208.8,0 c -11.1,0 -21.5,10.5 -21.5,21.9 z" id="path4139" fill="#b7650c"/>
+ <path d="m 148.65,432.9 280.9,0 c 0.9,0 -13.9,-20.9 -13.9,-20.9 l -252.95,0 z" id="path4137" fill="#b7650c"/>
+ <path d="m 144.9,451.4 0,33 c 0,0.9 0.9,1.8 1.7,1.8 l 285,0 c 0.9,0 1.7,-0.9 1.7,-1.8 l 0,-33 c 0,-0.9 -0.9,-0.9 -1.7,-0.9 l -285,0 c -0.9,0 -1.7,0 -1.7,0.9 z" id="path4329" fill="#b7650c"/>
+ <path d="m 262.7,129.5 c -2.5,11.6 9.6,12.2 10.6,1.6 -6.83586,-10.24365 18.99558,-15.65807 3.7,-17 -7.8,0 -14.4,7.5 -14.3,15.4 z m -32.5,-14.9 c -13.9,7.8 15.7,8.8 0,0 z m 7.5,24.3 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m 12.4,-2.4 c 9,5 8.9,-17.5 1.6,-21.3 -4.8,6 -3.6,14.4 -1.6,21.3 z m 67.1,-8 c 0,1 -0.1,1.9 -0.2,2.9 0.45043,16.41851 16.47947,3.65889 9.2,-6.7 9.8,-5.1 -1.1,17 8.9,14.7 2,-1.6 3.07263,-3.1358 3.57263,-5.9358 0.0417,-7.55687 -2.78566,-17.22435 -9.92263,-17.7642 -6.17508,-0.13412 -10.8155,7.87548 -11.55,12.8 z m 29,10.3 c 9,12 11.7,-8 5.7,-13.5 -5.3,8.8 -4.8,-7.7 -9.5,-8.8 l -0.1,0.1 c -2.3,1.1 -1.9,4.2 -2.4,6.2 -3.48773,6.6667 1.53284,22.05094 6.3,16 z m -34.4,-22.5 c -3.3,5.4 -17.4,15 -9,24.9 15.26591,3.39866 18.11045,-18.63447 9,-24.9 z m -98.9,21.8 c 9,12 11.7,-8 5.8,-13.5 -5.3,8.8 -5,-7.7 -9.65,-8.7 -4.78532,8.57773 -3.8301,32.18156 3.85,22.2 z m -15,-0.6 c 9,5 8.9,-17.5 1.6,-21.3 -4.8,6 -3.6,14.4 -1.6,21.3 z m 161.9,2.8 c 6.8,-0.8 13,-19 5.7,-24 -9.5,2.4 -10.3,17.3 -5.7,24 z m 13.7,1.3 c 13.9,8.6 19.6,-18 9,-24.9 -3.3,5.4 -17.4,15 -9,24.9 z m -84,-6.3 c -8.7,12.6 15.7,4.1 7.4,-3.7 -3.9,1.5 3.7,-11 -4.8,-7.5 -10.61122,-3.35778 -6.02262,5.77505 -2.6,11.2 z m -62.4,6.1 c 5.1,12.9 14.2,-16.2 2.4,-17.4 -4.4,4.8 -2.4,11.6 -2.4,17.4 z m 52.4,-17.2 c -4.5,4.6 -2.6,11.4 -2.4,17.3 5.1,12.9 13.9,-16 2.4,-17.4 z m 27.8,5.9 c 8.1,12 -5.9,4.3 0,0 z m 72,0.4 c 8,8.4 -7.8,8.6 0,0 z m -135.7,44.3 c 9,5 9,-17.5 1.7,-21.3 -5,6 -3.7,14.4 -1.7,21.3 z m 10.7,-21.2 c -4.3,2 -5.7,27.7 3.8,22 8.9,12 11.7,-8 5.7,-13.5 -7.60942,8.49881 -4.14637,-6.82613 -9.5,-8.5 z m -27.5,24.9 c 13.9,8.6 19.5,-17.9 9.1,-24.9 -3.3,5.4 -17.4,15.2 -9.1,24.9 z m -14.4,-0.8 c 6.9,-0.8 13,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m 80.6,-1.6 c 9,12 11.7,-8 5.7,-13.5 -5.3,8.8 -4.8,-7.8 -9.55,-8.65 -4.15,2.25 -5.65,27.75 3.85,22.15 z m 80.1,-22.3 c -13.9,7.7 15.5,9.1 0,0 z M 306.4,178 c 7,-0.8 13,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m 28.2,1.4 c 13.9,8.5 19,-18.3 8.6,-24.9 -2.8,5.9 -17.6,14.8 -8.6,24.9 z m 21.4,-2.9 c 9,12 11.7,-8 5.7,-13.5 -5.2,8.8 -4.9,-7.5 -9.5,-8.7 l -0.05,0.1 c -4.15,2.2 -5.55,27.7 3.85,22.1 z m -85.6,-13.7 c 0.3,1.5 5.1,6.6 -0.4,10.7 -0.7,21 27,-11 6.1,-12.2 z m 49.1,11.9 c -8.1,12.4 16.3,1.9 7.3,-4.9 -4,1.8 2.4,-7.9 -2,-8 -10.99917,0.79971 -8.71615,4.44271 -5.3,12.9 z m 48.5,8 c 7.7,7.3 12.5,-17.5 2.6,-19.9 -4,5.9 -2.8,13 -2.6,19.9 z M 229.6,166.9 c 8,8.4 -7.8,8.6 0,0 z m 109.1,1.1 c 7.5,8.9 -8.3,8.2 -0.1,0 z m -62.1,3.9 c 4.4,7.9 -9.2,0.3 0,0 z m 43.5,58.6 c -13.9,7.8 15.5,8.9 0,0 z m -74.8,24.4 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m 82,0 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m -54.9,-2.3 c 9,4.9 8.9,-17.5 1.7,-21.3 -5,6 -3.7,14.4 -1.7,21.3 z m 10.7,-21.2 c -4.3,2 -5.7,27.6 3.7,22 8.9,12 11.7,-8 5.7,-13.5 -7.65946,8.54395 -4.00545,-6.92559 -9.4,-8.5 z m -22.8,19.1 c -8.8,12.7 15.7,4.5 7.4,-3.5 -3.9,1.4 3.7,-11.2 -4.8,-7.6 -2,-0.6 -3.5,-0.9 -4.6,-0.9 -6,-0.1 -0.5,7.6 2,12 z m 40.5,1.7 c -0.8,18.7 26.9,-11.2 6.2,-12.9 -10.56774,0.63007 -0.79545,10.06181 -6.2,12.9 z m 15.7,4.8 c 5.1,12.9 14.2,-16.2 2.4,-17.4 -4.4,4.8 -2.4,11.6 -2.4,17.4 z m -8.7,-7.4 c 4.6,8.6 -9.5,0.4 0,0 z m 2.8,37.3 c -0.1,11 9.3,6.3 9.8,-1.5 -4.7,-8.4 10.6,-9.5 7.5,-16.9 -10.36835,-2.61581 -18.48004,10.75529 -17.3,18.4 z M 257,268.5 c -13.9,7.8 15.7,8.9 0,0 z m 93.2,24.4 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.6,2.4 -10.4,17.4 -5.8,24 z m -125.8,1.3 c 13.9,8.5 19,-18.2 8.6,-24.9 -2.8,5.9 -17.6,14.8 -8.6,24.9 z m 71.9,-7.9 c -0.8,16.5 15.2,-1 10.8,-8.9 -5.53597,-3.29329 -10.35891,4.47355 -10.8,8.9 z m -46.3,6.6 c -0.84532,-9.11568 1.10162,-15.31652 -6.9,-16.05 -6.9,0.15 -4.6,23.05 6.9,16.05 z m 83.3,0.4 c 11.6,10.8 16,-13.6 5.7,-16 -16.09756,-0.31103 2.41286,12.10484 -5.7,16 z M 278.8,289 c 3.6,19 27.4,-11.2 8.3,-11.6 -5.88693,0.5538 -9.06811,7.02073 -8.3,11.6 z m -8.7,-11.6 c -13.4269,2.29804 -8.64968,17.7486 -0.2,18.3 2.99929,-9.26864 10.97565,-18.86714 0.2,-18.3 z m -14.3,0.3 c -4.5,4.7 -2.6,11.6 -2.4,17.4 7.26511,10.16186 11.07916,-15.7283 2.4,-17.4 z M 324,295 c 5.1,12.9 14.2,-16 2.4,-17.4 -4.5,4.7 -2.6,11.6 -2.4,17.4 z m -53.6,-12.9 c 6.7,3.6 -7.7,3.8 0,0 z m -40.9,0.9 c 7.7,8.8 -8.2,8.1 0,0 z m 58,0.1 c 8.8,7.7 -8.6,8.4 0,0 z m -53.9,23.6 c -13.9,7.8 15.7,8.8 0,0 z M 200,331.1 c 6.9,-0.7 13.2,-18.9 5.8,-24 -9.5,2.3 -10.3,17.3 -5.8,24 z m 66.4,-8.5 c 0.2,3.2 1.1,6.4 2.6,8.6 7,-0.8 13.2,-18.9 5.8,-24.05 -7.95828,3.26042 -7.54105,9.20289 -8.4,15.45 z m -5.3,-15 c -3.3,5.4 -17.4,15.2 -9,24.9 16.64087,5.66269 16.92187,-19.07448 9,-24.9 z m -46.7,0.1 c -4.3,2 -5.7,27.7 3.8,22 8.9,12 11.7,-8 5.7,-13.5 -5.3,8.8 -5,-7.6 -9.55,-8.7 z m 26.6,21.1 c 9,5.1 9,-17.5 1.7,-21.3 -5,6 -3.7,14.4 -1.7,21.3 z m 119.1,-18.6 c -11.2,6.5 1.9,12.2 1.1,20 9.2,10.9 18.6,-21.4 10.65,-21.35 z M 344,333.6 c 12.5,0 14.4,-23.6 1.2,-24.9 -11.6,1.6 -13,22.6 -1.2,24.9 z m 3.1,-15.3 c 4.5,13 -11,-0.1 -2,-3.6 1.3,0.7 1.7,2.2 2,3.6 z m 16.9,-3.5 c 9.2,6.6 -7.7,8.2 0,0 z m -73,13.1 c -8.2,5.3 6.1,8 8.5,2.7 -4.37298,-9.49845 1.1334,-14.66406 -8.45,-15.4 -6.65,-0.1 -3.05,9 -0.05,12.7 z m 31.7,11.7 c 9.24314,-8.13213 18.38939,-22.42215 4.05,-24.4 -10.85,-0.3 -12.65,20.6 -4.05,24.4 z M 303.6,317 c 0.3,1.5 5.1,6.6 -0.4,10.8 -0.7,21 27,-11 6.1,-12.2 z m -71.9,18.9 c 7.7,7.3 12.5,-17.5 2.6,-19.9 -4,5.9 -2.7,13 -2.6,19.9 z m 94.6,-14.7 c 7.7,8.6 -6.7,7.4 0,0 z m -69,0.2 c 8.1,8.2 -7.7,8.7 0,0 z m 52,4.7 c 4.4,7.8 -9.1,0.4 0,0 z m 69,2 c -13.9,7.8 15.2,8.6 0,0 z m -110,17 c -13.9,7.8 15.5,9.1 0,0 z m -30.8,24.4 c 6.9,-0.8 13.2,-18.9 5.8,-24 -9.5,2.4 -10.4,17.3 -5.8,24 z m 40,0.5 c 5.9,-5.2 10.3,-20 3.8,-24.5 -8.2,2.2 -10.3,17.2 -3.8,24.5 z m 42.8,-24 c -4.3,2 -8.4,35.8 3.8,22 9,12 11.7,-8 5.7,-13.5 -7.4866,8.49767 -4.11165,-6.82247 -9.5,-8.5 z m 17.3,21.1 c 9,4.9 8.9,-17.5 1.7,-21.3 -5,6 -3.7,14.4 -1.7,21.3 z m -32.1,-1.7 c -7.5,5.9 5.9,9.5 8.7,3.9 -3.72811,-9.74841 1.38268,-14.28369 -7.75,-15.65 -5.75,-0.25 -4.25,8.35 -0.95,11.75 z m -52.4,-11.2 c -8.4,0.8 -7.9,23.6 3.9,18.3 0.39262,-2.35569 12.02208,-20.74955 -3.9,-18.3 z m 33.5,1.4 c 0.3,1.4 5.1,6.6 -0.4,10.8 -0.7,21 27,-11 6.1,-12.25 z M 263.1,372 c 5.1,13 14.2,-16 2.4,-17.3 -4.5,4.6 -2.6,11.6 -2.4,17.3 z m -9.4,-12.8 c 6.8,2.8 -7.4,3.9 0,0 z m 39,5.6 c 4.3,8.1 -8.8,0.1 0,0 z" id="path4304" fill="#ffffff"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/monument.svg b/vtm-themes/resources/assets/symbols/custom/tourist/monument.svg
new file mode 100644
index 00000000..0db07e4f
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/monument.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path id="path4156" d="m 72,144 0,33 212,-86 218,84 0,-33 -216,-89 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4158" d="m 131,175 65,-1 91,-30 92,32 62,1 -153,-65 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4160" d="M 72 194 L 72 230 L 90 230 L 90 428 L 72 428 L 72 446 L 505 446 L 505 428 L 487 428 L 487 230 L 505 230 L 505 194 L 72 194 z M 127 230 L 163 230 L 163 428 L 127 428 L 127 230 z M 199 230 L 235 230 L 235 428 L 199 428 L 199 230 z M 271 230 L 307 230 L 307 428 L 271 428 L 271 230 z M 343 230 L 379 230 L 379 428 L 343 428 L 343 230 z M 415 230 L 451 230 L 451 428 L 415 428 L 415 230 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4162" d="m 53.7,482 469.3,0 0,-18 -469.3,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4164" d="m 36,518 505,0 0,-18 -505,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 72,144 0,33 212,-86 218,84 0,-33 -216,-89 z" id="path4153" fill="#b7650c"/>
+ <path d="m 131,175 65,-1 91,-30 92,32 62,1 -153,-65 z" id="path4150" fill="#b7650c"/>
+ <path d="M 72 194 L 72 230 L 90 230 L 90 428 L 72 428 L 72 446 L 505 446 L 505 428 L 487 428 L 487 230 L 505 230 L 505 194 L 72 194 z M 127 230 L 163 230 L 163 428 L 127 428 L 127 230 z M 199 230 L 235 230 L 235 428 L 199 428 L 199 230 z M 271 230 L 307 230 L 307 428 L 271 428 L 271 230 z M 343 230 L 379 230 L 379 428 L 343 428 L 343 230 z M 415 230 L 451 230 L 451 428 L 415 428 L 415 230 z " id="path4148" fill="#b7650c"/>
+ <path d="m 53.7,482 469.3,0 0,-18 -469.3,0 z" id="path4136" fill="#b7650c"/>
+ <path d="m 36,518 505,0 0,-18 -505,0 z" id="path4152" fill="#b7650c"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/museum.svg b/vtm-themes/resources/assets/symbols/custom/tourist/museum.svg
new file mode 100644
index 00000000..12bb7295
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/museum.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path id="path4193" d="M 293.31641 95.164062 L 74.449219 166.09961 L 41.287109 166.09961 L 41.287109 236.08984 L 87.712891 236.08984 L 87.712891 435.6543 L 65.921875 435.6543 L 36.548828 484.83594 L 543.45117 483.88867 L 515.97266 435.6543 L 490.39062 435.6543 L 490.39062 236.08984 L 539.66016 236.08984 L 539.66016 166.09961 L 507.44531 166.09961 L 293.31641 95.164062 z M 134.14062 236.08984 L 204.25391 236.08984 L 204.25391 435.6543 L 134.14062 435.6543 L 134.14062 236.08984 z M 249.73242 236.08984 L 328.37305 236.08984 L 328.37305 435.6543 L 249.73242 435.6543 L 249.73242 236.08984 z M 373.85156 236.08984 L 443.96484 236.08984 L 443.96484 435.6543 L 373.85156 435.6543 L 373.85156 236.08984 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 293.31641 95.164062 L 74.449219 166.09961 L 41.287109 166.09961 L 41.287109 236.08984 L 87.712891 236.08984 L 87.712891 435.6543 L 65.921875 435.6543 L 36.548828 484.83594 L 543.45117 483.88867 L 515.97266 435.6543 L 490.39062 435.6543 L 490.39062 236.08984 L 539.66016 236.08984 L 539.66016 166.09961 L 507.44531 166.09961 L 293.31641 95.164062 z M 134.14062 236.08984 L 204.25391 236.08984 L 204.25391 435.6543 L 134.14062 435.6543 L 134.14062 236.08984 z M 249.73242 236.08984 L 328.37305 236.08984 L 328.37305 435.6543 L 249.73242 435.6543 L 249.73242 236.08984 z M 373.85156 236.08984 L 443.96484 236.08984 L 443.96484 435.6543 L 373.85156 435.6543 L 373.85156 236.08984 z " id="path4181" fill="#b7650c"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/ruin.svg b/vtm-themes/resources/assets/symbols/custom/tourist/ruin.svg
new file mode 100644
index 00000000..e21dc9d3
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/ruin.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path id="path4148" d="M 73 144 L 70 180 L 90 182 L 90 379 L 72 379 L 72 397 L 327 397 L 330 401 L 336 397 L 445 397 L 445 379 L 358 379 L 260 237 L 257 239 L 253 195 L 324 200 L 326 164 L 73 144 z M 126 185 L 163 188 L 163 379 L 127 379 L 126 185 z M 199 190 L 217 192 L 234 379 L 199 379 L 199 190 z M 263 305 L 314 379 L 270 379 L 263 305 z " mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4150" d="m 53.6,433 449.4,0 0,-18 -449.4,0 z" mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4152" d="m 35.8,469 505.2,0 0,-18 -505.1,0 z" mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="M 73 144 L 70 180 L 90 182 L 90 379 L 72 379 L 72 397 L 327 397 L 330 401 L 336 397 L 445 397 L 445 379 L 358 379 L 260 237 L 257 239 L 253 195 L 324 200 L 326 164 L 73 144 z M 126 185 L 163 188 L 163 379 L 127 379 L 126 185 z M 199 190 L 217 192 L 234 379 L 199 379 L 199 190 z M 263 305 L 314 379 L 270 379 L 263 305 z " id="path4145" fill="#b7650c" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 53.6,433 449.4,0 0,-18 -449.4,0 z" id="path4137" fill="#b7650c" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 35.8,469 505.2,0 0,-18 -505.1,0 z" id="path2161" fill="#b7650c" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/theatre.svg b/vtm-themes/resources/assets/symbols/custom/tourist/theatre.svg
new file mode 100644
index 00000000..b2cff2a3
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/theatre.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path id="path4158" d="m 307.4653,92.583851 c -16.70287,6.8723 -20.19148,27.854419 -24.71286,43.255829 -4.86624,-4.47803 -11.16373,-6.85996 -16.88872,-6.85996 -13.9308,0 -24.61744,8.7655 -31.96451,15.62546 -34.32963,24.16992 -62.73449,39.56857 -91.79063,47.54329 -27.89693,3.37971 -55.720645,-1.6269 -78.527723,-3.66817 -10.877476,-0.90513 -14.980383,-0.6193 -18.701625,1.19097 -3.912075,1.90554 -6.774569,5.62135 -8.110399,9.14661 -2.576244,6.95523 -1.431247,13.3388 -0.09542,19.81764 2.67166,13.05297 8.396648,27.63038 19.083293,62.78765 10.686645,35.15727 34.25451,99.94573 67.841104,140.96254 33.58659,41.01682 68.82765,66.20406 105.89694,64.72726 37.0693,-1.47679 63.37185,-27.61681 72.9135,-58.4866 12.40414,12.00492 28.62493,20.0082 58.06091,21.10388 29.43598,1.09569 65.58714,-19.61836 99.22144,-60.58753 33.6343,-40.96918 55.68718,-109.72037 66.42153,-144.73473 4.27419,-20.94741 25.61136,-63.78806 18.94017,-82.7482 -16.99367,-23.78452 -73.73972,2.55448 -105.24435,-6.6694 -37.41788,-6.77882 -68.28451,-27.96167 -93.69893,-47.82914 C 335.32424,98.932831 320.21495,89.443079 307.4653,92.583851 Z m -37.21236,58.119059 c 1.33583,4.76386 2.76708,9.43244 4.19832,14.10102 -2.85091,9.81303 -4.3498,18.35645 -6.77456,27.5351 -2.28526,30.78106 -5.30236,62.53478 -4.65492,95.38891 0.64743,32.85414 4.5595,64.6767 11.33409,89.02002 6.77458,24.34331 9.06457,29.58355 11.92707,34.53796 -2.09165,8.33732 -4.54415,17.92733 -5.58191,22.05666 -5.4252,12.71752 -25.04687,34.34742 -49.85515,36.44352 -31.67826,-0.57167 -62.21152,-20.57987 -84.15731,-45.35193 C 107.56782,372.98451 84.667874,311.05436 64.439585,248.17144 59.69995,233.1379 53.791383,207.68718 53.791383,207.68718 c 28.309601,0.12741 68.598327,9.91709 93.660517,2.65923 47.70823,-12.86241 70.60818,-29.53592 98.27895,-50.49689 12.09986,-8.48444 18.91032,-14.41186 24.52209,-9.14661 z m 100.71201,75.98353 c -7.29936,7.76509 -26.38265,16.14948 -42.79428,12.14784 -3.05333,-1.2386 -6.29749,-4.66858 -7.63332,-8.67022 -3.95785,-13.21798 14.79158,-16.776 22.99537,-18.48377 8.58748,-1.71499 18.41538,-2.85831 28.29098,-6.14538 12.38355,3.26402 2.01177,18.04605 -0.85875,21.15153 z m 76.09462,-1.28624 c 7.2702,10.39836 10.50798,21.45234 14.59872,33.15645 1.33583,4.38275 1.52666,7.14579 0.0954,10.09938 l 0,0 0,0 c -4.36289,5.37153 -14.08475,1.45424 -17.65205,0.52402 -8.87373,-2.33429 -19.27412,-17.38808 -19.65578,-27.24927 -0.60891,-9.66762 0.45872,-21.86481 10.06644,-22.34248 4.91396,-0.19054 8.92145,2.00081 12.54727,5.8119 z M 209.4726,274.56321 c 1.71749,3.14415 5.05707,5.62135 8.87373,5.52608 9.35081,-0.8575 14.69413,-9.90883 16.88871,-18.10266 3.62583,-8.09856 11.44998,-16.57823 7.06082,-25.72483 -3.24416,-2.38193 -6.86999,-3.3347 -10.63894,-3.38234 -22.51923,-0.002 -35.24181,23.00456 -22.18432,41.68375 z m -104.09936,1.52444 c 10.21308,10.77525 28.8501,21.58097 41.88783,25.34372 11.35456,4.95441 20.51454,-10.19466 15.26663,-19.72237 -10.86401,-10.12439 -24.44238,-23.28089 -38.69137,-23.10471 -9.58935,-0.23819 -19.89433,7.19342 -18.46309,17.48336 z m 307.62266,67.26566 c 5.89298,9.92719 3.94103,28.0707 -5.72499,24.2004 -36.62794,-29.99872 -37.13376,-25.01618 -78.14608,-16.57822 -2.40005,-7.29886 3.33563,-15.51521 8.39668,-18.7696 10.01873,-7.71745 21.85037,-12.67186 33.44345,-12.7195 16.17308,0.33347 32.01221,10.52812 42.03094,23.86692 z m -177.85624,16.57823 c -10.49582,18.00738 -30.53327,32.1084 -52.19281,29.44064 -9.25539,-0.8575 -20.51453,-9.71827 -28.4341,-0.95277 7.15623,13.3388 21.37329,22.19957 36.25825,24.20039 23.63755,1.78684 42.34528,-5.03936 55.6278,-22.86651 6.77457,-8.00328 11.92705,-17.531 13.26288,-28.01148 2.09917,-7.90801 3.72125,-18.7696 -6.63144,-21.34209 -10.35268,-2.57248 -11.49768,13.43408 -17.89058,19.53182 z" mix-blend-mode="normal" isolation="auto" white-space="normal" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4144" d="m 265.95914,138.60272 c -9.2554,0 -19.46496,7.43161 -26.04869,13.52935 -27.67077,21.43736 -48.47156,36.77698 -95.41646,49.35357 -17.74746,5.33552 -53.433213,-1.14333 -89.691467,-3.62054 -22.6137,-3.52525 -3.244159,36.87226 -0.190833,53.25993 20.037456,62.88292 42.937406,126.71861 83.96648,179.12105 23.28162,25.72483 55.34155,48.49607 91.5998,48.59134 39.89169,-10.30241 57.60841,-37.14834 66.02819,-69.83815 -5.69579,-9.59843 -8.90756,-18.48259 -11.35456,-28.20203 -16.2208,-60.69155 -15.26663,-124.81307 -8.20582,-186.74322 2.09917,-9.90883 4.57999,-19.81765 7.25165,-29.53592 -1.90832,-6.19301 -3.72124,-12.38603 -5.53415,-18.67432 -3.09704,-4.39703 -10.16912,-7.19881 -12.40414,-7.24106 z" fill="#ffffff"/>
+ <path white-space="normal" isolation="auto" mix-blend-mode="normal" d="m 307.4653,92.583851 c -16.70287,6.8723 -20.19148,27.854419 -24.71286,43.255829 -4.86624,-4.47803 -11.16373,-6.85996 -16.88872,-6.85996 -13.9308,0 -24.61744,8.7655 -31.96451,15.62546 -34.32963,24.16992 -62.73449,39.56857 -91.79063,47.54329 -27.89693,3.37971 -55.720645,-1.6269 -78.527723,-3.66817 -10.877476,-0.90513 -14.980383,-0.6193 -18.701625,1.19097 -3.912075,1.90554 -6.774569,5.62135 -8.110399,9.14661 -2.576244,6.95523 -1.431247,13.3388 -0.09542,19.81764 2.67166,13.05297 8.396648,27.63038 19.083293,62.78765 10.686645,35.15727 34.25451,99.94573 67.841104,140.96254 33.58659,41.01682 68.82765,66.20406 105.89694,64.72726 37.0693,-1.47679 63.37185,-27.61681 72.9135,-58.4866 12.40414,12.00492 28.62493,20.0082 58.06091,21.10388 29.43598,1.09569 65.58714,-19.61836 99.22144,-60.58753 33.6343,-40.96918 55.68718,-109.72037 66.42153,-144.73473 4.27419,-20.94741 25.61136,-63.78806 18.94017,-82.7482 -16.99367,-23.78452 -73.73972,2.55448 -105.24435,-6.6694 -37.41788,-6.77882 -68.28451,-27.96167 -93.69893,-47.82914 C 335.32424,98.932831 320.21495,89.443079 307.4653,92.583851 Z m -37.21236,58.119059 c 1.33583,4.76386 2.76708,9.43244 4.19832,14.10102 -2.85091,9.81303 -4.3498,18.35645 -6.77456,27.5351 -2.28526,30.78106 -5.30236,62.53478 -4.65492,95.38891 0.64743,32.85414 4.5595,64.6767 11.33409,89.02002 6.77458,24.34331 9.06457,29.58355 11.92707,34.53796 -2.09165,8.33732 -4.54415,17.92733 -5.58191,22.05666 -5.4252,12.71752 -25.04687,34.34742 -49.85515,36.44352 -31.67826,-0.57167 -62.21152,-20.57987 -84.15731,-45.35193 C 107.56782,372.98451 84.667874,311.05436 64.439585,248.17144 59.69995,233.1379 53.791383,207.68718 53.791383,207.68718 c 28.309601,0.12741 68.598327,9.91709 93.660517,2.65923 47.70823,-12.86241 70.60818,-29.53592 98.27895,-50.49689 12.09986,-8.48444 18.91032,-14.41186 24.52209,-9.14661 z m 100.71201,75.98353 c -7.29936,7.76509 -26.38265,16.14948 -42.79428,12.14784 -3.05333,-1.2386 -6.29749,-4.66858 -7.63332,-8.67022 -3.95785,-13.21798 14.79158,-16.776 22.99537,-18.48377 8.58748,-1.71499 18.41538,-2.85831 28.29098,-6.14538 12.38355,3.26402 2.01177,18.04605 -0.85875,21.15153 z m 76.09462,-1.28624 c 7.2702,10.39836 10.50798,21.45234 14.59872,33.15645 1.33583,4.38275 1.52666,7.14579 0.0954,10.09938 l 0,0 0,0 c -4.36289,5.37153 -14.08475,1.45424 -17.65205,0.52402 -8.87373,-2.33429 -19.27412,-17.38808 -19.65578,-27.24927 -0.60891,-9.66762 0.45872,-21.86481 10.06644,-22.34248 4.91396,-0.19054 8.92145,2.00081 12.54727,5.8119 z M 209.4726,274.56321 c 1.71749,3.14415 5.05707,5.62135 8.87373,5.52608 9.35081,-0.8575 14.69413,-9.90883 16.88871,-18.10266 3.62583,-8.09856 11.44998,-16.57823 7.06082,-25.72483 -3.24416,-2.38193 -6.86999,-3.3347 -10.63894,-3.38234 -22.51923,-0.002 -35.24181,23.00456 -22.18432,41.68375 z m -104.09936,1.52444 c 10.21308,10.77525 28.8501,21.58097 41.88783,25.34372 11.35456,4.95441 20.51454,-10.19466 15.26663,-19.72237 -10.86401,-10.12439 -24.44238,-23.28089 -38.69137,-23.10471 -9.58935,-0.23819 -19.89433,7.19342 -18.46309,17.48336 z m 307.62266,67.26566 c 5.89298,9.92719 3.94103,28.0707 -5.72499,24.2004 -36.62794,-29.99872 -37.13376,-25.01618 -78.14608,-16.57822 -2.40005,-7.29886 3.33563,-15.51521 8.39668,-18.7696 10.01873,-7.71745 21.85037,-12.67186 33.44345,-12.7195 16.17308,0.33347 32.01221,10.52812 42.03094,23.86692 z m -177.85624,16.57823 c -10.49582,18.00738 -30.53327,32.1084 -52.19281,29.44064 -9.25539,-0.8575 -20.51453,-9.71827 -28.4341,-0.95277 7.15623,13.3388 21.37329,22.19957 36.25825,24.20039 23.63755,1.78684 42.34528,-5.03936 55.6278,-22.86651 6.77457,-8.00328 11.92705,-17.531 13.26288,-28.01148 2.09917,-7.90801 3.72125,-18.7696 -6.63144,-21.34209 -10.35268,-2.57248 -11.49768,13.43408 -17.89058,19.53182 z" id="path3354" fill="#b7650c" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+ <path d="m 265.95914,138.60272 c -9.2554,0 -19.46496,7.43161 -26.04869,13.52935 -27.67077,21.43736 -48.47156,36.77698 -95.41646,49.35357 -17.74746,5.33552 -53.433213,-1.14333 -89.691467,-3.62054 -22.6137,-3.52525 -3.244159,36.87226 -0.190833,53.25993 20.037456,62.88292 42.937406,126.71861 83.96648,179.12105 23.28162,25.72483 55.34155,48.49607 91.5998,48.59134 39.89169,-10.30241 57.60841,-37.14834 66.02819,-69.83815 -5.69579,-9.59843 -8.90756,-18.48259 -11.35456,-28.20203 -16.2208,-60.69155 -15.26663,-124.81307 -8.20582,-186.74322 2.09917,-9.90883 4.57999,-19.81765 7.25165,-29.53592 -1.90832,-6.19301 -3.72124,-12.38603 -5.53415,-18.67432 -3.09704,-4.39703 -10.16912,-7.19881 -12.40414,-7.24106 z" id="path3327-8" opacity="0.1" fill="#b7650c"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/view_point.svg b/vtm-themes/resources/assets/symbols/custom/tourist/view_point.svg
new file mode 100644
index 00000000..a77768ba
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/view_point.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4136" d="m 341,125 c -3,5 -5,10 -7,15 -9,33 -17,67 -25,101 -2,8 0,18 8,14 19,-15 36,-31 53,-48 13,-13 28,-26 39,-42 8,-11 13,-26 7,-40 -8,-14 -24,-24 -40.5,-24.5 C 359,100 347,112 341,125 Z m -173,2 c -6,14 -1,29 7,40 11,16 25,29 38,43 17,16 34,33 53,47 9,4 10,-6 8,-14 -8,-34 -16,-68 -25,-101 l -6,-15 c -6,-13 -18,-25 -35,-24 -17,1 -33,10 -40,24 z M 86,270 c -7.1,14 -7,32 2,46 9,12 24,15 38,14 19,-1 38,-8 56,-13 23,-6 46,-13 68,-21 7,-6 -1,-12 -8,-14 -34,-11 -67,-21 -101,-29 -5,-1 -10,-2 -21.5,-2 C 108,251 92,256 86,270 Z m 353,-17 c -34,8 -67,18 -100,29 -8,2 -16,8 -8,14 22,8 44,15 67,21 19,5 37,12 56,13 14,1 29,-2 38,-14 9,-14 9,-32 2,-46 -6,-14 -22,-19 -33,-19 -11,0 -17,1 -22,2 z m -174,70 c -18,15 -35,31 -52,48 -13,14 -28,26 -39,42 -8,11 -13,27 -7,40 8,14 23,24 39,25 16,2 29,-11 36,-25 2,-4 4,-9 6,-14 10,-34 18,-68 25,-102 0.88149,-11.07469 0.84813,-19.09468 -8,-14 z m 43,16 c 8,34 16,68 26,102 1,5 3,10 6,15 7,13 20,26 36,24 16,-1 31,-10 39,-25 6,-13 1,-28 -7,-40 -11,-16 -26,-28 -39,-42 -17,-16 -34,-33 -52,-47 -12.69071,-6.57256 -9.76024,7.99545 -9,13 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m 341,125 c -3,5 -5,10 -7,15 -9,33 -17,67 -25,101 -2,8 0,18 8,14 19,-15 36,-31 53,-48 13,-13 28,-26 39,-42 8,-11 13,-26 7,-40 -8,-14 -24,-24 -40.5,-24.5 C 359,100 347,112 341,125 Z m -173,2 c -6,14 -1,29 7,40 11,16 25,29 38,43 17,16 34,33 53,47 9,4 10,-6 8,-14 -8,-34 -16,-68 -25,-101 l -6,-15 c -6,-13 -18,-25 -35,-24 -17,1 -33,10 -40,24 z M 86,270 c -7.1,14 -7,32 2,46 9,12 24,15 38,14 19,-1 38,-8 56,-13 23,-6 46,-13 68,-21 7,-6 -1,-12 -8,-14 -34,-11 -67,-21 -101,-29 -5,-1 -10,-2 -21.5,-2 C 108,251 92,256 86,270 Z m 353,-17 c -34,8 -67,18 -100,29 -8,2 -16,8 -8,14 22,8 44,15 67,21 19,5 37,12 56,13 14,1 29,-2 38,-14 9,-14 9,-32 2,-46 -6,-14 -22,-19 -33,-19 -11,0 -17,1 -22,2 z m -174,70 c -18,15 -35,31 -52,48 -13,14 -28,26 -39,42 -8,11 -13,27 -7,40 8,14 23,24 39,25 16,2 29,-11 36,-25 2,-4 4,-9 6,-14 10,-34 18,-68 25,-102 0.88149,-11.07469 0.84813,-19.09468 -8,-14 z m 43,16 c 8,34 16,68 26,102 1,5 3,10 6,15 7,13 20,26 36,24 16,-1 31,-10 39,-25 6,-13 1,-28 -7,-40 -11,-16 -26,-28 -39,-42 -17,-16 -34,-33 -52,-47 -12.69071,-6.57256 -9.76024,7.99545 -9,13 z" id="path4166" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#b7650c" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/windmill.svg b/vtm-themes/resources/assets/symbols/custom/tourist/windmill.svg
new file mode 100644
index 00000000..58100875
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/windmill.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata10"/>
+ <path fill="none" opacity="0.8" d="m240 220l50.9-30.4 50 31.4c0 0 45.9 324 40 322l-196-.2z" id="path4147" mix-blend-mode="normal" solid-color="#000000" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4149" d="M 440.07812 36.986328 C 436.34211 37.034888 432.70664 38.717969 430.40039 41.699219 L 290 233 L 150 41.699219 C 145.2 35.999219 137.1 35.500781 132 40.050781 L 72 96 C 66.8 100.9 66.900391 109.3 72.400391 114 L 248 263 L 72 414 C 66.5 418.7 66.399609 427 71.599609 432 L 130.59961 487.69922 C 135.89961 492.59922 144.29961 491.9 148.59961 486 L 288.59961 294 L 429.59961 485 C 433.89961 490.8 442.29961 491.59922 447.59961 486.69922 L 506.59961 431 C 511.79961 426.1 511.69922 417.7 506.19922 413 L 332 263 L 507 114 C 512.5 109.3 512.60039 101 507.40039 96 L 448.40039 40 C 445.95039 37.9 442.98391 36.94856 440.07812 36.986328 z M 290.40039 256.69922 L 298 264.09961 L 290.40039 271.5 L 282.80078 264.09961 L 290.40039 256.69922 z " mix-blend-mode="normal" solid-color="#000000" white-space="normal" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path fill="none" id="path4139" d="m185 541l54.9-320 50.9-30.4 50 31.4c0 0 45.9 324 40 322-5.3-2.6-195 1.3-196-2.6" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path id="path4141" d="m 239.9,221 50.9,-30.4 50,31.4 c 0,0 45.9,324 40,322 -5.3,-2.6 -195,1.3 -195.9,-2.8 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+ <path d="m185 541l54.9-320 50.9-30.4 50 31.4c0 0 45.9 324 40 322-5.3-2.6-195 1.3-196-2.6" id="path3457-1" fill="#ffffff" fill-rule="evenodd"/>
+ <path d="m 239.9,221 50.9,-30.4 50,31.4 c 0,0 45.9,324 40,322 -5.3,-2.6 -195,1.3 -195.9,-2.8 z" id="path3457" opacity="0.5" fill="#b7650c" fill-rule="evenodd"/>
+ <path id="path4148" d="m185 541l54.9-320 50.9-30.4 50 31.4c0 0 45.9 324 40 322-5.3-2.6-195 1.3-196-2.6" fill="#ffffff" fill-rule="evenodd"/>
+ <path id="path4162" d="m240 220l50.9-30.4 50 31.4c0 0 45.9 324 40 322l-196-.2z" opacity="0.5" fill="#b7650c" fill-rule="evenodd"/>
+ <path d="M 440.07812 36.986328 C 436.34211 37.034888 432.70664 38.717969 430.40039 41.699219 L 290 233 L 150 41.699219 C 145.2 35.999219 137.1 35.500781 132 40.050781 L 72 96 C 66.8 100.9 66.900391 109.3 72.400391 114 L 248 263 L 72 414 C 66.5 418.7 66.399609 427 71.599609 432 L 130.59961 487.69922 C 135.89961 492.59922 144.29961 491.9 148.59961 486 L 288.59961 294 L 429.59961 485 C 433.89961 490.8 442.29961 491.59922 447.59961 486.69922 L 506.59961 431 C 511.79961 426.1 511.69922 417.7 506.19922 413 L 332 263 L 507 114 C 512.5 109.3 512.60039 101 507.40039 96 L 448.40039 40 C 445.95039 37.9 442.98391 36.94856 440.07812 36.986328 z M 290.40039 256.69922 L 298 264.09961 L 290.40039 271.5 L 282.80078 264.09961 L 290.40039 256.69922 z " id="path4144" fill="#b7650c" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/custom/tourist/zoo.svg b/vtm-themes/resources/assets/symbols/custom/tourist/zoo.svg
new file mode 100644
index 00000000..71960ffb
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/custom/tourist/zoo.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
+ <metadata id="metadata2975"/>
+ <g id="g4143">
+  <path id="path4151" d="m 112,362 c -3,-5 -15,-12 -21,-14 -8,-2 -22,8 -11,15 l -3,7 c -9,-5 -11.2,-18 -10,-27 0,-6 6,-13 8,-19 7,-17 12,-34 17,-51 2,-7 3,-20 9,-25 5,-4 14,-5 20,-8 5,-2 8,-7 13,-8 11,-4 21,-3 26,-14 11,16 20,31 22,51 1,15 -8,29 -12,43 -2,10 -1,19 -4,29 -3,12 -9,23 -12,34 -2,8 0,16 -2,22 -4,12 -27,20 -24,35 1,7 9,8 15,10 14,2 28,1 42,-1 4,-1 9,0 13,-4 8,-8 -2,-24 1,-34 2,-7 9,-13 12,-19 8,-14 14,-29 18,-44 l 2,0 c 0,13 3,30 8,42 4,8 12,19 12,28 -1,15 -23,24 -12,42 10,17 36,-1 49,-4 8,-1 18,1 21,-8 5,-12 -5,-24 -7,-36 -2,-13 1,-27 -2,-40 -1,-10 -9,-21 -9,-31 0,-7 5,-15 6,-22 l 44,20 19,11 c 0,10 0,22 1,31 1,5 5,9 4,14 -2,9 -25,19 -20,29 3,5 11,7 16,8 14,4 49,9 59,-4 5,-5 4,-15 4,-21 0,-18 2,-36 -2,-52 15,9 18,27 26,42 2,6 8,14 6,20 -3,9 -31,24 -18,36 4,4 10,4 15,5 13,4 53,11 60,-7 5,-16 4,-45 0,-62 -3,-10 -8,-18 -9,-29 -1,-9 6,-19 6,-28 1,-14 -3,-26 -3,-38 0,-9 2,-17 2,-26 13,34 0,70 9,104 1,5 2,33 12,30 3,-1 5,-7 4,-10 -3,-14 -9,-26 -9,-41 0,-7 3,-14 4,-22 4,-42 11,-102 -25,-133 -17,-14 -34,-24 -52,-36 -14,-9 -29,-19 -45,-23 -13,-2 -26,1 -38,1 -27,-1 -54,-7 -81,-9 -12,-1 -25,1 -37,-1 -27,-5 -46,-25 -73,-32 -8,-2 -22,-1 -31,1 -8,1 -12,7 -18,11 -18,13 -42,34 -52,54 -6.2,13 -7,29 -11,43 -5,19 -16.4,36 -20,56 -3.1,22 2,44 2,66 0,16 -9,36 -3.2,52 8.1,22 51.2,29 54.2,0 6,2 19,0 15,-9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
+  <path d="m 112,362 c -3,-5 -15,-12 -21,-14 -8,-2 -22,8 -11,15 l -3,7 c -9,-5 -11.2,-18 -10,-27 0,-6 6,-13 8,-19 7,-17 12,-34 17,-51 2,-7 3,-20 9,-25 5,-4 14,-5 20,-8 5,-2 8,-7 13,-8 11,-4 21,-3 26,-14 11,16 20,31 22,51 1,15 -8,29 -12,43 -2,10 -1,19 -4,29 -3,12 -9,23 -12,34 -2,8 0,16 -2,22 -4,12 -27,20 -24,35 1,7 9,8 15,10 14,2 28,1 42,-1 4,-1 9,0 13,-4 8,-8 -2,-24 1,-34 2,-7 9,-13 12,-19 8,-14 14,-29 18,-44 l 2,0 c 0,13 3,30 8,42 4,8 12,19 12,28 -1,15 -23,24 -12,42 10,17 36,-1 49,-4 8,-1 18,1 21,-8 5,-12 -5,-24 -7,-36 -2,-13 1,-27 -2,-40 -1,-10 -9,-21 -9,-31 0,-7 5,-15 6,-22 l 44,20 19,11 c 0,10 0,22 1,31 1,5 5,9 4,14 -2,9 -25,19 -20,29 3,5 11,7 16,8 14,4 49,9 59,-4 5,-5 4,-15 4,-21 0,-18 2,-36 -2,-52 15,9 18,27 26,42 2,6 8,14 6,20 -3,9 -31,24 -18,36 4,4 10,4 15,5 13,4 53,11 60,-7 5,-16 4,-45 0,-62 -3,-10 -8,-18 -9,-29 -1,-9 6,-19 6,-28 1,-14 -3,-26 -3,-38 0,-9 2,-17 2,-26 13,34 0,70 9,104 1,5 2,33 12,30 3,-1 5,-7 4,-10 -3,-14 -9,-26 -9,-41 0,-7 3,-14 4,-22 4,-42 11,-102 -25,-133 -17,-14 -34,-24 -52,-36 -14,-9 -29,-19 -45,-23 -13,-2 -26,1 -38,1 -27,-1 -54,-7 -81,-9 -12,-1 -25,1 -37,-1 -27,-5 -46,-25 -73,-32 -8,-2 -22,-1 -31,1 -8,1 -12,7 -18,11 -18,13 -42,34 -52,54 -6.2,13 -7,29 -11,43 -5,19 -16.4,36 -20,56 -3.1,22 2,44 2,66 0,16 -9,36 -3.2,52 8.1,22 51.2,29 54.2,0 6,2 19,0 15,-9 z" id="path6" fill="#b7650c"/>
+ </g>
+</svg>
diff --git a/vtm-themes/resources/assets/symbols/dot_blue_dark.svg b/vtm-themes/resources/assets/symbols/dot_blue_dark.svg
new file mode 100644
index 00000000..45c83154
--- /dev/null
+++ b/vtm-themes/resources/assets/symbols/dot_blue_dark.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="580" width="580" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <title>other</title>
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title>other</dc:title>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <circle opacity=".8" cx="290" cy="290" r="145" fill="#fff"/>
+ <circle cy="290" cx="290" r="116" fill="#2d51bc"/>
+</svg>
diff --git a/vtm-themes/resources/assets/vtm/default.xml b/vtm-themes/resources/assets/vtm/default.xml
index 7e805ddc..7c4f3ac9 100644
--- a/vtm-themes/resources/assets/vtm/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -3,36 +3,58 @@
     version="1" xmlns="http://opensciencemap.org/rendertheme"
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
-    <!-- base style for fixed width lines -->
-    <style-line cap="butt" fix="true" id="fix" width="1.0" />
+    <!--###### TEXT styles ######-->
 
+    <!--default label-->
     <style-text caption="true" dy="20" fill="#2d51bc" font-family="medium" id="caption-small-blue"
         k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
-
+    <!--shop-->
+    <style-text caption="true" dy="20" fill="#ac39ac" font-family="medium" id="shop" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--tavern-->
+    <style-text caption="true" dy="20" fill="#734a08" font-family="medium" id="tavern" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--accommodation-->
+    <style-text caption="true" dy="20" fill="#0092da" font-family="medium" id="accommodation"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--education-->
+    <style-text caption="true" dy="20" fill="#0a4f0a" font-family="medium" id="education" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--health-->
+    <style-text caption="true" dy="20" fill="#da0092" font-family="medium" id="health" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--entertainment-->
+    <style-text caption="true" dy="20" fill="#b7650c" font-family="medium" id="entertainment"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--roads-->
     <style-text fill="#101010" id="road" k="name" priority="2" size="16" stroke="#eeeeee"
         stroke-width="2.0" />
-
+    <!--major roads-->
     <style-text style="bold" fill="#101010" id="major-road" k="name" priority="1" size="16"
         stroke="#eeeeee" stroke-width="2.0" />
-
+    <!--references-->
     <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
         stroke-width="2.0" />
     <style-text caption="true" id="ref-caption" use="ref" />
-
+    <!--ferry-->
     <style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff"
         stroke-width="2.0" />
 
-    <style-text caption="true" dy="20" fill="#404000" id="poi" k="name" size="16" stroke="#aaffffff"
-        stroke-width="2.0" />
 
+    <!--###### AREA styles ######-->
+
+    <!--residential-->
     <style-area fade="11" fill="#e8e7e3" id="residential" />
-
+    <!--railway-->
     <style-area fade="10" fill="#e6e3e5" id="railway|industrial" />
 
-
+    <!--wood-->
     <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
     <!-- src="assets:textures/wood.png" -->
     <!-- <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" /> -->
+    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
+    <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
+    <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
 
     <style-area id="tex1" src="assets:textures/rough.png" />
 
@@ -45,34 +67,45 @@
     <!-- grassland|scrub -->
     <style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
 
+    <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
+
+    <!--farmland-->
     <style-area fade="12" fill="#e4dab5" id="farmland" stroke="#d1dbc7" stroke-width="1.0"
         use="tex1" />
 
-    <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
-
     <!-- marsh|wetland|mud|nature_reserve -->
     <style-area fade="12" fill="#deecb9" id="greens2" />
 
     <!-- park|common|green|cemetery|golf_course|dog_park -->
     <style-area fade="11" fill="#9ac56e" id="park" use="tex1" />
-    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
-
-    <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
-    <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
-
     <!-- <style-area id="park" fill="#a3ca7b" fade="11" /> -->
-    <style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
 
     <!-- de:Kleingartengebiet -->
     <style-area fade="12" fill="#efeae0" id="allotments" use="tex1" />
 
     <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
     <style-area fade="10" fill="#ddddcc" id="quarry" />
+
+    <!--military-->
     <style-area fade="10" fill="#eeedea" id="military" />
+    <!--building-->
+    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+
+    <!--water-->
+    <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
+    <!-- src="assets:textures/water.png" -->
+    <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
+
+    <!--###### LINE styles ######-->
+
+    <!-- base style for fixed width lines -->
+    <style-line cap="butt" fix="true" id="fix" width="1.0" />
+
+    <!--residential-->
     <style-line id="residential" stroke="#ffffff" width="1.3" />
     <style-line cap="butt" id="residential:bridge" use="residential" />
 
-    <!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
+    <!-- when inheriting another style with 'from' then 'width' is meant relative to the parent -->
     <style-line id="pedestrian" use="residential" width="-0.4" />
     <style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
     <style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
@@ -95,30 +128,32 @@
     <!-- <style-line id="footway:z16" use="footway" width="-0.95" fixed="false" fade="-1"/> -->
     <style-line id="footway:z17" stroke="#faf8f5" width="0.3" />
 
-    <!-- de: ein Weg der für Reiter vorgeshen ist.. -->
+    <!-- de: ein Weg der für Reiter vorgesehen ist.. -->
     <style-line cap="butt" id="bridleway" stipple-stroke="#837b58" stroke="#d3cb98" use="footway"
         width="0.1" />
     <style-line cap="butt" fix="true" id="steps" stipple="2" stipple-stroke="#be6253"
         stipple-width="1.0" stroke="#aaffffff" width="4.2" />
     <style-line cap="butt" fix="true" id="water:outline" stroke="#a4bbcc" width="1.0" />
 
-    <style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
-    <style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
-
-    <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
-    <!-- src="assets:textures/water.png" -->
-    <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
-
     <!-- no-go area boundary -->
     <style-line cap="butt" fix="true" id="fence" stroke="#444444" width="1.2" />
     <style-line cap="butt" id="aeroway:runway" stroke="#c8ccbe" width="1.8" />
 
+    <!--park-->
+    <style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
+
+    <!--building-->
     <!-- <style-line id="building" stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/> -->
     <!-- <style-line id="building" stroke="#d0cec8" width="1.0" fix="true" cap="butt" fade="15"/>
       <style-area id="building" fill="#e9e6e3" fade="15"/> -->
-
     <style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
-    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+
+    <!--water-->
+    <style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
+    <style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
+
+
+    <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
         <area mesh="true" use="water" />
@@ -270,9 +305,6 @@
                 -->
                 <m v="parking" zoom-min="15">
                     <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
-                    <m zoom-min="17">
-                        <symbol src="assets:symbols/transport/parking.svg" />
-                    </m>
                 </m>
                 <m closed="yes" v="fountain">
                     <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
@@ -565,7 +597,6 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <!-- A place where planes are parked -->
             <m v="apron">
@@ -607,10 +638,13 @@
             <m zoom-min="17">
                 <extrusion line-color="#ffd9d8d6" side-color="#eaecebe9" top-color="#eaf9f8f6" />
             </m>
-            <m zoom-min="17">
-                <text priority="9" use="caption-small-blue" />
-                <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
-                    priority="10" size="12" stroke="#ffffff" stroke-width="2.0" />
+            <!--Only add house numbers where no name exist-->
+            <m k="addr:housenumber" zoom-min="17">
+                <m k="name" v="~">
+                    <caption style="bold" fill="#606060" font-family="condensed"
+                        k="addr:housenumber" priority="10" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
             </m>
         </m>
 
@@ -997,12 +1031,12 @@
         <!--<m k="boundary" v="administrative"> -->
         <m k="admin_level">
             <m v="4">
-                <line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0"
-                    stroke="#dadada" width="1.3" />
+                <line fix="true" stipple="6" stipple-stroke="#888888" stipple-width="1.0"
+                    stroke="#dadada" width="2.0" />
             </m>
             <m v="2">
-                <line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="1.0"
-                    stroke="#dadada" width="1.6" />
+                <line fix="true" stipple="8" stipple-stroke="#647b9c" stipple-width="1.0"
+                    stroke="#bbbbbb" width="2.5" />
             </m>
         </m>
         <!-- </m> -->
@@ -1046,43 +1080,182 @@
 
     </m><!-- end e="way" -->
 
-    <m e="node" select="first">
+    <!--All POIs and WAYs with names-->
+    <m k="name" select="first">
 
-        <m k="barrier">
-            <m zoom-min="16">
-                <m v="bollard">
-                    <symbol src="assets:symbols/barrier/bollard.svg" />
-                </m>
-                <m v="block">
-                    <symbol src="assets:symbols/barrier/blocks.svg" />
-                </m>
-                <m v="gate">
-                    <symbol src="assets:symbols/barrier/gate.svg" />
-                </m>
-                <m v="lift_gate">
-                    <symbol src="assets:symbols/barrier/lift_gate.svg" />
-                </m>
+        <!-- aeroway -->
+        <m k="aeroway">
+            <m v="helipad" zoom-min="16">
+                <symbol src="assets:symbols/transport/helicopter.svg" />
+            </m>
+            <m v="aerodrome|airport" zoom-min="9">
+                <symbol src="assets:symbols/transport/airport2.svg" />
+            </m>
+            <m k="name" zoom-min="16">
+                <text use="caption-small-blue" />
             </m>
         </m>
 
-        <m k="highway">
-            <m v="bus_stop" zoom-min="16">
-                <symbol src="assets:symbols/dot_blue.svg" />
+        <m k="amenity">
+            <m select="first">
+                <!--<m v="bench" zoom-min="17">
+                    <symbol src="assets:symbols/bench.svg" />
+                </m>-->
+                <m v="drinking_water" zoom-min="17">
+                    <symbol src="assets:symbols/food/drinkingtap.svg" />
+                </m>
+                <m v="fire_station" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/firestation3.svg" />
+                </m>
+                <m v="place_of_worship" zoom-min="17">
+                    <m k="denomination|religion" v="buddhist">
+                        <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
+                    </m>
+                    <m k="denomination|religion" v="christian">
+                        <symbol src="assets:symbols/place_of_worship/christian.svg" />
+                    </m>
+                    <m k="denomination|religion" v="hindu">
+                        <symbol src="assets:symbols/place_of_worship/hindu.svg" />
+                    </m>
+                    <m k="denomination|religion" v="jewish">
+                        <symbol src="assets:symbols/place_of_worship/jewish.svg" />
+                    </m>
+                    <m k="denomination|religion" v="muslim|moslem">
+                        <symbol src="assets:symbols/place_of_worship/islamic.svg" />
+                    </m>
+                    <m k="denomination|religion" v="shinto">
+                        <symbol src="assets:symbols/place_of_worship/shinto.svg" />
+                    </m>
+                    <m k="denomination|religion" v="~|*">
+                        <symbol src="assets:symbols/place_of_worship/unknown.svg" />
+                    </m>
+                </m>
+                <m v="post_box" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/post_box.svg" />
+                </m>
+                <m v="recycling" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/recycling.svg" />
+                </m>
+                <m v="shelter" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/shelter2.svg" />
+                </m>
+                <m v="telephone" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/telephone.svg" />
+                </m>
+                <m v="toilets" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/toilets.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="caption-small-blue" />
+                </m>
             </m>
-            <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/transport/traffic_lights.svg" />
+
+            <m select="first"> <!--Accomodation-->
+                <m v="parking" zoom-min="17">
+                    <symbol src="assets:symbols/transport/parking.svg" />
+                </m>
+                <m v="bicycle_rental" zoom-min="17">
+                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
+                </m>
+                <m v="bus_station" zoom-min="17">
+                    <symbol src="assets:symbols/transport/bus_station.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="accommodation" />
+                </m>
             </m>
-            <m v="turning_circle">
-                <circle fill="#ffffff" radius="1.4" scale-radius="true" />
+
+            <m select="first"> <!--Education-->
+                <m v="kindergarten" zoom-min="17">
+                    <symbol src="assets:symbols/education/nursery3.svg" />
+                </m>
+                <m v="library" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/library.svg" />
+                </m>
+                <m v="school" zoom-min="17">
+                    <symbol src="assets:symbols/education/school.svg" />
+                </m>
+                <m v="university|college" zoom-min="17">
+                    <symbol src="assets:symbols/education/university.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="education" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Entertainment-->
+                <m v="cinema" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/cinema2.svg" />
+                </m>
+                <m v="fountain" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/fountain2.svg" />
+                </m>
+                <m v="theatre" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/theatre.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="entertainment" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Health-->
+                <m v="hospital" zoom-min="15">
+                    <symbol src="assets:symbols/health/hospital.svg" />
+                </m>
+                <m v="pharmacy" zoom-min="17">
+                    <symbol src="assets:symbols/health/pharmacy.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="health" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Shop-->
+                <m v="atm" zoom-min="17">
+                    <symbol src="assets:symbols/custom/money/atm2.svg" />
+                </m>
+                <m v="bank" zoom-min="17">
+                    <symbol src="assets:symbols/money/bank2.svg" />
+                </m>
+                <m v="fuel" zoom-min="17">
+                    <symbol src="assets:symbols/transport/fuel.svg" />
+                </m>
+                <m v="post_office" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/post_office.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="shop" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Tavern-->
+                <m v="cafe" zoom-min="17">
+                    <symbol src="assets:symbols/food/cafe.svg" />
+                </m>
+                <m v="bar" zoom-min="17">
+                    <symbol src="assets:symbols/food/bar.svg" />
+                </m>
+                <m v="fast_food" zoom-min="17">
+                    <symbol src="assets:symbols/food/fastfood.svg" />
+                </m>
+                <m v="pub" zoom-min="17">
+                    <symbol src="assets:symbols/food/pub.svg" />
+                </m>
+                <m v="restaurant" zoom-min="17">
+                    <symbol src="assets:symbols/food/restaurant.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="tavern" />
+                </m>
             </m>
         </m>
 
         <!-- historic -->
-        <m k="historic">
-            <symbol src="assets:symbols/tourist/monument.svg" />
+        <m k="historic" zoom-min="10">
+            <symbol src="assets:symbols/custom/tourist/monument.svg" />
 
             <m zoom-min="17">
-                <text use="poi" />
+                <text priority="7" use="entertainment" />
             </m>
         </m>
 
@@ -1132,250 +1305,151 @@
                     stroke-width="2.0" />
             </m>
 
-            <m v="halt|tram_stop">
+            <m v="halt|tram_stop" zoom-min="15">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="12" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
-            <m v="level_crossing">
-                <symbol src="assets:symbols/railway-crossing.svg" />
-            </m>
         </m>
 
-        <!-- aeroway -->
-        <m k="aeroway">
-            <m v="helipad" zoom-min="16">
-                <symbol src="assets:symbols/transport/helicopter.svg" />
+        <m k="shop" select="first">
+            <m v="bakery" zoom-min="17">
+                <symbol src="assets:symbols/shopping/bakery.svg" />
             </m>
-            <m v="aerodrome|airport" zoom-min="9">
-                <symbol src="assets:symbols/transport/airport2.svg" />
-            </m>
-        </m>
-
-        <m k="amenity">
-
-            <m select="first" zoom-min="15">
-                <m v="hospital">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m v="school">
-                    <symbol src="assets:symbols/education/school.svg" />
-                </m>
-                <m v="university|college">
-                    <symbol src="assets:symbols/education/university.svg" />
-                </m>
-                <m v="library">
-                    <symbol src="assets:symbols/amenity/library.svg" />
-                </m>
-                <m v="cinema">
-                    <symbol src="assets:symbols/tourist/cinema2.svg" />
-                </m>
-
-                <m select="when-matched">
-                    <text use="poi" />
-                </m>
-            </m>
-
-            <m select="first" zoom-min="16">
-                <m v="atm" zoom-min="17">
-                    <symbol src="assets:symbols/money/atm2.svg" />
-                </m>
-                <m v="cafe">
-                    <symbol src="assets:symbols/food/cafe.svg" />
-                </m>
-                <m v="pub">
-                    <symbol src="assets:symbols/food/pub.svg" />
-                </m>
-                <m v="bar">
-                    <symbol src="assets:symbols/food/bar.svg" />
-                </m>
-                <m v="fast_food">
-                    <symbol src="assets:symbols/food/fastfood.svg" />
-                </m>
-                <m v="restaurant">
-                    <symbol src="assets:symbols/food/restaurant.svg" />
-                </m>
-                <m v="bus_station">
-                    <symbol src="assets:symbols/transport/bus_station.svg" />
-                </m>
-                <m select="when-matched">
-                    <text use="poi" />
-                </m>
-            </m>
-
-            <m select="first" zoom-min="17">
-                <m v="bank">
-                    <symbol src="assets:symbols/money/bank2.svg" />
-                </m>
-                <!--<m v="bench">
-                    <symbol src="assets:symbols/bench.svg" />
-                </m>-->
-                <m v="bicycle_rental">
-                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
-                </m>
-                <m v="drinking_water">
-                    <symbol src="assets:symbols/food/drinkingtap.svg" />
-                </m>
-                <m v="fire_station">
-                    <symbol src="assets:symbols/amenity/firestation3.svg" />
-                </m>
-                <m v="fountain">
-                    <symbol src="assets:symbols/amenity/fountain2.svg" />
-                </m>
-                <m v="fuel">
-                    <symbol src="assets:symbols/transport/fuel.svg" />
-                </m>
-                <m v="kindergarten">
-                    <symbol src="assets:symbols/education/nursery3.svg" />
-                </m>
-                <m v="parking">
-                    <symbol src="assets:symbols/transport/parking.svg" />
-                </m>
-                <m v="pharmacy">
-                    <symbol src="assets:symbols/health/pharmacy.svg" />
-                </m>
-                <m v="place_of_worship">
-                    <m k="denomination|religion" v="buddhist">
-                        <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
-                    </m>
-                    <m k="denomination|religion" v="christian">
-                        <symbol src="assets:symbols/place_of_worship/christian.svg" />
-                    </m>
-                    <m k="denomination|religion" v="hindu">
-                        <symbol src="assets:symbols/place_of_worship/hindu.svg" />
-                    </m>
-                    <m k="denomination|religion" v="jewish">
-                        <symbol src="assets:symbols/place_of_worship/jewish.svg" />
-                    </m>
-                    <m k="denomination|religion" v="muslim|moslem">
-                        <symbol src="assets:symbols/place_of_worship/islamic.svg" />
-                    </m>
-                    <m k="denomination|religion" v="shinto">
-                        <symbol src="assets:symbols/place_of_worship/shinto.svg" />
-                    </m>
-                    <m k="denomination|religion" v="~|*">
-                        <symbol src="assets:symbols/place_of_worship/unknown.svg" />
-                    </m>
-                </m>
-                <m v="post_box">
-                    <symbol src="assets:symbols/amenity/post_box.svg" />
-                </m>
-                <m v="post_office">
-                    <symbol src="assets:symbols/amenity/post_office.svg" />
-                </m>
-                <m v="recycling">
-                    <symbol src="assets:symbols/amenity/recycling.svg" />
-                </m>
-                <m v="shelter">
-                    <symbol src="assets:symbols/accommodation/shelter2.svg" />
-                </m>
-                <m v="telephone">
-                    <symbol src="assets:symbols/amenity/telephone.svg" />
-                </m>
-                <m v="theatre">
-                    <symbol src="assets:symbols/tourist/theatre.svg" />
-                </m>
-                <m select="when-matched">
-                    <text use="poi" />
-                </m>
-            </m>
-
-            <m zoom-min="17">
-                <m v="toilets">
-                    <symbol src="assets:symbols/amenity/toilets.svg" />
-                </m>
-            </m>
-
-            <m zoom-min="15">
-                <text use="caption-small-blue" />
-            </m>
-        </m>
-
-        <m k="shop">
-            <m select="first" zoom-min="16">
-                <m v="bakery">
-                    <symbol src="assets:symbols/shopping/bakery.svg" />
-                </m>
-                <!--<m v="florist">
-                    <symbol src="assets:symbols/shopping/florist.svg" />
-                </m>-->
-                <!--<m v="hairdresser" zoom-min="16">
+            <!--<m v="florist" zoom-min="17">
+                <symbol src="assets:symbols/shopping/florist.svg" />
+            </m>-->
+            <!--<m v="hairdresser" zoom-min="16">
                     <symbol src="assets:symbols/shopping/hairdresser.svg" />
                 </m>-->
-                <m v="supermarket|organic">
-                    <symbol src="assets:symbols/shopping/supermarket.svg" />
-                </m>
-
-                <m zoom-min="17">
-                    <symbol src="assets:symbols/dot_magenta.svg" />
-                </m>
-
-                <m select="when-matched" zoom-min="17">
-                    <text use="poi" />
-                </m>
+            <m v="supermarket|organic" zoom-min="17">
+                <symbol src="assets:symbols/shopping/supermarket.svg" />
             </m>
-
-            <m zoom-min="15">
-                <text use="caption-small-blue" />
+            <m zoom-min="17">
+                <symbol src="assets:symbols/dot_magenta.svg" />
+            </m>
+            <m select="when-matched" zoom-min="17">
+                <text priority="9" use="shop" />
             </m>
         </m>
 
         <m k="tourism">
-            <m select="first" zoom-min="15">
-                <m v="alpine_hut">
+            <m select="first"> <!--Accomodation-->
+                <m v="alpine_hut" zoom-min="16">
                     <symbol src="assets:symbols/accommodation/alpinehut.svg" />
                 </m>
-                <m v="camp_site">
+                <m v="camp_site" zoom-min="17">
                     <symbol src="assets:symbols/accommodation/camping.svg" />
                 </m>
-                <m v="hostel">
+                <m v="hostel" zoom-min="17">
                     <symbol src="assets:symbols/accommodation/hostel.svg" />
                 </m>
-                <m v="hotel">
+                <m v="hotel" zoom-min="17">
                     <symbol src="assets:symbols/accommodation/hotel2.svg" />
                 </m>
-
-                <m select="when-matched">
-                    <text use="poi" />
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="accommodation" />
                 </m>
             </m>
-
-            <!-- <m zoom-min="16" select="first">
-              <m v="information" select="first">
-              <m k="name">
-              <symbol src="assets:symbols/tourist/information.svg" />
-              <text use="poi" />
+            <!-- <m v="information" zoom-min="17">
+              <m k="name" v="*">
+              <symbol src="assets:symbols/custom/tourist/information.svg" />
               </m>
-              <m>
-              <circle radius="1.5" fill="#ff0000" />
-              </m>
-              </m>
-              </m>
-            -->
-            <m v="viewpoint">
-                <symbol src="assets:symbols/tourist/view_point.svg" />
-            </m>
-            <m v="museum">
-                <symbol src="assets:symbols/tourist/museum.svg" />
-            </m>
-
-            <m zoom-min="15">
-                <text use="caption-small-blue" />
+            </m>-->
+            <m select="first"> <!--Entertainment-->
+                <m v="attraction" zoom-min="16">
+                    <symbol src="assets:symbols/custom/tourist/attraction.svg" />
+                </m>
+                <m v="museum" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/museum.svg" />
+                </m>
+                <m v="viewpoint" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/view_point.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="entertainment" />
+                </m>
             </m>
         </m>
 
-        <m k="natural" v="peak" zoom-min="12">
-            <symbol src="assets:symbols/peak.svg" />
-            <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
-                stroke-width="2.0" />
-            <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
-                stroke-width="2.0" />
+        <!--Match all buildings-->
+        <m k="building|building:part" zoom-min="17">
+            <text priority="9" use="caption-small-blue" />
+            <symbol src="assets:symbols/dot_blue_dark.svg" />
         </m>
+    </m>
 
-        <!-- house numbers -->
+    <m e="node" select="first">
+        <!--Only add house numbers where no name exist-->
         <m k="addr:housenumber" zoom-min="17">
-            <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
-                size="12" stroke="#ffffff" stroke-width="2.0" />
+            <m k="name" v="~">
+                <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
+                    priority="10" size="12" stroke="#ffffff" stroke-width="2.0" />
+            </m>
+        </m>
+
+        <m k="barrier">
+            <m zoom-min="16">
+                <m v="bollard">
+                    <symbol src="assets:symbols/barrier/bollard.svg" />
+                </m>
+                <m v="block">
+                    <symbol src="assets:symbols/barrier/blocks.svg" />
+                </m>
+                <m v="gate">
+                    <symbol src="assets:symbols/barrier/gate.svg" />
+                </m>
+                <m v="lift_gate">
+                    <symbol src="assets:symbols/barrier/lift_gate.svg" />
+                </m>
+            </m>
+        </m>
+
+        <m k="highway">
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
+            </m>
+            <m v="traffic_signals" zoom-min="17">
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
+            </m>
+            <!--<m v="turning_circle" zoom-min="15">-->
+            <!--<circle fill="#ffffff" radius="1.4" scale-radius="true" />-->
+            <!--</m>-->
+        </m>
+
+        <m k="natural">
+            <m select="first">
+                <m v="cave_entrance" zoom-min="15">
+                    <symbol src="assets:symbols/poi/cave.svg" />
+                    <m zoom-min="17">
+                        <text use="caption-small-blue" />
+                    </m>
+                </m>
+                <m v="peak" zoom-min="12">
+                    <symbol src="assets:symbols/peak.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+                <m v="volcano" zoom-min="12">
+                    <symbol src="assets:symbols/volcano.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+            </m>
+        </m>
+
+        <m k="railway">
+            <m v="crossing" zoom-min="16">
+                <symbol src="assets:symbols/railway-crossing-small.svg" />
+            </m>
+            <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
+            <m v="level_crossing" zoom-min="15">
+                <symbol src="assets:symbols/railway-crossing.svg" />
+            </m>
         </m>
     </m>
 
diff --git a/vtm-themes/resources/assets/vtm/mapzen.xml b/vtm-themes/resources/assets/vtm/mapzen.xml
index f7d51d9f..fd94b81f 100644
--- a/vtm-themes/resources/assets/vtm/mapzen.xml
+++ b/vtm-themes/resources/assets/vtm/mapzen.xml
@@ -1075,19 +1075,19 @@
         <!-- historic -->
         <m k="historic">
             <m v="memorial">
-                <symbol src="assets:symbols/tourist/memorial.svg" />
+                <symbol src="assets:symbols/custom/tourist/memorial.svg" />
             </m>
             <m v="monument">
-                <symbol src="assets:symbols/tourist/monument.svg" />
+                <symbol src="assets:symbols/custom/tourist/monument.svg" />
             </m>
             <m v="information">
-                <symbol src="assets:symbols/tourist/information.svg" />
+                <symbol src="assets:symbols/custom/tourist/information.svg" />
             </m>
             <m v="viewpoint">
-                <symbol src="assets:symbols/tourist/view_point.svg" />
+                <symbol src="assets:symbols/custom/tourist/view_point.svg" />
             </m>
             <m v="museum">
-                <symbol src="assets:symbols/tourist/museum.svg" />
+                <symbol src="assets:symbols/custom/tourist/museum.svg" />
             </m>
             <m zoom-min="17">
                 <text use="poi" />
@@ -1185,10 +1185,10 @@
                     <symbol src="assets:symbols/education/university.svg" />
                 </m>
                 <m v="library">
-                    <symbol src="assets:symbols/amenity/library.svg" />
+                    <symbol src="assets:symbols/custom/amenity/library.svg" />
                 </m>
                 <m v="cinema">
-                    <symbol src="assets:symbols/tourist/cinema2.svg" />
+                    <symbol src="assets:symbols/custom/tourist/cinema2.svg" />
                 </m>
 
                 <m select="when-matched">
@@ -1198,7 +1198,7 @@
 
             <m select="first" zoom-min="16">
                 <m v="atm" zoom-min="17">
-                    <symbol src="assets:symbols/money/atm2.svg" />
+                    <symbol src="assets:symbols/custom/money/atm2.svg" />
                 </m>
                 <m v="cafe">
                     <symbol src="assets:symbols/food/cafe.svg" />
@@ -1240,7 +1240,7 @@
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
                 <m v="fountain">
-                    <symbol src="assets:symbols/amenity/fountain2.svg" />
+                    <symbol src="assets:symbols/custom/amenity/fountain2.svg" />
                 </m>
                 <m v="fuel">
                     <symbol src="assets:symbols/transport/fuel.svg" />
@@ -1293,7 +1293,7 @@
                     <symbol src="assets:symbols/amenity/telephone.svg" />
                 </m>
                 <m v="theatre">
-                    <symbol src="assets:symbols/tourist/theatre.svg" />
+                    <symbol src="assets:symbols/custom/tourist/theatre.svg" />
                 </m>
                 <m select="when-matched">
                     <text use="poi" />
@@ -1302,7 +1302,7 @@
 
             <m zoom-min="17">
                 <m v="toilets">
-                    <symbol src="assets:symbols/amenity/toilets.svg" />
+                    <symbol src="assets:symbols/custom/amenity/toilets.svg" />
                 </m>
             </m>
         </m>
@@ -1356,7 +1356,7 @@
             <!-- <m zoom-min="16" select="first">
               <m v="information" select="first">
               <m k="name">
-              <symbol src="assets:symbols/tourist/information.svg" />
+              <symbol src="assets:symbols/custom/tourist/information.svg" />
               <text use="poi" />
               </m>
               <m>
@@ -1366,10 +1366,10 @@
               </m>
             -->
             <m v="viewpoint">
-                <symbol src="assets:symbols/tourist/view_point.svg" />
+                <symbol src="assets:symbols/custom/tourist/view_point.svg" />
             </m>
             <m v="museum">
-                <symbol src="assets:symbols/tourist/museum.svg" />
+                <symbol src="assets:symbols/custom/tourist/museum.svg" />
             </m>
 
         </m>
diff --git a/vtm-themes/resources/assets/vtm/newtron.xml b/vtm-themes/resources/assets/vtm/newtron.xml
index 7fcea827..c6a00b6c 100644
--- a/vtm-themes/resources/assets/vtm/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -3,31 +3,59 @@
     version="1" xmlns="http://opensciencemap.org/rendertheme"
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
-    <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="caption-small-blue"
-        k="name" size="14" stroke="#9930cfee" stroke-width="3.0" />
+    <!--###### TEXT styles ######-->
 
+    <!--default label-->
+    <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="caption-small-blue"
+        k="name" size="14" stroke="#995277e5" stroke-width="3.0" />
+    <!--shop-->
+    <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="shop" k="name" size="14"
+        stroke="#99ac39ac" stroke-width="3.0" />
+    <!--tavern-->
+    <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="tavern" k="name"
+        size="14" stroke="#999e6509" stroke-width="3.0" />
+    <!--accommodation-->
+    <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="accommodation" k="name"
+        size="14" stroke="#990092da" stroke-width="3.0" />
+    <!--education-->
+    <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="education" k="name"
+        size="14" stroke="#9939ac39" stroke-width="3.0" />
+    <!--health-->
+    <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="health" k="name"
+        size="14" stroke="#99da0092" stroke-width="3.0" />
+    <!--entertainment-->
+    <style-text style="italic" caption="true" dy="20" fill="#ee000000" id="entertainment" k="name"
+        size="14" stroke="#99ffb711" stroke-width="3.0" />
+    <!--roads-->
     <style-text style="bold" fill="#eeffee" id="road" k="name" priority="2" size="18"
         stroke="#606050" stroke-width="2.5" />
-
+    <!--major roads-->
     <style-text style="bold" fill="#de3935" id="major-road" k="name" priority="1" size="19"
         stroke="#f2df6d" stroke-width="2.5" />
-
+    <!--references-->
     <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
         stroke-width="2.0" />
     <style-text caption="true" id="ref-caption" use="ref" />
 
+
+    <!--###### AREA styles ######-->
+
+    <!--residential-->
     <style-area fade="10" fill="#ff0000" id="residential" />
-
+    <!--railway-->
     <style-area fade="10" fill="#f2eeef" id="railway|industrial" />
-    <!-- "#f0fae7" mint green -->
-    <style-area fade="11" fill="#fff8bf" id="farmland" />
 
+    <!--wood-->
     <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
     <style-area blend="11" blend-fill="#1b271e" fade="7" fill="#151806" id="forest|wood" />
 
     <!-- grass|meadow|garden|grassland|scrub -->
     <style-area fade="10" fill="#202f24" id="greens" />
 
+    <!--farmland-->
+    <!-- "#f0fae7" mint green -->
+    <style-area fade="11" fill="#fff8bf" id="farmland" />
+
     <!-- marsh|wetland|nature_reserve -->
     <style-area fade="12" fill="#2b4a36" id="greens2" />
 
@@ -39,28 +67,32 @@
 
     <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
     <style-area fade="10" fill="#ddddcc" id="quarry" />
-
+    <!--military-->
     <style-area fade="10" fill="#eeedea" id="military" />
+    <!--building-->
+    <style-area fade="15" fill="#ee202020" id="building" />
+
+    <!--water-->
+    <style-area fill="#001223" id="water" />
 
 
+    <!--###### LINE styles ######-->
+
+    <!--residential-->
     <style-line blur="1.0" fade="13" id="residential" stroke="#ffffff" width="1.0" />
     <style-line cap="butt" id="residential:bridge" use="residential" />
 
     <!-- when inheriting another style with 'from' then 'width' is meant relative to the parent -->
     <style-line id="pedestrian" use="residential" width="-0.4" />
     <style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
-
     <style-line blur="0.9" id="highway:z11" stroke="#de3935" width="1.8" />
     <!-- <style-line id="highway:z11:bridge" use="highway:z11" cap="butt" /> -->
-
     <style-line blur="0.9" cap="butt" id="trunk_link" stroke="#fee16e" width="1.3" />
     <style-line blur="0.9" id="trunk" stroke="#fedb52" width="1.6" />
     <style-line blur="0.9" id="primary:z11" stroke="#f2df6d" width="1.5" />
     <style-line id="secondary:z11" use="primary:z11" width="-0.1" />
-
     <style-line fade="11" id="tertiary" use="residential" width="0.2" />
     <style-line id="construction" stroke="#e0e0e0" width="1.2" />
-
     <style-line id="highway-service" use="residential" width="-0.6" />
 
     <!-- track|footway|path|cycleway -->
@@ -68,21 +100,25 @@
     <style-line fade="-1" fix="false" id="footway:z16" use="footway" width="-1.0" />
     <style-line id="footway:z17" stroke="#faf8f5" width="0.3" />
 
-    <!-- de: ein Weg der für Reiter vorgeshen ist.. -->
+    <!-- de: ein Weg der für Reiter vorgesehen ist.. -->
     <style-line cap="butt" id="bridleway" stroke="#d3cb98" width="0.4" />
 
     <style-line cap="butt" id="steps" stroke="#f1f0f4" width="0.25" />
 
-    <style-line cap="butt" id="water:outline" stroke="#647b8c" width="1.0" />
-    <style-line cap="butt" id="water" stroke="#cca4bbcc" width="0.6" />
-    <style-area fill="#001223" id="water" />
     <!-- no-go area boundary -->
     <style-line cap="butt" fix="true" id="fence" stroke="#444444" width="1.2" />
 
     <style-line blur="0.7" cap="butt" id="aeroway:runway" stroke="#008888" width="1.8" />
 
+    <!--building-->
     <style-line cap="butt" fix="true" id="building" stroke="#303030" width="1.0" />
-    <style-area fade="15" fill="#ee202020" id="building" />
+
+    <!--water-->
+    <style-line cap="butt" id="water:outline" stroke="#647b8c" width="1.0" />
+    <style-line cap="butt" id="water" stroke="#cca4bbcc" width="0.6" />
+
+
+    <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
         <area mesh="true" use="water" />
@@ -199,9 +235,6 @@
                 </m>
                 <m v="parking" zoom-min="14">
                     <area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
-                    <m zoom-min="17">
-                        <symbol src="assets:symbols/transport/parking.svg" />
-                    </m>
                 </m>
 
                 <m closed="yes" v="fountain">
@@ -510,7 +543,6 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <m v="apron">
                 <area fill="#050008" />
@@ -539,12 +571,14 @@
             <m zoom-min="17">
                 <extrusion line-color="#10ffffff" side-color="#cc202020" top-color="#cc404040" />
             </m>
-            <m zoom-min="17">
-                <m zoom-min="17">
-                    <text use="caption-small-blue" />
+
+            <!--Only add house numbers where no name exist-->
+            <m k="addr:housenumber" zoom-min="17">
+                <m k="name" v="~">
+                    <caption style="bold" fill="#ffffff" font-family="condensed"
+                        k="addr:housenumber" priority="10" size="12" stroke="#606060"
+                        stroke-width="2.0" />
                 </m>
-                <caption style="bold" fill="#ffffff" font-family="condensed" k="addr:housenumber"
-                    priority="10" size="12" stroke="#606060" stroke-width="2.0" />
             </m>
         </m>
 
@@ -999,16 +1033,16 @@
             <m v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt" /> </m>
             <m v="5"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt" /> </m> -->
             <m v="4">
-                <line cap="butt" fix="true" stroke="#8f80dd" width="1.2" />
+                <line cap="butt" fix="true" stroke="#8f80dd" width="2.0" />
             </m>
             <m v="3">
-                <line cap="butt" fix="true" stroke="#0000ff" width="1.0" />
+                <line cap="butt" fix="true" stroke="#0000ff" width="3.0" />
             </m>
             <m v="2">
-                <line blur="0.3" cap="butt" fix="true" stroke="#dddddd" width="1.0" />
+                <line blur="0.3" cap="butt" fix="true" stroke="#dddddd" width="3.0" />
             </m>
             <m v="1">
-                <line cap="butt" fix="true" stroke="#ff0000" width="0.95" />
+                <line cap="butt" fix="true" stroke="#ff0000" width="3.0" />
             </m>
 
         </m>
@@ -1052,7 +1086,8 @@
     </m>
 
 
-    <m e="node" select="first">
+    <!--All POIs and WAYs with names-->
+    <m k="name" select="first">
 
         <m k="aeroway">
             <m v="helipad" zoom-min="17">
@@ -1061,61 +1096,22 @@
             <m v="aerodrome|airport" zoom-max="13" zoom-min="9">
                 <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
+            <m k="name" zoom-min="16">
+                <text use="caption-small-blue" />
+            </m>
         </m>
 
         <m k="amenity">
             <m select="first">
-                <m v="atm" zoom-min="17">
-                    <symbol src="assets:symbols/money/atm2.svg" />
-                </m>
-                <m v="bank" zoom-min="17">
-                    <symbol src="assets:symbols/money/bank2.svg" />
-                </m>
                 <!--<m v="bench" zoom-min="17">
                     <symbol src="assets:symbols/bench.svg" />
                 </m>-->
-                <m v="bicycle_rental" zoom-min="17">
-                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
-                </m>
-                <m v="bus_station" zoom-min="17">
-                    <symbol src="assets:symbols/transport/bus_station.svg" />
-                </m>
-                <m v="cafe" zoom-min="17">
-                    <symbol src="assets:symbols/food/cafe.svg" />
-                </m>
-                <m v="cinema" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/cinema2.svg" />
-                </m>
                 <m v="drinking_water" zoom-min="17">
                     <symbol src="assets:symbols/food/drinkingtap.svg" />
                 </m>
-                <m v="fast_food" zoom-min="17">
-                    <symbol src="assets:symbols/food/fastfood.svg" />
-                </m>
                 <m v="fire_station" zoom-min="17">
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
-                <m v="fountain" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/fountain2.svg" />
-                </m>
-                <m v="fuel" zoom-min="17">
-                    <symbol src="assets:symbols/transport/fuel.svg" />
-                </m>
-                <m v="hospital" zoom-min="15">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m v="kindergarten" zoom-min="17">
-                    <symbol src="assets:symbols/education/nursery3.svg" />
-                </m>
-                <m v="library" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/library.svg" />
-                </m>
-                <m v="parking" zoom-min="17">
-                    <symbol src="assets:symbols/transport/parking.svg" />
-                </m>
-                <m v="pharmacy" zoom-min="17">
-                    <symbol src="assets:symbols/health/pharmacy.svg" />
-                </m>
                 <m v="place_of_worship" zoom-min="17">
                     <m k="denomination|religion" v="buddhist">
                         <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
@@ -1142,68 +1138,128 @@
                 <m v="post_box" zoom-min="17">
                     <symbol src="assets:symbols/amenity/post_box.svg" />
                 </m>
-                <m v="post_office" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/post_office.svg" />
-                </m>
-                <m v="pub|bar" zoom-min="17">
-                    <symbol src="assets:symbols/food/bar.svg" />
-                </m>
                 <m v="recycling" zoom-min="17">
                     <symbol src="assets:symbols/amenity/recycling.svg" />
                 </m>
-                <m v="restaurant" zoom-min="17">
-                    <symbol src="assets:symbols/food/restaurant.svg" />
-                </m>
-                <m v="school" zoom-min="17">
-                    <symbol src="assets:symbols/education/school.svg" />
-                </m>
                 <m v="shelter" zoom-min="17">
                     <symbol src="assets:symbols/accommodation/shelter2.svg" />
                 </m>
                 <m v="telephone" zoom-min="17">
                     <symbol src="assets:symbols/amenity/telephone.svg" />
                 </m>
-                <m v="theatre" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/theatre.svg" />
-                </m>
                 <m v="toilets" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/toilets.svg" />
+                    <symbol src="assets:symbols/custom/amenity/toilets.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="caption-small-blue" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Accomodation-->
+                <m v="parking" zoom-min="17">
+                    <symbol src="assets:symbols/transport/parking.svg" />
+                </m>
+                <m v="bicycle_rental" zoom-min="17">
+                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
+                </m>
+                <m v="bus_station" zoom-min="17">
+                    <symbol src="assets:symbols/transport/bus_station.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="accommodation" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Education-->
+                <m v="kindergarten" zoom-min="17">
+                    <symbol src="assets:symbols/education/nursery3.svg" />
+                </m>
+                <m v="library" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/library.svg" />
+                </m>
+                <m v="school" zoom-min="17">
+                    <symbol src="assets:symbols/education/school.svg" />
                 </m>
                 <m v="university|college" zoom-min="17">
                     <symbol src="assets:symbols/education/university.svg" />
                 </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="education" />
+                </m>
             </m>
-            <m zoom-min="17">
-                <text use="caption-small-blue" />
-            </m>
-        </m>
 
-        <m k="barrier">
-            <m zoom-min="16">
-                <m v="bollard">
-                    <symbol src="assets:symbols/barrier/bollard.svg" />
+            <m select="first"> <!--Entertainment-->
+                <m v="cinema" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/cinema2.svg" />
+                </m>
+                <m v="fountain" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/fountain2.svg" />
+                </m>
+                <m v="theatre" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/theatre.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="entertainment" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Health-->
+                <m v="hospital" zoom-min="15">
+                    <symbol src="assets:symbols/health/hospital.svg" />
+                </m>
+                <m v="pharmacy" zoom-min="17">
+                    <symbol src="assets:symbols/health/pharmacy.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="health" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Shop-->
+                <m v="atm" zoom-min="17">
+                    <symbol src="assets:symbols/custom/money/atm2.svg" />
+                </m>
+                <m v="bank" zoom-min="17">
+                    <symbol src="assets:symbols/money/bank2.svg" />
+                </m>
+                <m v="fuel" zoom-min="17">
+                    <symbol src="assets:symbols/transport/fuel.svg" />
+                </m>
+                <m v="post_office" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/post_office.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="shop" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Tavern-->
+                <m v="cafe" zoom-min="17">
+                    <symbol src="assets:symbols/food/cafe.svg" />
+                </m>
+                <m v="bar" zoom-min="17">
+                    <symbol src="assets:symbols/food/bar.svg" />
+                </m>
+                <m v="fast_food" zoom-min="17">
+                    <symbol src="assets:symbols/food/fastfood.svg" />
+                </m>
+                <m v="pub" zoom-min="17">
+                    <symbol src="assets:symbols/food/pub.svg" />
+                </m>
+                <m v="restaurant" zoom-min="17">
+                    <symbol src="assets:symbols/food/restaurant.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="tavern" />
                 </m>
             </m>
         </m>
 
-        <m k="highway">
-            <m v="bus_stop" zoom-min="16">
-                <symbol src="assets:symbols/dot_blue.svg" />
-            </m>
-            <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/transport/traffic_lights.svg" />
-            </m>
-            <m v="turning_circle">
-                <circle fill="#ffffff" radius="1.4" scale-radius="true" />
-            </m>
-        </m>
-
-
-        <m k="historic">
-            <symbol src="assets:symbols/tourist/monument.svg" />
+        <m k="historic" zoom-min="10">
+            <symbol src="assets:symbols/custom/tourist/monument.svg" />
 
             <m zoom-min="17">
-                <text use="caption-small-blue" />
+                <text priority="7" use="entertainment" />
             </m>
         </m>
 
@@ -1214,36 +1270,9 @@
 
 
         <m k="man_made" v="windmill" zoom-min="17">
-            <symbol src="assets:symbols/tourist/windmill.svg" />
+            <symbol src="assets:symbols/custom/tourist/windmill.svg" />
         </m>
 
-
-        <m k="natural">
-            <m select="first">
-                <m v="cave_entrance" zoom-min="15">
-                    <symbol src="assets:symbols/poi/cave.svg" />
-                    <m zoom-min="17">
-                        <text use="caption-small-blue" />
-                    </m>
-                </m>
-                <m v="peak" zoom-min="12">
-                    <symbol src="assets:symbols/peak.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
-                        stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
-                        stroke-width="2.0" />
-                </m>
-                <m v="volcano" zoom-min="12">
-                    <symbol src="assets:symbols/volcano.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
-                        stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
-                        stroke-width="2.0" />
-                </m>
-            </m>
-        </m>
-
-
         <m k="place" select="first">
             <m v="locality" zoom-min="13">
                 <caption style="bold" fill="#606060" k="name" size="14" stroke="#ffffff"
@@ -1272,19 +1301,14 @@
         </m>
 
 
+        <!-- railway -->
         <m k="railway">
-            <m v="crossing" zoom-min="16">
-                <symbol src="assets:symbols/railway-crossing-small.svg" />
-            </m>
-            <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
-            <m v="level_crossing" zoom-min="14">
-                <symbol src="assets:symbols/railway-crossing.svg" />
-            </m>
             <m v="station" zoom-min="14">
                 <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
+
             <m v="halt|tram_stop" zoom-min="15">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="12" stroke="#ffffff"
@@ -1293,55 +1317,144 @@
         </m>
 
 
-        <m k="shop">
+        <m k="shop" select="first">
             <m v="bakery" zoom-min="17">
                 <symbol src="assets:symbols/shopping/bakery.svg" />
             </m>
             <!--<m v="florist" zoom-min="17">
                 <symbol src="assets:symbols/shopping/florist.svg" />
             </m>-->
+            <!--<m v="hairdresser" zoom-min="16">
+                    <symbol src="assets:symbols/shopping/hairdresser.svg" />
+                </m>-->
             <m v="supermarket|organic" zoom-min="17">
                 <symbol src="assets:symbols/shopping/supermarket.svg" />
             </m>
-
             <m zoom-min="17">
-                <text use="caption-small-blue" />
+                <symbol src="assets:symbols/dot_magenta.svg" />
+            </m>
+            <m select="when-matched" zoom-min="17">
+                <text priority="9" use="shop" />
             </m>
         </m>
 
 
         <m k="tourism">
-            <m v="alpine_hut" zoom-min="16">
-                <symbol src="assets:symbols/accommodation/alpinehut.svg" />
-            </m>
-            <m v="camp_site" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/camping.svg" />
-            </m>
-            <m v="hostel" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/hostel.svg" />
-            </m>
-            <m v="hotel" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/hotel2.svg" />
+            <m select="first"> <!--Accomodation-->
+                <m v="alpine_hut" zoom-min="16">
+                    <symbol src="assets:symbols/accommodation/alpinehut.svg" />
+                </m>
+                <m v="camp_site" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/camping.svg" />
+                </m>
+                <m v="hostel" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/hostel.svg" />
+                </m>
+                <m v="hotel" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/hotel2.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="accommodation" />
+                </m>
             </m>
             <!-- <m v="information" zoom-min="17">
               <m k="name" v="*">
-              <symbol src="assets:symbols/tourist/information.svg" />
+              <symbol src="assets:symbols/custom/tourist/information.svg" />
               </m>
             </m>-->
-            <m v="viewpoint" zoom-min="15">
-                <symbol src="assets:symbols/tourist/view_point.svg" />
-            </m>
-
-            <m zoom-min="17">
-                <text use="caption-small-blue" />
+            <m select="first"> <!--Entertainment-->
+                <m v="attraction" zoom-min="16">
+                    <symbol src="assets:symbols/custom/tourist/attraction.svg" />
+                </m>
+                <m v="museum" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/museum.svg" />
+                </m>
+                <m v="viewpoint" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/view_point.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="entertainment" />
+                </m>
             </m>
         </m>
 
+        <!--Match all missed buildings-->
+        <m k="building|building:part" zoom-min="17">
+            <text priority="9" use="caption-small-blue" />
+            <symbol src="assets:symbols/dot_blue_dark.svg" />
+        </m>
+    </m>
 
-        <!-- house numbers -->
+    <m e="node" select="first">
+        <!--Only add house numbers where no name exist-->
         <m k="addr:housenumber" zoom-min="17">
-            <caption style="bold" fill="#ffffff" font-family="condensed" k="addr:housenumber"
-                size="12" stroke="#606060" stroke-width="2.0" />
+            <m k="name" v="~">
+                <caption style="bold" fill="#ffffff" font-family="condensed" k="addr:housenumber"
+                    priority="10" size="12" stroke="#606060" stroke-width="2.0" />
+            </m>
+        </m>
+
+        <m k="barrier">
+            <m zoom-min="16">
+                <m v="bollard">
+                    <symbol src="assets:symbols/barrier/bollard.svg" />
+                </m>
+                <m v="block">
+                    <symbol src="assets:symbols/barrier/blocks.svg" />
+                </m>
+                <m v="gate">
+                    <symbol src="assets:symbols/barrier/gate.svg" />
+                </m>
+                <m v="lift_gate">
+                    <symbol src="assets:symbols/barrier/lift_gate.svg" />
+                </m>
+            </m>
+        </m>
+
+        <m k="highway">
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
+            </m>
+            <m v="traffic_signals" zoom-min="17">
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
+            </m>
+            <!--<m v="turning_circle" zoom-min="15">-->
+            <!--<circle fill="#ffffff" radius="1.4" scale-radius="true" />-->
+            <!--</m>-->
+        </m>
+
+        <m k="natural">
+            <m select="first">
+                <m v="cave_entrance" zoom-min="15">
+                    <symbol src="assets:symbols/poi/cave.svg" />
+                    <m zoom-min="17">
+                        <text use="caption-small-blue" />
+                    </m>
+                </m>
+                <m v="peak" zoom-min="12">
+                    <symbol src="assets:symbols/peak.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+                <m v="volcano" zoom-min="12">
+                    <symbol src="assets:symbols/volcano.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+            </m>
+        </m>
+
+        <m k="railway">
+            <m v="level_crossing" zoom-min="15">
+                <symbol src="assets:symbols/railway-crossing.svg" />
+            </m>
+            <m v="crossing" zoom-min="16">
+                <symbol src="assets:symbols/railway-crossing-small.svg" />
+            </m>
         </m>
     </m>
 
diff --git a/vtm-themes/resources/assets/vtm/openmaptiles.xml b/vtm-themes/resources/assets/vtm/openmaptiles.xml
index 0172a5af..fec760d8 100644
--- a/vtm-themes/resources/assets/vtm/openmaptiles.xml
+++ b/vtm-themes/resources/assets/vtm/openmaptiles.xml
@@ -3,33 +3,51 @@
     version="1" xmlns="http://opensciencemap.org/rendertheme"
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
-    <!-- base style for fixed width lines -->
-    <style-line cap="butt" fix="true" id="fix" width="1.0" />
+    <!--###### TEXT styles ######-->
 
+    <!--default label-->
     <style-text caption="true" dy="20" fill="#2d51bc" font-family="medium" id="caption-small-blue"
         k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
-
+    <!--shop-->
+    <style-text caption="true" dy="20" fill="#ac39ac" font-family="medium" id="shop" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--tavern-->
+    <style-text caption="true" dy="20" fill="#734a08" font-family="medium" id="tavern" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--accommodation-->
+    <style-text caption="true" dy="20" fill="#0092da" font-family="medium" id="accommodation"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--education-->
+    <style-text caption="true" dy="20" fill="#0a4f0a" font-family="medium" id="education" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--health-->
+    <style-text caption="true" dy="20" fill="#da0092" font-family="medium" id="health" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--other POIs-->
+    <style-text caption="true" dy="20" fill="#404000" id="poi" k="name" size="16" stroke="#aaffffff"
+        stroke-width="2.0" />
+    <!--roads-->
     <style-text fill="#101010" id="road" k="name" priority="2" size="16" stroke="#eeeeee"
         stroke-width="2.0" />
-
+    <!--major roads-->
     <style-text style="bold" fill="#101010" id="major-road" k="name" priority="1" size="16"
         stroke="#eeeeee" stroke-width="2.0" />
-
+    <!--references-->
     <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
         stroke-width="2.0" />
     <style-text caption="true" id="ref-caption" use="ref" />
-
+    <!--ferry-->
     <style-text style="bold" fill="#606060" id="ferry" k="name" size="12" stroke="#ffffff"
         stroke-width="2.0" />
 
-    <style-text caption="true" dy="20" fill="#404000" id="poi" k="name" size="16" stroke="#aaffffff"
-        stroke-width="2.0" />
 
+    <!--###### AREA styles ######-->
+
+    <!--residential-->
     <style-area fade="11" fill="#e8e7e3" id="residential" />
-
+    <!--railway-->
     <style-area fade="10" fill="#e6e3e5" id="railway|industrial" />
 
-
     <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
     <!-- src="assets:textures/wood.png" -->
     <!-- <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" /> -->
@@ -45,6 +63,7 @@
     <!-- grassland|scrub -->
     <style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
 
+    <!--farmland-->
     <style-area fade="12" fill="#e4dab5" id="farmland" stroke="#d1dbc7" stroke-width="1.0"
         use="tex1" />
 
@@ -60,21 +79,40 @@
     <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
     <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
 
-    <!-- <style-area id="park" fill="#a3ca7b" fade="11" /> -->
-    <style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
-
     <!-- de:Kleingartengebiet -->
     <style-area fade="12" fill="#efeae0" id="allotments" use="tex1" />
 
     <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
     <style-area fade="10" fill="#ddddcc" id="quarry" />
+
+    <!--military-->
     <style-area fade="10" fill="#eeedea" id="military" />
+    <!--building-->
+    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+    <!--<style-area id="building" fill="#e9e6e3" fade="15"/>-->
+
+    <!--water-->
+    <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
+    <!-- src="assets:textures/water.png" -->
+    <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
+
+
+    <!--###### LINE styles ######-->
+
+    <!-- <style-area id="park" fill="#a3ca7b" fade="11" /> -->
+    <style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
+
+    <!-- base style for fixed width lines -->
+    <style-line cap="butt" fix="true" id="fix" width="1.0" />
+
+    <!--residential-->
     <style-line id="residential" stroke="#ffffff" width="1.3" />
     <style-line cap="butt" id="residential:bridge" use="residential" />
 
     <!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
     <style-line id="pedestrian" use="residential" width="-0.4" />
     <style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
+
     <style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
     <!-- <style-line id="highway:z11:bridge" use="highway:z11" cap="butt" /> -->
     <style-line cap="butt" id="trunk_link" stroke="#fee16e" width="1.3" />
@@ -95,41 +133,39 @@
     <!-- <style-line id="footway:z16" use="footway" width="-0.95" fixed="false" fade="-1"/> -->
     <style-line id="footway:z17" stroke="#faf8f5" width="0.3" />
 
-    <!-- de: ein Weg der für Reiter vorgeshen ist.. -->
+    <!-- de: ein Weg der für Reiter vorgesehen ist.. -->
     <style-line cap="butt" id="bridleway" stipple-stroke="#837b58" stroke="#d3cb98" use="footway"
         width="0.1" />
     <style-line cap="butt" fix="true" id="steps" stipple="2" stipple-stroke="#be6253"
         stipple-width="1.0" stroke="#aaffffff" width="4.2" />
     <style-line cap="butt" fix="true" id="water:outline" stroke="#a4bbcc" width="1.0" />
 
+    <!--water-->
     <style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
     <style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
 
-    <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
-    <!-- src="assets:textures/water.png" -->
-    <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
-
     <!-- no-go area boundary -->
     <style-line cap="butt" fix="true" id="fence" stroke="#444444" width="1.2" />
     <style-line cap="butt" id="aeroway:runway" stroke="#c8ccbe" width="1.8" />
 
+    <!--building-->
     <!-- <style-line id="building" stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/> -->
-    <!-- <style-line id="building" stroke="#d0cec8" width="1.0" fix="true" cap="butt" fade="15"/>
-      <style-area id="building" fill="#e9e6e3" fade="15"/> -->
-
+    <!-- <style-line id="building" stroke="#d0cec8" width="1.0" fix="true" cap="butt" fade="15"/> -->
     <style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
-    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+
+
+    <!--###### ASSIGNMENT ######-->
 
     <!-- boundary -->
     <m e="way" k="layer" v="boundary">
         <m k="admin_level">
             <m v="4">
                 <line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0"
-                    stroke="#dadada" width="1.3" />
+                    stroke="#dadada" width="2.0" />
             </m>
             <m v="2">
                 <line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="1.0"
-                    stroke="#dadada" width="1.6" />
+                    stroke="#bbbbbb" width="2.5" />
             </m>
         </m>
     </m>
@@ -400,10 +436,10 @@
             </m>
 
             <m v="viewpoint">
-                <symbol src="assets:symbols/tourist/view_point.svg" />
+                <symbol src="assets:symbols/custom/tourist/view_point.svg" />
             </m>
             <m v="museum">
-                <symbol src="assets:symbols/tourist/museum.svg" />
+                <symbol src="assets:symbols/custom/tourist/museum.svg" />
             </m>
 
             <m zoom-min="14">
diff --git a/vtm-themes/resources/assets/vtm/osmagray.xml b/vtm-themes/resources/assets/vtm/osmagray.xml
index 64fd143e..0bb5f658 100644
--- a/vtm-themes/resources/assets/vtm/osmagray.xml
+++ b/vtm-themes/resources/assets/vtm/osmagray.xml
@@ -3,23 +3,54 @@
     version="1" xmlns="http://opensciencemap.org/rendertheme"
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
+    <!--###### TEXT styles ######-->
+
+    <!--default label-->
+    <style-text caption="true" dy="20" fill="#4d4d4d" font-family="medium" id="caption-small-blue"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--shop-->
+    <style-text caption="true" dy="20" fill="#4d4d4d" font-family="medium" id="shop" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--tavern-->
+    <style-text caption="true" dy="20" fill="#4d4d4d" font-family="medium" id="tavern" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--accommodation-->
+    <style-text caption="true" dy="20" fill="#4d4d4d" font-family="medium" id="accommodation"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--education-->
+    <style-text caption="true" dy="20" fill="#4d4d4d" font-family="medium" id="education" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--health-->
+    <style-text caption="true" dy="20" fill="#4d4d4d" font-family="medium" id="health" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--entertainment-->
+    <style-text caption="true" dy="20" fill="#4d4d4d" font-family="medium" id="entertainment"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--roads-->
+    <style-text style="bold" id="highway-road" k="name" size="16" stroke="#d0d0d0"
+        stroke-width="2.0" />
+    <style-text style="bold" id="highway-track" k="name" size="16" stroke="#f3f3f3"
+        stroke-width="2.0" />
+    <!--references-->
+    <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
+        stroke-width="2.0" />
+    <style-text caption="true" id="ref-caption" use="ref" />
+
+
+    <!--###### AREA styles ######-->
+    <!--no styles-->
+
+
+    <!--###### LINE styles ######-->
+
     <style-line id="trunk" stroke="#b4b4b4" width="1.5" />
     <style-line id="motorway" stroke="#979797" width="1.7" />
     <style-line id="primary" stroke="#868686" width="1.5" />
     <style-line id="secondary" stroke="#c6c6c6" width="1.4" />
     <style-line id="tertiary" stroke="#f7f7f7" width="1.15" />
 
-    <style-text caption="true" dy="20" fill="#4d4d4d" font-family="medium" id="caption-small-blue"
-        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
 
-    <style-text style="bold" id="highway-road" k="name" size="16" stroke="#d0d0d0"
-        stroke-width="2.0" />
-    <style-text style="bold" id="highway-track" k="name" size="16" stroke="#f3f3f3"
-        stroke-width="2.0" />
-
-    <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
-        stroke-width="2.0" />
-    <style-text caption="true" id="ref-caption" use="ref" />
+    <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
         <area fill="#d0d0d0" mesh="true" />
@@ -118,28 +149,10 @@
                     <m k="access" v="private" zoom-min="15">
                         <area src="assets:patterns/access-private.png" />
                     </m>
-                    <m zoom-min="17">
-                        <symbol src="assets:symbols/transport/parking.svg" />
-                    </m>
                 </m>
                 <m closed="yes" v="fountain">
                     <area fill="#d0d0d0" stroke="#080808" stroke-width="0.15" />
-                    <m zoom-min="17">
-                        <symbol src="assets:symbols/amenity/fountain2.svg" />
-                    </m>
                 </m>
-                <m v="hospital" zoom-min="15">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m v="theatre" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/theatre.svg" />
-                </m>
-                <m v="toilets" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/toilets.svg" />
-                </m>
-            </m>
-            <m k="name" zoom-min="17">
-                <text use="caption-small-blue" />
             </m>
         </m>
 
@@ -294,10 +307,6 @@
             <m v="zoo|picnic_site|caravan_site|camp_site">
                 <area fill="#e2e2e2" stroke="#acacac" stroke-width="0.2" />
             </m>
-
-            <m k="name" zoom-min="16">
-                <text use="caption-small-blue" />
-            </m>
         </m>
 
 
@@ -433,7 +442,6 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <m v="apron">
                 <area fill="#f0f0f0" />
@@ -448,10 +456,6 @@
               <m v="taxiway">
               <line stroke="#000000" width="2.7" cap="butt" />
               </m> -->
-
-            <m k="name" zoom-min="16">
-                <text use="caption-small-blue" />
-            </m>
         </m>
     </m>
 
@@ -557,10 +561,13 @@
                 <extrusion line-color="#cc616161" side-color="#bbd9d9d9" top-color="#ccdddddd" />
             </m>
 
-            <m zoom-min="17">
-                <text priority="9" use="caption-small-blue" />
-                <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
-                    priority="10" size="12" stroke="#ffffff" stroke-width="2.0" />
+            <!--Only add house numbers where no name exist-->
+            <m k="addr:housenumber" zoom-min="17">
+                <m k="name" v="~">
+                    <caption style="bold" fill="#606060" font-family="condensed"
+                        k="addr:housenumber" priority="10" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
             </m>
         </m>
 
@@ -1106,7 +1113,8 @@
     </m>
 
 
-    <m e="node" select="first">
+    <!--All POIs and WAYs with names-->
+    <m k="name" select="first">
 
         <m k="aeroway">
             <m v="helipad" zoom-min="17">
@@ -1115,61 +1123,22 @@
             <m v="aerodrome|airport" zoom-max="13" zoom-min="9">
                 <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
+            <m k="name" zoom-min="16">
+                <text use="caption-small-blue" />
+            </m>
         </m>
 
         <m k="amenity">
             <m select="first">
-                <m v="atm" zoom-min="17">
-                    <symbol src="assets:symbols/money/atm2.svg" />
-                </m>
-                <m v="bank" zoom-min="17">
-                    <symbol src="assets:symbols/money/bank2.svg" />
-                </m>
                 <!--<m v="bench" zoom-min="17">
                     <symbol src="assets:symbols/bench.svg" />
                 </m>-->
-                <m v="bicycle_rental" zoom-min="17">
-                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
-                </m>
-                <m v="bus_station" zoom-min="17">
-                    <symbol src="assets:symbols/transport/bus_station.svg" />
-                </m>
-                <m v="cafe" zoom-min="17">
-                    <symbol src="assets:symbols/food/cafe.svg" />
-                </m>
-                <m v="cinema" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/cinema2.svg" />
-                </m>
                 <m v="drinking_water" zoom-min="17">
                     <symbol src="assets:symbols/food/drinkingtap.svg" />
                 </m>
-                <m v="fast_food" zoom-min="17">
-                    <symbol src="assets:symbols/food/fastfood.svg" />
-                </m>
                 <m v="fire_station" zoom-min="17">
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
-                <m v="fountain" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/fountain2.svg" />
-                </m>
-                <m v="fuel" zoom-min="17">
-                    <symbol src="assets:symbols/transport/fuel.svg" />
-                </m>
-                <m v="hospital" zoom-min="15">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m v="kindergarten" zoom-min="17">
-                    <symbol src="assets:symbols/education/nursery3.svg" />
-                </m>
-                <m v="library" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/library.svg" />
-                </m>
-                <m v="parking" zoom-min="17">
-                    <symbol src="assets:symbols/transport/parking.svg" />
-                </m>
-                <m v="pharmacy" zoom-min="17">
-                    <symbol src="assets:symbols/health/pharmacy.svg" />
-                </m>
                 <m v="place_of_worship" zoom-min="17">
                     <m k="denomination|religion" v="buddhist">
                         <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
@@ -1196,108 +1165,139 @@
                 <m v="post_box" zoom-min="17">
                     <symbol src="assets:symbols/amenity/post_box.svg" />
                 </m>
-                <m v="post_office" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/post_office.svg" />
-                </m>
-                <m v="pub|bar" zoom-min="17">
-                    <symbol src="assets:symbols/food/bar.svg" />
-                </m>
                 <m v="recycling" zoom-min="17">
                     <symbol src="assets:symbols/amenity/recycling.svg" />
                 </m>
-                <m v="restaurant" zoom-min="17">
-                    <symbol src="assets:symbols/food/restaurant.svg" />
-                </m>
-                <m v="school" zoom-min="17">
-                    <symbol src="assets:symbols/education/school.svg" />
-                </m>
                 <m v="shelter" zoom-min="17">
                     <symbol src="assets:symbols/accommodation/shelter2.svg" />
                 </m>
                 <m v="telephone" zoom-min="17">
                     <symbol src="assets:symbols/amenity/telephone.svg" />
                 </m>
-                <m v="theatre" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/theatre.svg" />
-                </m>
                 <m v="toilets" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/toilets.svg" />
+                    <symbol src="assets:symbols/custom/amenity/toilets.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="caption-small-blue" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Accomodation-->
+                <m v="parking" zoom-min="17">
+                    <symbol src="assets:symbols/transport/parking.svg" />
+                </m>
+                <m v="bicycle_rental" zoom-min="17">
+                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
+                </m>
+                <m v="bus_station" zoom-min="17">
+                    <symbol src="assets:symbols/transport/bus_station.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="accommodation" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Education-->
+                <m v="kindergarten" zoom-min="17">
+                    <symbol src="assets:symbols/education/nursery3.svg" />
+                </m>
+                <m v="library" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/library.svg" />
+                </m>
+                <m v="school" zoom-min="17">
+                    <symbol src="assets:symbols/education/school.svg" />
                 </m>
                 <m v="university|college" zoom-min="17">
                     <symbol src="assets:symbols/education/university.svg" />
                 </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="education" />
+                </m>
             </m>
-            <m zoom-min="17">
-                <text use="caption-small-blue" />
-            </m>
-        </m>
 
-        <m k="barrier">
-            <m zoom-min="16">
-                <m v="bollard">
-                    <symbol src="assets:symbols/barrier/bollard.svg" />
+            <m select="first"> <!--Entertainment-->
+                <m v="cinema" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/cinema2.svg" />
+                </m>
+                <m v="fountain" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/fountain2.svg" />
+                </m>
+                <m v="theatre" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/theatre.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="entertainment" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Health-->
+                <m v="hospital" zoom-min="15">
+                    <symbol src="assets:symbols/health/hospital.svg" />
+                </m>
+                <m v="pharmacy" zoom-min="17">
+                    <symbol src="assets:symbols/health/pharmacy.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="health" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Shop-->
+                <m v="atm" zoom-min="17">
+                    <symbol src="assets:symbols/custom/money/atm2.svg" />
+                </m>
+                <m v="bank" zoom-min="17">
+                    <symbol src="assets:symbols/money/bank2.svg" />
+                </m>
+                <m v="fuel" zoom-min="17">
+                    <symbol src="assets:symbols/transport/fuel.svg" />
+                </m>
+                <m v="post_office" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/post_office.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="shop" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Tavern-->
+                <m v="cafe" zoom-min="17">
+                    <symbol src="assets:symbols/food/cafe.svg" />
+                </m>
+                <m v="bar" zoom-min="17">
+                    <symbol src="assets:symbols/food/bar.svg" />
+                </m>
+                <m v="fast_food" zoom-min="17">
+                    <symbol src="assets:symbols/food/fastfood.svg" />
+                </m>
+                <m v="pub" zoom-min="17">
+                    <symbol src="assets:symbols/food/pub.svg" />
+                </m>
+                <m v="restaurant" zoom-min="17">
+                    <symbol src="assets:symbols/food/restaurant.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="tavern" />
                 </m>
             </m>
         </m>
 
-        <m k="highway">
-            <m v="bus_stop" zoom-min="16">
-                <symbol src="assets:symbols/dot_blue.svg" />
-            </m>
-            <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/transport/traffic_lights.svg" />
-            </m>
-            <m v="turning_circle">
-                <circle fill="#ffffff" radius="1.4" scale-radius="true" />
-            </m>
-        </m>
-
-
-        <m k="historic">
-            <symbol src="assets:symbols/tourist/monument.svg" />
+        <m k="historic" zoom-min="10">
+            <symbol src="assets:symbols/custom/tourist/monument.svg" />
 
             <m zoom-min="17">
-                <text use="caption-small-blue" />
+                <text priority="7" use="entertainment" />
             </m>
         </m>
 
-
         <m k="leisure" v="playground" zoom-min="17">
             <symbol src="assets:symbols/amenity/playground.svg" />
         </m>
 
-
         <m k="man_made" v="windmill" zoom-min="17">
-            <symbol src="assets:symbols/tourist/windmill.svg" />
+            <symbol src="assets:symbols/custom/tourist/windmill.svg" />
         </m>
 
-
-        <m k="natural">
-            <m select="first">
-                <m v="cave_entrance" zoom-min="15">
-                    <symbol src="assets:symbols/poi/cave.svg" />
-                    <m zoom-min="17">
-                        <text use="caption-small-blue" />
-                    </m>
-                </m>
-                <m v="peak" zoom-min="12">
-                    <symbol src="assets:symbols/peak.svg" />
-                    <caption style="bold" dy="12" fill="#323232" k="name" size="14" stroke="#ffffff"
-                        stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#323232" k="ele" size="12" stroke="#ffffff"
-                        stroke-width="2.0" />
-                </m>
-                <m v="volcano" zoom-min="12">
-                    <symbol src="assets:symbols/volcano.svg" />
-                    <caption style="bold" dy="12" fill="#323232" k="name" size="14" stroke="#ffffff"
-                        stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#323232" k="ele" size="12" stroke="#ffffff"
-                        stroke-width="2.0" />
-                </m>
-            </m>
-        </m>
-
-
         <m k="place" select="first">
             <m v="locality" zoom-min="13">
                 <caption style="bold" fill="#606060" k="name" size="14" stroke="#ffffff"
@@ -1325,20 +1325,14 @@
             </m>
         </m>
 
-
+        <!-- railway -->
         <m k="railway">
-            <m v="crossing" zoom-min="16">
-                <symbol src="assets:symbols/railway-crossing-small.svg" />
-            </m>
-            <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
-            <m v="level_crossing" zoom-min="14">
-                <symbol src="assets:symbols/railway-crossing.svg" />
-            </m>
             <m v="station" zoom-min="14">
                 <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
+
             <m v="halt|tram_stop" zoom-min="15">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="12" stroke="#ffffff"
@@ -1346,54 +1340,143 @@
             </m>
         </m>
 
-
-        <m k="shop">
+        <m k="shop" select="first">
             <m v="bakery" zoom-min="17">
                 <symbol src="assets:symbols/shopping/bakery.svg" />
             </m>
             <!--<m v="florist" zoom-min="17">
                 <symbol src="assets:symbols/shopping/florist.svg" />
             </m>-->
+            <!--<m v="hairdresser" zoom-min="16">
+                    <symbol src="assets:symbols/shopping/hairdresser.svg" />
+                </m>-->
             <m v="supermarket|organic" zoom-min="17">
                 <symbol src="assets:symbols/shopping/supermarket.svg" />
             </m>
-
             <m zoom-min="17">
-                <text use="caption-small-blue" />
+                <symbol src="assets:symbols/dot_magenta.svg" />
+            </m>
+            <m select="when-matched" zoom-min="17">
+                <text priority="9" use="shop" />
             </m>
         </m>
 
-
         <m k="tourism">
-            <m v="alpine_hut" zoom-min="16">
-                <symbol src="assets:symbols/accommodation/alpinehut.svg" />
+            <m select="first"> <!--Accomodation-->
+                <m v="alpine_hut" zoom-min="16">
+                    <symbol src="assets:symbols/accommodation/alpinehut.svg" />
+                </m>
+                <m v="camp_site" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/camping.svg" />
+                </m>
+                <m v="hostel" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/hostel.svg" />
+                </m>
+                <m v="hotel" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/hotel2.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="accommodation" />
+                </m>
             </m>
-            <m v="camp_site" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/camping.svg" />
-            </m>
-            <m v="hostel" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/hostel.svg" />
-            </m>
-            <m v="hotel" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/hotel2.svg" />
-            </m>
-            <!--  <m v="information" zoom-min="17">
-               <symbol src="assets:symbols/tourist/information.svg" />
-             </m> -->
-            <m v="viewpoint" zoom-min="15">
-                <symbol src="assets:symbols/tourist/view_point.svg" />
-            </m>
-
-            <m zoom-min="17">
-                <text use="caption-small-blue" />
+            <!-- <m v="information" zoom-min="17">
+              <m k="name" v="*">
+              <symbol src="assets:symbols/custom/tourist/information.svg" />
+              </m>
+            </m>-->
+            <m select="first"> <!--Entertainment-->
+                <m v="attraction" zoom-min="16">
+                    <symbol src="assets:symbols/custom/tourist/attraction.svg" />
+                </m>
+                <m v="museum" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/museum.svg" />
+                </m>
+                <m v="viewpoint" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/view_point.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="entertainment" />
+                </m>
             </m>
         </m>
 
+        <!--Match all missed buildings-->
+        <m k="building|building:part" zoom-min="17">
+            <text priority="9" use="caption-small-blue" />
+            <symbol src="assets:symbols/dot_blue_dark.svg" />
+        </m>
+    </m>
 
-        <!-- house numbers -->
+    <m e="node" select="first">
+        <!--Only add house numbers where no name exist-->
         <m k="addr:housenumber" zoom-min="17">
-            <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
-                size="12" stroke="#ffffff" stroke-width="2.0" />
+            <m k="name" v="~">
+                <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
+                    priority="10" size="12" stroke="#ffffff" stroke-width="2.0" />
+            </m>
+        </m>
+
+        <m k="barrier">
+            <m zoom-min="16">
+                <m v="bollard">
+                    <symbol src="assets:symbols/barrier/bollard.svg" />
+                </m>
+                <m v="block">
+                    <symbol src="assets:symbols/barrier/blocks.svg" />
+                </m>
+                <m v="gate">
+                    <symbol src="assets:symbols/barrier/gate.svg" />
+                </m>
+                <m v="lift_gate">
+                    <symbol src="assets:symbols/barrier/lift_gate.svg" />
+                </m>
+            </m>
+        </m>
+
+        <m k="highway">
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
+            </m>
+            <m v="traffic_signals" zoom-min="17">
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
+            </m>
+            <!--<m v="turning_circle" zoom-min="15">-->
+            <!--<circle fill="#ffffff" radius="1.4" scale-radius="true" />-->
+            <!--</m>-->
+        </m>
+
+        <m k="natural">
+            <m select="first">
+                <m v="cave_entrance" zoom-min="15">
+                    <symbol src="assets:symbols/poi/cave.svg" />
+                    <m zoom-min="17">
+                        <text use="caption-small-blue" />
+                    </m>
+                </m>
+                <m v="peak" zoom-min="12">
+                    <symbol src="assets:symbols/peak.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+                <m v="volcano" zoom-min="12">
+                    <symbol src="assets:symbols/volcano.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+            </m>
+        </m>
+
+        <m k="railway">
+            <m v="level_crossing" zoom-min="15">
+                <symbol src="assets:symbols/railway-crossing.svg" />
+            </m>
+            <m v="crossing" zoom-min="16">
+                <symbol src="assets:symbols/railway-crossing-small.svg" />
+            </m>
         </m>
     </m>
 
diff --git a/vtm-themes/resources/assets/vtm/osmarender.xml b/vtm-themes/resources/assets/vtm/osmarender.xml
index ebbd49a5..20e65c6e 100644
--- a/vtm-themes/resources/assets/vtm/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -3,23 +3,54 @@
     version="1" xmlns="http://opensciencemap.org/rendertheme"
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
+    <!--###### TEXT styles ######-->
+
+    <!--default label-->
+    <style-text caption="true" dy="20" fill="#2d51bc" font-family="medium" id="caption-small-blue"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--shop-->
+    <style-text caption="true" dy="20" fill="#ac39ac" font-family="medium" id="shop" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--tavern-->
+    <style-text caption="true" dy="20" fill="#734a08" font-family="medium" id="tavern" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--accommodation-->
+    <style-text caption="true" dy="20" fill="#0092da" font-family="medium" id="accommodation"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--education-->
+    <style-text caption="true" dy="20" fill="#0a4f0a" font-family="medium" id="education" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--health-->
+    <style-text caption="true" dy="20" fill="#da0092" font-family="medium" id="health" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--entertainment-->
+    <style-text caption="true" dy="20" fill="#b7650c" font-family="medium" id="entertainment"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--roads-->
+    <style-text style="bold" id="highway-road" k="name" size="16" stroke="#d0d0d0"
+        stroke-width="2.0" />
+    <style-text style="bold" id="highway-track" k="name" size="16" stroke="#fff2de"
+        stroke-width="2.0" />
+    <!--references-->
+    <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
+        stroke-width="2.0" />
+    <style-text caption="true" id="ref-caption" use="ref" />
+
+
+    <!--###### AREA styles ######-->
+    <!--no styles-->
+
+
+    <!--###### LINE styles ######-->
+
     <style-line id="trunk" stroke="#7fc97f" width="1.5" />
     <style-line id="motorway" stroke="#809bc0" width="1.7" />
     <style-line id="primary" stroke="#e46d71" width="1.5" />
     <style-line id="secondary" stroke="#fdbf6f" width="1.4" />
     <style-line id="tertiary" stroke="#ffff90" width="1.15" />
 
-    <style-text caption="true" dy="20" fill="#2d51bc" font-family="medium" id="caption-small-blue"
-        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
 
-    <style-text style="bold" id="highway-road" k="name" size="16" stroke="#d0d0d0"
-        stroke-width="2.0" />
-    <style-text style="bold" id="highway-track" k="name" size="16" stroke="#fff2de"
-        stroke-width="2.0" />
-
-    <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
-        stroke-width="2.0" />
-    <style-text caption="true" id="ref-caption" use="ref" />
+    <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
         <area fill="#b5d6f1" mesh="true" />
@@ -118,28 +149,10 @@
                     <m k="access" v="private" zoom-min="15">
                         <area src="assets:patterns/access-private.png" />
                     </m>
-                    <m zoom-min="17">
-                        <symbol src="assets:symbols/transport/parking.svg" />
-                    </m>
                 </m>
                 <m closed="yes" v="fountain">
                     <area fill="#b5d6f1" stroke="#000080" stroke-width="0.15" />
-                    <m zoom-min="17">
-                        <symbol src="assets:symbols/amenity/fountain2.svg" />
-                    </m>
                 </m>
-                <m v="hospital" zoom-min="15">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m v="theatre" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/theatre.svg" />
-                </m>
-                <m v="toilets" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/toilets.svg" />
-                </m>
-            </m>
-            <m k="name" zoom-min="17">
-                <text use="caption-small-blue" />
             </m>
         </m>
 
@@ -294,10 +307,6 @@
             <m v="zoo|picnic_site|caravan_site|camp_site">
                 <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
             </m>
-
-            <m k="name" zoom-min="16">
-                <text use="caption-small-blue" />
-            </m>
         </m>
 
 
@@ -433,7 +442,6 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <m v="apron">
                 <area fill="#f0f0f0" />
@@ -448,10 +456,6 @@
               <m v="taxiway">
               <line stroke="#000000" width="2.7" cap="butt" />
               </m> -->
-
-            <m k="name" zoom-min="16">
-                <text use="caption-small-blue" />
-            </m>
         </m>
     </m>
 
@@ -557,10 +561,13 @@
                 <extrusion line-color="#cc6a5a8e" side-color="#bbf3d6b6" top-color="#ccf8d9b9" />
             </m>
 
-            <m zoom-min="17">
-                <text priority="9" use="caption-small-blue" />
-                <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
-                    priority="10" size="12" stroke="#ffffff" stroke-width="2.0" />
+            <!--Only add house numbers where no name exist-->
+            <m k="addr:housenumber" zoom-min="17">
+                <m k="name" v="~">
+                    <caption style="bold" fill="#606060" font-family="condensed"
+                        k="addr:housenumber" priority="10" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
             </m>
         </m>
 
@@ -1106,7 +1113,8 @@
     </m>
 
 
-    <m e="node" select="first">
+    <!--All POIs and WAYs with names-->
+    <m k="name" select="first">
 
         <m k="aeroway">
             <m v="helipad" zoom-min="17">
@@ -1115,61 +1123,22 @@
             <m v="aerodrome|airport" zoom-max="13" zoom-min="9">
                 <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
+            <m k="name" zoom-min="16">
+                <text use="caption-small-blue" />
+            </m>
         </m>
 
         <m k="amenity">
             <m select="first">
-                <m v="atm" zoom-min="17">
-                    <symbol src="assets:symbols/money/atm2.svg" />
-                </m>
-                <m v="bank" zoom-min="17">
-                    <symbol src="assets:symbols/money/bank2.svg" />
-                </m>
                 <!--<m v="bench" zoom-min="17">
                     <symbol src="assets:symbols/bench.svg" />
                 </m>-->
-                <m v="bicycle_rental" zoom-min="17">
-                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
-                </m>
-                <m v="bus_station" zoom-min="17">
-                    <symbol src="assets:symbols/transport/bus_station.svg" />
-                </m>
-                <m v="cafe" zoom-min="17">
-                    <symbol src="assets:symbols/food/cafe.svg" />
-                </m>
-                <m v="cinema" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/cinema2.svg" />
-                </m>
                 <m v="drinking_water" zoom-min="17">
                     <symbol src="assets:symbols/food/drinkingtap.svg" />
                 </m>
-                <m v="fast_food" zoom-min="17">
-                    <symbol src="assets:symbols/food/fastfood.svg" />
-                </m>
                 <m v="fire_station" zoom-min="17">
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
-                <m v="fountain" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/fountain2.svg" />
-                </m>
-                <m v="fuel" zoom-min="17">
-                    <symbol src="assets:symbols/transport/fuel.svg" />
-                </m>
-                <m v="hospital" zoom-min="15">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m v="kindergarten" zoom-min="17">
-                    <symbol src="assets:symbols/education/nursery3.svg" />
-                </m>
-                <m v="library" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/library.svg" />
-                </m>
-                <m v="parking" zoom-min="17">
-                    <symbol src="assets:symbols/transport/parking.svg" />
-                </m>
-                <m v="pharmacy" zoom-min="17">
-                    <symbol src="assets:symbols/health/pharmacy.svg" />
-                </m>
                 <m v="place_of_worship" zoom-min="17">
                     <m k="denomination|religion" v="buddhist">
                         <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
@@ -1196,108 +1165,139 @@
                 <m v="post_box" zoom-min="17">
                     <symbol src="assets:symbols/amenity/post_box.svg" />
                 </m>
-                <m v="post_office" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/post_office.svg" />
-                </m>
-                <m v="pub|bar" zoom-min="17">
-                    <symbol src="assets:symbols/food/bar.svg" />
-                </m>
                 <m v="recycling" zoom-min="17">
                     <symbol src="assets:symbols/amenity/recycling.svg" />
                 </m>
-                <m v="restaurant" zoom-min="17">
-                    <symbol src="assets:symbols/food/restaurant.svg" />
-                </m>
-                <m v="school" zoom-min="17">
-                    <symbol src="assets:symbols/education/school.svg" />
-                </m>
                 <m v="shelter" zoom-min="17">
                     <symbol src="assets:symbols/accommodation/shelter2.svg" />
                 </m>
                 <m v="telephone" zoom-min="17">
                     <symbol src="assets:symbols/amenity/telephone.svg" />
                 </m>
-                <m v="theatre" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/theatre.svg" />
-                </m>
                 <m v="toilets" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/toilets.svg" />
+                    <symbol src="assets:symbols/custom/amenity/toilets.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="caption-small-blue" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Accomodation-->
+                <m v="parking" zoom-min="17">
+                    <symbol src="assets:symbols/transport/parking.svg" />
+                </m>
+                <m v="bicycle_rental" zoom-min="17">
+                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
+                </m>
+                <m v="bus_station" zoom-min="17">
+                    <symbol src="assets:symbols/transport/bus_station.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="accommodation" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Education-->
+                <m v="kindergarten" zoom-min="17">
+                    <symbol src="assets:symbols/education/nursery3.svg" />
+                </m>
+                <m v="library" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/library.svg" />
+                </m>
+                <m v="school" zoom-min="17">
+                    <symbol src="assets:symbols/education/school.svg" />
                 </m>
                 <m v="university|college" zoom-min="17">
                     <symbol src="assets:symbols/education/university.svg" />
                 </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="education" />
+                </m>
             </m>
-            <m zoom-min="17">
-                <text use="caption-small-blue" />
-            </m>
-        </m>
 
-        <m k="barrier">
-            <m zoom-min="16">
-                <m v="bollard">
-                    <symbol src="assets:symbols/barrier/bollard.svg" />
+            <m select="first"> <!--Entertainment-->
+                <m v="cinema" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/cinema2.svg" />
+                </m>
+                <m v="fountain" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/fountain2.svg" />
+                </m>
+                <m v="theatre" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/theatre.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="entertainment" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Health-->
+                <m v="hospital" zoom-min="15">
+                    <symbol src="assets:symbols/health/hospital.svg" />
+                </m>
+                <m v="pharmacy" zoom-min="17">
+                    <symbol src="assets:symbols/health/pharmacy.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="health" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Shop-->
+                <m v="atm" zoom-min="17">
+                    <symbol src="assets:symbols/custom/money/atm2.svg" />
+                </m>
+                <m v="bank" zoom-min="17">
+                    <symbol src="assets:symbols/money/bank2.svg" />
+                </m>
+                <m v="fuel" zoom-min="17">
+                    <symbol src="assets:symbols/transport/fuel.svg" />
+                </m>
+                <m v="post_office" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/post_office.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="shop" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Tavern-->
+                <m v="cafe" zoom-min="17">
+                    <symbol src="assets:symbols/food/cafe.svg" />
+                </m>
+                <m v="bar" zoom-min="17">
+                    <symbol src="assets:symbols/food/bar.svg" />
+                </m>
+                <m v="fast_food" zoom-min="17">
+                    <symbol src="assets:symbols/food/fastfood.svg" />
+                </m>
+                <m v="pub" zoom-min="17">
+                    <symbol src="assets:symbols/food/pub.svg" />
+                </m>
+                <m v="restaurant" zoom-min="17">
+                    <symbol src="assets:symbols/food/restaurant.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="tavern" />
                 </m>
             </m>
         </m>
 
-        <m k="highway">
-            <m v="bus_stop" zoom-min="16">
-                <symbol src="assets:symbols/dot_blue.svg" />
-            </m>
-            <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/transport/traffic_lights.svg" />
-            </m>
-            <m v="turning_circle">
-                <circle fill="#ffffff" radius="1.4" scale-radius="true" />
-            </m>
-        </m>
-
-
-        <m k="historic">
-            <symbol src="assets:symbols/tourist/monument.svg" />
+        <m k="historic" zoom-min="10">
+            <symbol src="assets:symbols/custom/tourist/monument.svg" />
 
             <m zoom-min="17">
-                <text use="caption-small-blue" />
+                <text priority="7" use="entertainment" />
             </m>
         </m>
 
-
         <m k="leisure" v="playground" zoom-min="17">
             <symbol src="assets:symbols/amenity/playground.svg" />
         </m>
 
-
         <m k="man_made" v="windmill" zoom-min="17">
-            <symbol src="assets:symbols/tourist/windmill.svg" />
+            <symbol src="assets:symbols/custom/tourist/windmill.svg" />
         </m>
 
-
-        <m k="natural">
-            <m select="first">
-                <m v="cave_entrance" zoom-min="15">
-                    <symbol src="assets:symbols/poi/cave.svg" />
-                    <m zoom-min="17">
-                        <text use="caption-small-blue" />
-                    </m>
-                </m>
-                <m v="peak" zoom-min="12">
-                    <symbol src="assets:symbols/peak.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
-                        stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
-                        stroke-width="2.0" />
-                </m>
-                <m v="volcano" zoom-min="12">
-                    <symbol src="assets:symbols/volcano.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
-                        stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
-                        stroke-width="2.0" />
-                </m>
-            </m>
-        </m>
-
-
         <m k="place" select="first">
             <m v="locality" zoom-min="13">
                 <caption style="bold" fill="#606060" k="name" size="14" stroke="#ffffff"
@@ -1325,20 +1325,14 @@
             </m>
         </m>
 
-
+        <!-- railway -->
         <m k="railway">
-            <m v="crossing" zoom-min="16">
-                <symbol src="assets:symbols/railway-crossing-small.svg" />
-            </m>
-            <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
-            <m v="level_crossing" zoom-min="14">
-                <symbol src="assets:symbols/railway-crossing.svg" />
-            </m>
             <m v="station" zoom-min="14">
                 <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
+
             <m v="halt|tram_stop" zoom-min="15">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="12" stroke="#ffffff"
@@ -1346,54 +1340,143 @@
             </m>
         </m>
 
-
-        <m k="shop">
+        <m k="shop" select="first">
             <m v="bakery" zoom-min="17">
                 <symbol src="assets:symbols/shopping/bakery.svg" />
             </m>
             <!--<m v="florist" zoom-min="17">
                 <symbol src="assets:symbols/shopping/florist.svg" />
             </m>-->
+            <!--<m v="hairdresser" zoom-min="16">
+                    <symbol src="assets:symbols/shopping/hairdresser.svg" />
+                </m>-->
             <m v="supermarket|organic" zoom-min="17">
                 <symbol src="assets:symbols/shopping/supermarket.svg" />
             </m>
-
             <m zoom-min="17">
-                <text use="caption-small-blue" />
+                <symbol src="assets:symbols/dot_magenta.svg" />
+            </m>
+            <m select="when-matched" zoom-min="17">
+                <text priority="9" use="shop" />
             </m>
         </m>
 
-
         <m k="tourism">
-            <m v="alpine_hut" zoom-min="16">
-                <symbol src="assets:symbols/accommodation/alpinehut.svg" />
+            <m select="first"> <!--Accomodation-->
+                <m v="alpine_hut" zoom-min="16">
+                    <symbol src="assets:symbols/accommodation/alpinehut.svg" />
+                </m>
+                <m v="camp_site" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/camping.svg" />
+                </m>
+                <m v="hostel" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/hostel.svg" />
+                </m>
+                <m v="hotel" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/hotel2.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="accommodation" />
+                </m>
             </m>
-            <m v="camp_site" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/camping.svg" />
-            </m>
-            <m v="hostel" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/hostel.svg" />
-            </m>
-            <m v="hotel" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/hotel2.svg" />
-            </m>
-            <!--  <m v="information" zoom-min="17">
-               <symbol src="assets:symbols/tourist/information.svg" />
-             </m> -->
-            <m v="viewpoint" zoom-min="15">
-                <symbol src="assets:symbols/tourist/view_point.svg" />
-            </m>
-
-            <m zoom-min="17">
-                <text use="caption-small-blue" />
+            <!-- <m v="information" zoom-min="17">
+              <m k="name" v="*">
+              <symbol src="assets:symbols/custom/tourist/information.svg" />
+              </m>
+            </m>-->
+            <m select="first"> <!--Entertainment-->
+                <m v="attraction" zoom-min="16">
+                    <symbol src="assets:symbols/custom/tourist/attraction.svg" />
+                </m>
+                <m v="museum" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/museum.svg" />
+                </m>
+                <m v="viewpoint" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/view_point.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="entertainment" />
+                </m>
             </m>
         </m>
 
+        <!--Match all missed buildings-->
+        <m k="building|building:part" zoom-min="17">
+            <text priority="9" use="caption-small-blue" />
+            <symbol src="assets:symbols/dot_blue_dark.svg" />
+        </m>
+    </m>
 
-        <!-- house numbers -->
+    <m e="node" select="first">
+        <!--Only add house numbers where no name exist-->
         <m k="addr:housenumber" zoom-min="17">
-            <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
-                size="12" stroke="#ffffff" stroke-width="2.0" />
+            <m k="name" v="~">
+                <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
+                    priority="10" size="12" stroke="#ffffff" stroke-width="2.0" />
+            </m>
+        </m>
+
+        <m k="barrier">
+            <m zoom-min="16">
+                <m v="bollard">
+                    <symbol src="assets:symbols/barrier/bollard.svg" />
+                </m>
+                <m v="block">
+                    <symbol src="assets:symbols/barrier/blocks.svg" />
+                </m>
+                <m v="gate">
+                    <symbol src="assets:symbols/barrier/gate.svg" />
+                </m>
+                <m v="lift_gate">
+                    <symbol src="assets:symbols/barrier/lift_gate.svg" />
+                </m>
+            </m>
+        </m>
+
+        <m k="highway">
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
+            </m>
+            <m v="traffic_signals" zoom-min="17">
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
+            </m>
+            <!--<m v="turning_circle" zoom-min="15">-->
+            <!--<circle fill="#ffffff" radius="1.4" scale-radius="true" />-->
+            <!--</m>-->
+        </m>
+
+        <m k="natural">
+            <m select="first">
+                <m v="cave_entrance" zoom-min="15">
+                    <symbol src="assets:symbols/poi/cave.svg" />
+                    <m zoom-min="17">
+                        <text use="caption-small-blue" />
+                    </m>
+                </m>
+                <m v="peak" zoom-min="12">
+                    <symbol src="assets:symbols/peak.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+                <m v="volcano" zoom-min="12">
+                    <symbol src="assets:symbols/volcano.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+            </m>
+        </m>
+
+        <m k="railway">
+            <m v="level_crossing" zoom-min="15">
+                <symbol src="assets:symbols/railway-crossing.svg" />
+            </m>
+            <m v="crossing" zoom-min="16">
+                <symbol src="assets:symbols/railway-crossing-small.svg" />
+            </m>
         </m>
     </m>
 
diff --git a/vtm-themes/resources/assets/vtm/tronrender.xml b/vtm-themes/resources/assets/vtm/tronrender.xml
index 3db47d04..62c505da 100644
--- a/vtm-themes/resources/assets/vtm/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -3,25 +3,51 @@
     version="1" xmlns="http://opensciencemap.org/rendertheme"
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
+    <!--###### TEXT styles ######-->
+
+    <!--default label-->
     <style-text caption="true" dy="20" fill="#2d51bc" font-family="medium" id="caption-small-blue"
         k="name" size="16" stroke="#ffffff" stroke-width="2.0" />
-
+    <!--shop-->
+    <style-text caption="true" dy="20" fill="#ac39ac" font-family="medium" id="shop" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--tavern-->
+    <style-text caption="true" dy="20" fill="#734a08" font-family="medium" id="tavern" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--accommodation-->
+    <style-text caption="true" dy="20" fill="#0092da" font-family="medium" id="accommodation"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--education-->
+    <style-text caption="true" dy="20" fill="#0a4f0a" font-family="medium" id="education" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--health-->
+    <style-text caption="true" dy="20" fill="#da0092" font-family="medium" id="health" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--entertainment-->
+    <style-text caption="true" dy="20" fill="#b7650c" font-family="medium" id="entertainment"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--roads-->
     <style-text style="bold" fill="#eeffee" id="road" k="name" priority="2" size="18"
         stroke="#606050" stroke-width="2.5" />
-
+    <!--major roads-->
     <style-text style="bold" fill="#ffef7d" id="major-road" k="name" priority="1" size="19"
         stroke="#624f00" stroke-width="2.5" />
-
+    <!--references-->
     <style-text style="bold" fill="#606060" id="ref" k="ref" priority="2" size="12" stroke="#ffffff"
         stroke-width="2.0" />
     <style-text caption="true" id="ref-caption" use="ref" />
 
-    <style-area fade="10" fill="#ff0000" id="residential" />
 
+    <!--###### AREA styles ######-->
+
+    <!--residential-->
+    <style-area fade="10" fill="#ff0000" id="residential" />
+    <!--railway-->
     <style-area fade="10" fill="#f2eeef" id="railway|industrial" />
     <!-- "#f0fae7" mint green -->
     <style-area fade="11" fill="#fff8bf" id="farmland" />
 
+    <!--wood-->
     <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
     <style-area blend="11" blend-fill="#1e2205" fade="7" fill="#151806" id="forest|wood" />
 
@@ -40,8 +66,16 @@
     <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
     <style-area fade="10" fill="#ddddcc" id="quarry" />
 
+    <!--military-->
     <style-area fade="10" fill="#eeedea" id="military" />
+    <!--building-->
+    <style-area fade="15" fill="#ee202020" id="building" />
 
+    <!--water-->
+    <style-area fill="#001223" id="water" />
+
+
+    <!--###### LINE styles ######-->
 
     <style-line blur="1.0" fade="13" id="residential" stroke="#ffffff" width="1.0" />
     <style-line cap="butt" id="residential:bridge" use="residential" />
@@ -73,16 +107,18 @@
 
     <style-line cap="butt" id="steps" stroke="#f1f0f4" width="0.25" />
 
-    <style-line cap="butt" id="water:outline" stroke="#a4bbcc" width="1.0" />
-    <style-line cap="butt" id="water" stroke="#cca4bbcc" width="0.6" />
-    <style-area fill="#001223" id="water" />
     <!-- no-go area boundary -->
     <style-line cap="butt" fix="true" id="fence" stroke="#444444" width="1.2" />
 
     <style-line blur="0.7" cap="butt" id="aeroway:runway" stroke="#008888" width="1.8" />
-
+    <!--building-->
     <style-line cap="butt" fix="true" id="building" stroke="#dd888888" width="1.5" />
-    <style-area fade="15" fill="#ee202020" id="building" />
+
+    <!--water-->
+    <style-line cap="butt" id="water:outline" stroke="#a4bbcc" width="1.0" />
+    <style-line cap="butt" id="water" stroke="#cca4bbcc" width="0.6" />
+
+    <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
         <area mesh="true" use="water" />
@@ -199,9 +235,6 @@
                 </m>
                 <m v="parking" zoom-min="14">
                     <area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
-                    <m zoom-min="17">
-                        <symbol src="assets:symbols/transport/parking.svg" />
-                    </m>
                 </m>
 
                 <m closed="yes" v="fountain">
@@ -510,7 +543,6 @@
                     <caption area-size="0.1" dy="18" fill="#000000" k="name" priority="5" size="19"
                         stroke="#ffffff" stroke-width="2.0" />
                 </m>
-                <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
             <m v="apron">
                 <area fill="#050008" />
@@ -539,11 +571,14 @@
             <m zoom-min="17">
                 <extrusion line-color="#50ff00ff" side-color="#cc707070" top-color="#cc707070" />
             </m>
-            <m zoom-min="17">
-                <caption style="bold" fill="#2d51bc" k="name" priority="9" size="14"
-                    stroke="#ffffff" stroke-width="2.0" />
-                <caption style="bold" fill="#ffffff" font-family="condensed" k="addr:housenumber"
-                    priority="10" size="12" stroke="#606060" stroke-width="2.0" />
+
+            <!--Only add house numbers where no name exist-->
+            <m k="addr:housenumber" zoom-min="17">
+                <m k="name" v="~">
+                    <caption style="bold" fill="#ffffff" font-family="condensed"
+                        k="addr:housenumber" priority="10" size="12" stroke="#606060"
+                        stroke-width="2.0" />
+                </m>
             </m>
         </m>
 
@@ -991,16 +1026,16 @@
             <m v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt" /> </m>
             <m v="5"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt" /> </m> -->
             <m v="4">
-                <line cap="butt" fix="true" stroke="#8f80dd" width="1.2" />
+                <line cap="butt" fix="true" stroke="#8f80dd" width="2.0" />
             </m>
             <m v="3">
-                <line cap="butt" fix="true" stroke="#0000ff" width="1.0" />
+                <line cap="butt" fix="true" stroke="#0000ff" width="3.0" />
             </m>
             <m v="2">
-                <line blur="0.3" cap="butt" fix="true" stroke="#dddddd" width="1.0" />
+                <line blur="0.3" cap="butt" fix="true" stroke="#dddddd" width="3.0" />
             </m>
             <m v="1">
-                <line cap="butt" fix="true" stroke="#ff0000" width="0.95" />
+                <line cap="butt" fix="true" stroke="#ff0000" width="3.0" />
             </m>
 
         </m>
@@ -1044,7 +1079,8 @@
     </m>
 
 
-    <m e="node" select="first">
+    <!--All POIs and WAYs with names-->
+    <m k="name" select="first">
 
         <m k="aeroway">
             <m v="helipad" zoom-min="17">
@@ -1053,61 +1089,22 @@
             <m v="aerodrome|airport" zoom-max="13" zoom-min="9">
                 <symbol src="assets:symbols/transport/airport2.svg" />
             </m>
+            <m k="name" zoom-min="16">
+                <text use="caption-small-blue" />
+            </m>
         </m>
 
         <m k="amenity">
             <m select="first">
-                <m v="atm" zoom-min="17">
-                    <symbol src="assets:symbols/money/atm2.svg" />
-                </m>
-                <m v="bank" zoom-min="17">
-                    <symbol src="assets:symbols/money/bank2.svg" />
-                </m>
                 <!--<m v="bench" zoom-min="17">
                     <symbol src="assets:symbols/bench.svg" />
                 </m>-->
-                <m v="bicycle_rental" zoom-min="17">
-                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
-                </m>
-                <m v="bus_station" zoom-min="17">
-                    <symbol src="assets:symbols/transport/bus_station.svg" />
-                </m>
-                <m v="cafe" zoom-min="17">
-                    <symbol src="assets:symbols/food/cafe.svg" />
-                </m>
-                <m v="cinema" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/cinema2.svg" />
-                </m>
                 <m v="drinking_water" zoom-min="17">
                     <symbol src="assets:symbols/food/drinkingtap.svg" />
                 </m>
-                <m v="fast_food" zoom-min="17">
-                    <symbol src="assets:symbols/food/fastfood.svg" />
-                </m>
                 <m v="fire_station" zoom-min="17">
                     <symbol src="assets:symbols/amenity/firestation3.svg" />
                 </m>
-                <m v="fountain" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/fountain2.svg" />
-                </m>
-                <m v="fuel" zoom-min="17">
-                    <symbol src="assets:symbols/transport/fuel.svg" />
-                </m>
-                <m v="hospital" zoom-min="15">
-                    <symbol src="assets:symbols/health/hospital.svg" />
-                </m>
-                <m v="kindergarten" zoom-min="17">
-                    <symbol src="assets:symbols/education/nursery3.svg" />
-                </m>
-                <m v="library" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/library.svg" />
-                </m>
-                <m v="parking" zoom-min="17">
-                    <symbol src="assets:symbols/transport/parking.svg" />
-                </m>
-                <m v="pharmacy" zoom-min="17">
-                    <symbol src="assets:symbols/health/pharmacy.svg" />
-                </m>
                 <m v="place_of_worship" zoom-min="17">
                     <m k="denomination|religion" v="buddhist">
                         <symbol src="assets:symbols/place_of_worship/buddhist.svg" />
@@ -1134,108 +1131,140 @@
                 <m v="post_box" zoom-min="17">
                     <symbol src="assets:symbols/amenity/post_box.svg" />
                 </m>
-                <m v="post_office" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/post_office.svg" />
-                </m>
-                <m v="pub|bar" zoom-min="17">
-                    <symbol src="assets:symbols/food/bar.svg" />
-                </m>
                 <m v="recycling" zoom-min="17">
                     <symbol src="assets:symbols/amenity/recycling.svg" />
                 </m>
-                <m v="restaurant" zoom-min="17">
-                    <symbol src="assets:symbols/food/restaurant.svg" />
-                </m>
-                <m v="school" zoom-min="17">
-                    <symbol src="assets:symbols/education/school.svg" />
-                </m>
                 <m v="shelter" zoom-min="17">
                     <symbol src="assets:symbols/accommodation/shelter2.svg" />
                 </m>
                 <m v="telephone" zoom-min="17">
                     <symbol src="assets:symbols/amenity/telephone.svg" />
                 </m>
-                <m v="theatre" zoom-min="17">
-                    <symbol src="assets:symbols/tourist/theatre.svg" />
-                </m>
                 <m v="toilets" zoom-min="17">
-                    <symbol src="assets:symbols/amenity/toilets.svg" />
+                    <symbol src="assets:symbols/custom/amenity/toilets.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="caption-small-blue" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Accomodation-->
+                <m v="parking" zoom-min="17">
+                    <symbol src="assets:symbols/transport/parking.svg" />
+                </m>
+                <m v="bicycle_rental" zoom-min="17">
+                    <symbol src="assets:symbols/transport/rental_bicycle.svg" />
+                </m>
+                <m v="bus_station" zoom-min="17">
+                    <symbol src="assets:symbols/transport/bus_station.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="accommodation" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Education-->
+                <m v="kindergarten" zoom-min="17">
+                    <symbol src="assets:symbols/education/nursery3.svg" />
+                </m>
+                <m v="library" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/library.svg" />
+                </m>
+                <m v="school" zoom-min="17">
+                    <symbol src="assets:symbols/education/school.svg" />
                 </m>
                 <m v="university|college" zoom-min="17">
                     <symbol src="assets:symbols/education/university.svg" />
                 </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="education" />
+                </m>
             </m>
-            <m zoom-min="17">
-                <text use="caption-small-blue" />
-            </m>
-        </m>
 
-        <m k="barrier">
-            <m zoom-min="16">
-                <m v="bollard">
-                    <symbol src="assets:symbols/barrier/bollard.svg" />
+            <m select="first"> <!--Entertainment-->
+                <m v="cinema" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/cinema2.svg" />
+                </m>
+                <m v="fountain" zoom-min="17">
+                    <symbol src="assets:symbols/custom/amenity/fountain2.svg" />
+                </m>
+                <m v="theatre" zoom-min="17">
+                    <symbol src="assets:symbols/custom/tourist/theatre.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="entertainment" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Health-->
+                <m v="hospital" zoom-min="15">
+                    <symbol src="assets:symbols/health/hospital.svg" />
+                </m>
+                <m v="pharmacy" zoom-min="17">
+                    <symbol src="assets:symbols/health/pharmacy.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="health" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Shop-->
+                <m v="atm" zoom-min="17">
+                    <symbol src="assets:symbols/custom/money/atm2.svg" />
+                </m>
+                <m v="bank" zoom-min="17">
+                    <symbol src="assets:symbols/money/bank2.svg" />
+                </m>
+                <m v="fuel" zoom-min="17">
+                    <symbol src="assets:symbols/transport/fuel.svg" />
+                </m>
+                <m v="post_office" zoom-min="17">
+                    <symbol src="assets:symbols/amenity/post_office.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="shop" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Tavern-->
+                <m v="cafe" zoom-min="17">
+                    <symbol src="assets:symbols/food/cafe.svg" />
+                </m>
+                <m v="bar" zoom-min="17">
+                    <symbol src="assets:symbols/food/bar.svg" />
+                </m>
+                <m v="fast_food" zoom-min="17">
+                    <symbol src="assets:symbols/food/fastfood.svg" />
+                </m>
+                <m v="pub" zoom-min="17">
+                    <symbol src="assets:symbols/food/pub.svg" />
+                </m>
+                <m v="restaurant" zoom-min="17">
+                    <symbol src="assets:symbols/food/restaurant.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="tavern" />
                 </m>
             </m>
         </m>
 
-        <m k="highway">
-            <m v="bus_stop" zoom-min="16">
-                <symbol src="assets:symbols/dot_blue.svg" />
-            </m>
-            <m v="traffic_signals" zoom-min="17">
-                <symbol src="assets:symbols/transport/traffic_lights.svg" />
-            </m>
-            <m v="turning_circle">
-                <circle fill="#ffffff" radius="1.4" scale-radius="true" />
-            </m>
-        </m>
-
-
-        <m k="historic">
-            <symbol src="assets:symbols/tourist/monument.svg" />
+        <m k="historic" zoom-min="10">
+            <symbol src="assets:symbols/custom/tourist/monument.svg" />
 
             <m zoom-min="17">
-                <text use="caption-small-blue" />
+                <text priority="7" use="entertainment" />
             </m>
         </m>
 
-
         <m k="leisure" v="playground" zoom-min="17">
             <symbol src="assets:symbols/amenity/playground.svg" />
         </m>
 
 
         <m k="man_made" v="windmill" zoom-min="17">
-            <symbol src="assets:symbols/tourist/windmill.svg" />
+            <symbol src="assets:symbols/custom/tourist/windmill.svg" />
         </m>
 
-
-        <m k="natural">
-            <m select="first">
-                <m v="cave_entrance" zoom-min="15">
-                    <symbol src="assets:symbols/poi/cave.svg" />
-                    <m zoom-min="17">
-                        <text use="caption-small-blue" />
-                    </m>
-                </m>
-                <m v="peak" zoom-min="12">
-                    <symbol src="assets:symbols/peak.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
-                        stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
-                        stroke-width="2.0" />
-                </m>
-                <m v="volcano" zoom-min="12">
-                    <symbol src="assets:symbols/volcano.svg" />
-                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
-                        stroke-width="2.0" />
-                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
-                        stroke-width="2.0" />
-                </m>
-            </m>
-        </m>
-
-
         <m k="place" select="first">
             <m v="locality" zoom-min="13">
                 <caption style="bold" fill="#606060" k="name" size="14" stroke="#ffffff"
@@ -1264,19 +1293,14 @@
         </m>
 
 
+        <!-- railway -->
         <m k="railway">
-            <m v="crossing" zoom-min="16">
-                <symbol src="assets:symbols/railway-crossing-small.svg" />
-            </m>
-            <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
-            <m v="level_crossing" zoom-min="14">
-                <symbol src="assets:symbols/railway-crossing.svg" />
-            </m>
             <m v="station" zoom-min="14">
                 <symbol src="assets:symbols/transport/train_station2.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
+
             <m v="halt|tram_stop" zoom-min="15">
                 <symbol src="assets:symbols/transport/tram_stop.svg" />
                 <caption style="bold" dy="20" fill="#af3a3a" k="name" size="12" stroke="#ffffff"
@@ -1285,53 +1309,145 @@
         </m>
 
 
-        <m k="shop">
+        <m k="shop" select="first">
             <m v="bakery" zoom-min="17">
                 <symbol src="assets:symbols/shopping/bakery.svg" />
             </m>
             <!--<m v="florist" zoom-min="17">
                 <symbol src="assets:symbols/shopping/florist.svg" />
             </m>-->
+            <!--<m v="hairdresser" zoom-min="16">
+                    <symbol src="assets:symbols/shopping/hairdresser.svg" />
+                </m>-->
             <m v="supermarket|organic" zoom-min="17">
                 <symbol src="assets:symbols/shopping/supermarket.svg" />
             </m>
-
             <m zoom-min="17">
-                <text use="caption-small-blue" />
+                <symbol src="assets:symbols/dot_magenta.svg" />
             </m>
-        </m>
-
-
-        <m k="tourism" select="first">
-            <m v="alpine_hut" zoom-min="16">
-                <symbol src="assets:symbols/accommodation/alpinehut.svg" />
-            </m>
-            <m v="camp_site" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/camping.svg" />
-            </m>
-            <m v="hostel" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/hostel.svg" />
-            </m>
-            <m v="hotel" zoom-min="17">
-                <symbol src="assets:symbols/accommodation/hotel2.svg" />
-            </m>
-            <!--  <m v="information" zoom-min="17">
-               <symbol src="assets:symbols/tourist/information.svg" />
-             </m> -->
-            <m v="viewpoint" zoom-min="15">
-                <symbol src="assets:symbols/tourist/view_point.svg" />
-            </m>
-
             <m select="when-matched" zoom-min="17">
-                <text use="caption-small-blue" />
+                <text priority="9" use="shop" />
             </m>
         </m>
 
 
-        <!-- house numbers -->
+        <m k="tourism">
+            <m select="first"> <!--Accomodation-->
+                <m v="alpine_hut" zoom-min="16">
+                    <symbol src="assets:symbols/accommodation/alpinehut.svg" />
+                </m>
+                <m v="camp_site" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/camping.svg" />
+                </m>
+                <m v="hostel" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/hostel.svg" />
+                </m>
+                <m v="hotel" zoom-min="17">
+                    <symbol src="assets:symbols/accommodation/hotel2.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="accommodation" />
+                </m>
+            </m>
+            <!-- <m v="information" zoom-min="17">
+              <m k="name" v="*">
+              <symbol src="assets:symbols/custom/tourist/information.svg" />
+              </m>
+            </m>-->
+            <m select="first"> <!--Entertainment-->
+                <m v="attraction" zoom-min="16">
+                    <symbol src="assets:symbols/custom/tourist/attraction.svg" />
+                </m>
+                <m v="museum" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/museum.svg" />
+                </m>
+                <m v="viewpoint" zoom-min="15">
+                    <symbol src="assets:symbols/custom/tourist/view_point.svg" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="8" use="entertainment" />
+                </m>
+            </m>
+        </m>
+
+
+        <!--Match all missed buildings-->
+        <m k="building|building:part" zoom-min="17">
+            <text priority="9" use="caption-small-blue" />
+            <symbol src="assets:symbols/dot_blue_dark.svg" />
+        </m>
+    </m>
+
+    <m e="node" select="first">
+        <!--Only add house numbers where no name exist-->
         <m k="addr:housenumber" zoom-min="17">
-            <caption style="bold" fill="#ffffff" font-family="condensed" k="addr:housenumber"
-                size="12" stroke="#606060" stroke-width="2.0" />
+            <m k="name" v="~">
+                <caption style="bold" fill="#ffffff" font-family="condensed" k="addr:housenumber"
+                    priority="10" size="12" stroke="#606060" stroke-width="2.0" />
+            </m>
+        </m>
+
+        <m k="barrier">
+            <m zoom-min="16">
+                <m v="bollard">
+                    <symbol src="assets:symbols/barrier/bollard.svg" />
+                </m>
+                <m v="block">
+                    <symbol src="assets:symbols/barrier/blocks.svg" />
+                </m>
+                <m v="gate">
+                    <symbol src="assets:symbols/barrier/gate.svg" />
+                </m>
+                <m v="lift_gate">
+                    <symbol src="assets:symbols/barrier/lift_gate.svg" />
+                </m>
+            </m>
+        </m>
+
+        <m k="highway">
+            <m v="bus_stop" zoom-min="16">
+                <symbol src="assets:symbols/dot_blue.svg" />
+            </m>
+            <m v="traffic_signals" zoom-min="17">
+                <symbol src="assets:symbols/transport/traffic_lights.svg" />
+            </m>
+            <!--<m v="turning_circle" zoom-min="15">-->
+            <!--<circle fill="#ffffff" radius="1.4" scale-radius="true" />-->
+            <!--</m>-->
+        </m>
+
+        <m k="natural">
+            <m select="first">
+                <m v="cave_entrance" zoom-min="15">
+                    <symbol src="assets:symbols/poi/cave.svg" />
+                    <m zoom-min="17">
+                        <text use="caption-small-blue" />
+                    </m>
+                </m>
+                <m v="peak" zoom-min="12">
+                    <symbol src="assets:symbols/peak.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+                <m v="volcano" zoom-min="12">
+                    <symbol src="assets:symbols/volcano.svg" />
+                    <caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"
+                        stroke-width="2.0" />
+                    <caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
+            </m>
+        </m>
+
+        <m k="railway">
+            <m v="level_crossing" zoom-min="15">
+                <symbol src="assets:symbols/railway-crossing.svg" />
+            </m>
+            <m v="crossing" zoom-min="16">
+                <symbol src="assets:symbols/railway-crossing-small.svg" />
+            </m>
         </m>
     </m>
 
diff --git a/vtm-web-app/resources/assets/vtm/default_atlas.xml b/vtm-web-app/resources/assets/vtm/default_atlas.xml
index 13378fc9..c6f8c6a9 100644
--- a/vtm-web-app/resources/assets/vtm/default_atlas.xml
+++ b/vtm-web-app/resources/assets/vtm/default_atlas.xml
@@ -3,29 +3,51 @@
     map-background="#fffcfa" version="1" xmlns="http://opensciencemap.org/rendertheme"
     xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd">
 
-    <!-- base style for fixed width lines -->
-    <style-line cap="butt" fix="true" id="fix" width="1.0" />
+    <!--###### TEXT styles ######-->
 
+    <!--default label-->
     <style-text caption="true" dy="20" fill="#2d51bc" font-family="medium" id="caption-small-blue"
         k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
-
+    <!--shop-->
+    <style-text caption="true" dy="20" fill="#ac39ac" font-family="medium" id="shop" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--tavern-->
+    <style-text caption="true" dy="20" fill="#734a08" font-family="medium" id="tavern" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--accommodation-->
+    <style-text caption="true" dy="20" fill="#0092da" font-family="medium" id="accommodation"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--education-->
+    <style-text caption="true" dy="20" fill="#0a4f0a" font-family="medium" id="education" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--health-->
+    <style-text caption="true" dy="20" fill="#da0092" font-family="medium" id="health" k="name"
+        size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--entertainment-->
+    <style-text caption="true" dy="20" fill="#b7650c" font-family="medium" id="entertainment"
+        k="name" size="14" stroke="#ffffff" stroke-width="2.0" />
+    <!--roads-->
     <style-text fill="#101010" id="road" k="name" priority="2" size="16" stroke="#eeeeee"
         stroke-width="2.0" />
-
+    <!--major roads-->
     <style-text style="bold" fill="#101010" id="major-road" k="name" priority="1" size="16"
         stroke="#eeeeee" stroke-width="2.0" />
 
-    <style-text caption="true" dy="16" fill="#777744" id="poi" k="name" size="16" stroke="#aaffffff"
-        stroke-width="2.0" />
 
+    <!--###### AREA styles ######-->
+
+    <!--residential-->
     <style-area fade="11" fill="#e8e7e3" id="residential" />
-
+    <!--railway-->
     <style-area fade="10" fill="#e6e3e5" id="railway|industrial" />
 
-
+    <!--wood-->
     <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
     <!-- src="textures/wood.png" -->
     <!-- <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" /> -->
+    <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
+    <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
+    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
 
     <style-area id="tex1" src="textures/rough.png" />
 
@@ -38,34 +60,47 @@
     <!-- grassland|scrub -->
     <style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
 
+    <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
+
+    <!--farmland-->
     <style-area fade="12" fill="#e4dab5" id="farmland" stroke="#d1dbc7" stroke-width="1.0"
         use="tex1" />
 
-    <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
-
     <!-- marsh|wetland|mud|nature_reserve -->
     <style-area fade="12" fill="#deecb9" id="greens2" />
 
     <!-- park|common|green|cemetery|golf_course|dog_park -->
     <style-area fade="11" fill="#9ac56e" id="park" use="tex1" />
-    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
-
-    <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
-    <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
-
     <!-- <style-area id="park" fill="#a3ca7b" fade="11" /> -->
-    <style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
 
     <!-- de:Kleingartengebiet -->
     <style-area fade="12" fill="#efeae0" id="allotments" use="tex1" />
 
     <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
     <style-area fade="10" fill="#ddddcc" id="quarry" />
+
+    <!--military-->
     <style-area fade="10" fill="#eeedea" id="military" />
+    <!--building-->
+    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+    <!--<style-area id="building" fill="#e9e6e3" fade="15"/>-->
+
+    <!--water-->
+    <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
+    <!-- src="textures/water.png" -->
+    <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
+
+
+    <!--###### LINE styles ######-->
+
+    <!-- base style for fixed width lines -->
+    <style-line cap="butt" fix="true" id="fix" width="1.0" />
+
+    <!--residential-->
     <style-line id="residential" stroke="#ffffff" width="1.3" />
     <style-line cap="butt" id="residential:bridge" use="residential" />
 
-    <!-- when inheriting another style with 'from' then 'witdth' is relative to the parent -->
+    <!-- when inheriting another style with 'from' then 'width' is relative to the parent -->
     <style-line id="pedestrian" use="residential" width="-0.4" />
     <style-line cap="butt" id="pedestrian:bridge" use="pedestrian" />
     <style-line id="highway:z11" stroke="#fcba5a" width="1.8" />
@@ -88,31 +123,31 @@
     <!-- <style-line id="footway:z16" use="footway" width="-0.95" fixed="false" fade="-1"/> -->
     <style-line id="footway:z17" stroke="#faf8f5" width="0.3" />
 
-    <!-- de: ein Weg der für Reiter vorgeshen ist.. -->
+    <!-- de: ein Weg der für Reiter vorgesehen ist.. -->
     <style-line cap="butt" id="bridleway" stipple-stroke="#837b58" stroke="#d3cb98" use="footway"
         width="0.1" />
     <style-line cap="butt" fix="true" id="steps" stipple="2" stipple-stroke="#be6253"
         stipple-width="1.0" stroke="#aaffffff" width="4.2" />
     <style-line cap="butt" fix="true" id="water:outline" stroke="#a4bbcc" width="1.0" />
 
-    <style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
-    <style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
-
-    <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
-    <!-- src="textures/water.png" -->
-    <style-area fade="-1" fill="#99badf" id="water" use="tex1" />
-
     <!-- no-go area boundary -->
     <style-line cap="butt" fix="true" id="fence" stroke="#444444" width="1.2" />
     <style-line cap="butt" id="aeroway:runway" stroke="#c8ccbe" width="1.8" />
 
+    <!--park-->
+    <style-line cap="butt" fade="14" fix="true" id="park" stroke="#9ac56e" width="1.0" />
+
+    <!--building-->
     <!-- <style-line id="building" stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/> -->
-    <!-- <style-line id="building" stroke="#d0cec8" width="1.0" fix="true" cap="butt" fade="15"/>
-      <style-area id="building" fill="#e9e6e3" fade="15"/> -->
-
+    <!-- <style-line id="building" stroke="#d0cec8" width="1.0" fix="true" cap="butt" fade="15"/> -->
     <style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
-    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
 
+    <!--water-->
+    <style-line cap="butt" fix="true" id="water" stroke="#a4bbcc" width="1.0" />
+    <style-line fix="false" id="river" stroke="#a4bbcc" use="water" />
+
+
+    <!--###### ASSIGNMENT ######-->
 
     <atlas img="atlas/osm.png">
         <rect id="airport" pos="1 40 16 16" />
@@ -121,7 +156,7 @@
         <rect id="cafe" pos="67 88 16 16" />
         <rect id="camping" pos="71 110 16 16" />
         <rect id="cinema" pos="1 102 24 24" />
-        <rect id="city" pos="55 11 10 10" />
+        <rect id="city" pos="55 11 10 10" /> <!--used as dot-->
         <rect id="department_store" pos="67 70 16 16" />
         <rect id="fast_food" pos="67 52 16 16" />
         <rect id="florist" pos="67 34 16 16" />
@@ -592,10 +627,14 @@
             <m zoom-min="17">
                 <extrusion line-color="#ffd9d8d6" side-color="#eaecebe9" top-color="#eaf9f8f6" />
             </m>
-            <m zoom-min="17">
-                <text priority="9" use="caption-small-blue" />
-                <caption style="bold" fill="#606060" font-family="condensed" k="addr:housenumber"
-                    size="10" stroke="#ffffff" stroke-width="2.0" />
+
+            <!--Only add house numbers where no name exist-->
+            <m k="addr:housenumber" zoom-min="17">
+                <m k="name" v="~">
+                    <caption style="bold" fill="#606060" font-family="condensed"
+                        k="addr:housenumber" priority="10" size="10" stroke="#ffffff"
+                        stroke-width="2.0" />
+                </m>
             </m>
         </m>
 
@@ -947,11 +986,11 @@
         <m k="admin_level">
             <m k="admin_level" v="4">
                 <line fix="true" stipple="4" stipple-stroke="#888888" stipple-width="1.0"
-                    stroke="#dadada" width="1.3" />
+                    stroke="#dadada" width="2.0" />
             </m>
             <m k="admin_level" v="2">
                 <line fix="true" stipple="6" stipple-stroke="#647b9c" stipple-width="1.0"
-                    stroke="#dadada" width="1.6" />
+                    stroke="#bbbbbb" width="2.5" />
             </m>
         </m>
         <!-- </m> -->
@@ -976,35 +1015,167 @@
 
     </m><!-- end e="way" -->
 
-    <m e="node" select="first">
+    <!--All POIs and WAYs with names-->
+    <m k="name" select="first">
 
-        <m k="barrier">
-            <m zoom-min="10">
-                <m v="bollard">
-                    <circle fill="#909090" radius="1.5" />
-                </m>
-                <m v="block">
-                    <circle fill="#909090" radius="1.5" />
-                </m>
-                <m v="gate">
-                    <circle fill="#909090" radius="1.5" />
-                </m>
-                <m v="lift_gate">
-                    <circle fill="#909090" radius="1.5" />
-                </m>
+        <!-- aeroway -->
+        <m k="aeroway">
+            <m v="helipad" zoom-min="16">
+                <symbol src="heliport" />
+            </m>
+            <m v="aerodrome|airport" zoom-min="9">
+                <symbol src="airport" />
+            </m>
+            <m k="name" zoom-min="16">
+                <text use="caption-small-blue" />
             </m>
         </m>
 
-        <m k="highway">
-            <m v="traffic_signals">
-                <circle fill="#ff0000" radius="1.5" />
+        <m k="amenity">
+            <m select="first">
+                <!--<m v="bench" zoom-min="17">
+                    <symbol src="assets:symbols/bench.svg" />
+                </m>-->
+                <m v="drinking_water" zoom-min="17">
+                    <!--<symbol src="drinking_water" />-->
+                </m>
+                <m v="fire_station" zoom-min="17">
+                    <!--<symbol src="fire_station" />-->
+                </m>
+                <m v="place_of_worship" zoom-min="17">
+                    <m k="denomination|religion" v="jewish">
+                        <symbol src="synagogue" />
+                    </m>
+                    <m k="denomination|religion" v="muslim|moslem">
+                        <symbol src="mosque" />
+                    </m>
+                    <m k="denomination|religion" v="christian">
+                        <symbol src="church" />
+                    </m>
+                </m>
+                <m v="post_box" zoom-min="17">
+                    <!--<symbol src="postbox" />-->
+                </m>
+                <m v="recycling" zoom-min="17">
+                    <!--<symbol src="recycling" />-->
+                </m>
+                <m v="shelter" zoom-min="17">
+                    <symbol src="shelter" />
+                </m>
+                <m v="telephone" zoom-min="17">
+                    <symbol src="telephone" />
+                </m>
+                <m v="toilets" zoom-min="17">
+                    <symbol src="toilets" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="caption-small-blue" />
+                </m>
             </m>
-            <m v="bus_stop">
-                <circle fill="#ff0000" radius="1.5" />
+
+            <m select="first"> <!--Accomodation-->
+                <m v="parking" zoom-min="17">
+                    <symbol src="parking" />
+                </m>
+                <m v="bicycle_rental" zoom-min="17">
+                    <symbol src="bicycle_rental" />
+                </m>
+                <m v="bus_station" zoom-min="17">
+                    <symbol src="bus_station" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="accommodation" />
+                </m>
             </m>
-            <m v="turning_circle">
-                <circle fill="#ffffff" radius="1.4" scale-radius="true" />
+
+            <m select="first"> <!--Education-->
+                <m v="kindergarten" zoom-min="17">
+                    <!--<symbol src="kindergarten" />-->
+                </m>
+                <m v="library" zoom-min="17">
+                    <symbol src="library" />
+                </m>
+                <m v="school" zoom-min="17">
+                    <symbol src="school" />
+                </m>
+                <m v="university|college" zoom-min="17">
+                    <!--<symbol src="university" />-->
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="education" />
+                </m>
             </m>
+
+            <m select="first"> <!--Entertainment-->
+                <m v="cinema" zoom-min="17">
+                    <symbol src="cinema" />
+                </m>
+                <m v="fountain" zoom-min="17">
+                    <!--<symbol src="fountain" />-->
+                </m>
+                <m v="theatre" zoom-min="17">
+                    <symbol src="theatre" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="entertainment" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Health-->
+                <m v="hospital" zoom-min="15">
+                    <symbol src="hospital" />
+                </m>
+                <m v="pharmacy" zoom-min="17">
+                    <symbol src="pharmacy" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="health" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Shop-->
+                <m v="atm" zoom-min="17">
+                    <symbol src="atm" />
+                </m>
+                <m v="bank" zoom-min="17">
+                    <!--<symbol src="bank" />-->
+                </m>
+                <m v="fuel" zoom-min="17">
+                    <!--<symbol src="fuel" />-->
+                </m>
+                <m v="post_office" zoom-min="17">
+                    <!--<symbol src="post_office" />-->
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="shop" />
+                </m>
+            </m>
+
+            <m select="first"> <!--Tavern-->
+                <m v="cafe" zoom-min="17">
+                    <symbol src="cafe" />
+                </m>
+                <m v="bar" zoom-min="17">
+                    <symbol src="bar" />
+                </m>
+                <m v="fast_food" zoom-min="17">
+                    <symbol src="fast_food" />
+                </m>
+                <m v="pub" zoom-min="17">
+                    <symbol src="pub" />
+                </m>
+                <m v="restaurant" zoom-min="17">
+                    <symbol src="restaurant" />
+                </m>
+                <m select="when-matched" zoom-min="17">
+                    <text priority="9" use="tavern" />
+                </m>
+            </m>
+
+            <!--Style all missed amenities-->
+            <!--<m select="when-missed" zoom-min="17">-->
+            <!--<text use="caption-small-blue" />-->
+            <!--</m>-->
         </m>
 
         <!-- historic -->
@@ -1055,183 +1226,36 @@
         <!-- railway -->
         <m k="railway">
             <m v="station" zoom-min="14">
-                <circle fill="#af3a3a" radius="6" stroke="#606060" stroke-width="1.5" />
+                <!--<circle fill="#af3a3a" radius="6" stroke="#606060" stroke-width="1.5" />-->
                 <caption style="bold" dy="15" fill="#af3a3a" k="name" size="14" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
 
             <m v="halt|tram_stop">
-                <circle fill="#af3a3a" radius="4" stroke="#606060" stroke-width="1.5" />
+                <!--<circle fill="#af3a3a" radius="4" stroke="#606060" stroke-width="1.5" />-->
                 <caption style="bold" dy="10" fill="#af3a3a" k="name" size="12" stroke="#ffffff"
                     stroke-width="2.0" />
             </m>
-            <m v="level_crossing">
-                <circle fill="#ff0000" radius="1.5" />
-            </m>
         </m>
 
-        <!-- aeroway -->
-        <m k="aeroway">
-            <m k="aeroway" v="helipad" zoom-min="16">
-                <symbol src="heliport" />
+        <m k="shop" select="first">
+            <m v="bakery" zoom-min="15">
+                <symbol src="shop_bakery" />
             </m>
-            <m k="aeroway" v="aerodrome|airport">
-                <symbol src="airport" />
+            <m v="florist" zoom-min="15">
+                <symbol src="florist" />
             </m>
-        </m>
-
-        <m k="amenity">
-
-            <m select="first" zoom-min="15">
-                <m v="hospital">
-                    <symbol src="hospital" />
-                </m>
-                <m k="amenity" v="school">
-                    <symbol src="school" />
-                </m>
-                <m k="amenity" v="university|college">
-                    <symbol src="university" />
-                </m>
-                <m k="amenity" v="library">
-                    <symbol src="library" />
-                </m>
-                <m k="amenity" v="cinema">
-                    <symbol src="cinema" />
-                </m>
-
-                <m select="when-matched">
-                    <text use="poi" />
-                </m>
+            <m v="hairdresser" zoom-min="16">
+                <symbol src="shop_hairdresser" />
             </m>
-
-            <m select="first" zoom-min="16">
-                <m v="atm" zoom-min="17">
-                    <symbol src="atm" />
-                </m>
-                <m v="cafe">
-                    <symbol src="cafe" />
-                </m>
-                <m v="pub">
-                    <symbol src="pub" />
-                </m>
-                <m v="bar">
-                    <symbol src="bar" />
-                </m>
-                <m v="fast_food">
-                    <symbol src="fast_food" />
-                </m>
-                <m v="restaurant">
-                    <symbol src="restaurant" />
-                </m>
-                <m k="amenity" v="bus_station">
-                    <symbol src="bus_station" />
-                </m>
-                <m select="when-matched">
-                    <text use="poi" />
-                </m>
+            <m v="supermarket|organic" zoom-min="15">
+                <symbol src="shop_supermarket" />
             </m>
-
-            <m select="first" zoom-min="17">
-                <m k="amenity" v="bank">
-                    <symbol src="bank" />
-                </m>
-                <m k="amenity" v="bench">
-                    <symbol src="bench" />
-                </m>
-                <m k="amenity" v="bicycle_rental">
-                    <symbol src="bicycle_rental" />
-                </m>
-                <m k="amenity" v="drinking_water">
-                    <symbol src="drinking_water" />
-                </m>
-                <m k="amenity" v="fire_station">
-                    <symbol src="fire_station" />
-                </m>
-                <m k="amenity" v="fountain">
-                    <symbol src="fountain" />
-                </m>
-                <m k="amenity" v="fuel">
-                    <symbol src="petrolStation" />
-                </m>
-                <m k="amenity" v="kindergarten">
-                    <symbol src="kindergarten" />
-                </m>
-                <m k="amenity" v="parking">
-                    <symbol src="parking" />
-                </m>
-                <m k="amenity" v="pharmacy">
-                    <symbol src="pharmacy" />
-                </m>
-                <m k="amenity" v="place_of_worship">
-                    <m k="denomination|religion" v="jewish">
-                        <symbol src="synagogue" />
-                    </m>
-                    <m k="denomination|religion" v="muslim|moslem">
-                        <symbol src="mosque" />
-                    </m>
-                    <m k="denomination|religion" v="christian">
-                        <symbol src="church" />
-                    </m>
-                </m>
-                <m k="amenity" v="post_box">
-                    <symbol src="postbox" />
-                </m>
-                <m k="amenity" v="post_office">
-                    <symbol src="postoffice" />
-                </m>
-                <m k="amenity" v="recycling">
-                    <symbol src="recycling" />
-                </m>
-                <m k="amenity" v="shelter">
-                    <symbol src="shelter" />
-                </m>
-                <m k="amenity" v="telephone">
-                    <symbol src="telephone" />
-                </m>
-                <m k="amenity" v="theatre">
-                    <symbol src="theatre" />
-                </m>
-                <m select="when-matched">
-                    <text use="poi" />
-                </m>
-            </m>
-
             <m zoom-min="17">
-                <m k="amenity" v="toilets">
-                    <symbol src="toilets" />
-                </m>
+                <symbol src="city" />
             </m>
-
-            <m zoom-min="15">
-                <text use="caption-small-blue" />
-            </m>
-        </m>
-
-        <m k="shop">
-            <m select="first" zoom-min="15">
-                <m v="bakery">
-                    <symbol src="shop_bakery" />
-                </m>
-                <m v="florist">
-                    <symbol src="florist" />
-                </m>
-                <m v="hairdresser" zoom-min="16">
-                    <symbol src="shop_hairdresser" />
-                </m>
-                <m v="supermarket|organic">
-                    <symbol src="shop_supermarket" />
-                </m>
-
-                <m zoom-min="17">
-                    <symbol src="city" />
-                </m>
-
-                <m select="when-matched" zoom-min="17">
-                    <text use="poi" />
-                </m>
-            </m>
-            <m zoom-min="15">
-                <text use="caption-small-blue" />
+            <m select="when-matched" zoom-min="17">
+                <text priority="9" use="shop" />
             </m>
         </m>
 
@@ -1249,39 +1273,96 @@
                 <m v="hotel">
                     <symbol src="hotel" />
                 </m>
-
                 <m select="when-matched">
-                    <text use="poi" />
+                    <text priority="8" use="accommodation" />
                 </m>
             </m>
 
-            <!-- <m zoom-min="16" select="first">
-              <m v="information" select="first">
-              <m k="name">
+            <!-- <m v="information" zoom-min="17">
+              <m k="name" v="*">
               <symbol src="information" />
-              <text use="poi" />
               </m>
-              <m>
-              <circle r="1.5" fill="#ff0000" />
-              </m>
-              </m>
-              </m>
-            -->
-            <m v="viewpoint">
-                <symbol src="view_point" />
+            </m>-->
+            <m select="first" zoom-min="15">
+                <m v="attraction">
+                    <symbol src="city" />
+                </m>
+                <m v="museum">
+                    <symbol src="museum" />
+                </m>
+                <m v="viewpoint">
+                    <symbol src="view_point" />
+                </m>
+                <m select="when-matched">
+                    <text priority="8" use="entertainment" />
+                </m>
             </m>
-            <m v="museum">
-                <symbol src="museum" />
-            </m>
-
-            <m zoom-min="15">
-                <text use="caption-small-blue" />
-            </m>
-        </m>
-
-        <m k="natural" v="tree" zoom-min="15">
-            <circle radius="10" />
         </m>
     </m>
 
-</rendertheme>
\ No newline at end of file
+    <!--<m e="node" select="first">-->
+    <!--<m k="barrier">-->
+    <!--<m zoom-min="10">-->
+    <!--<m v="bollard">-->
+    <!--<circle fill="#909090" radius="1.5" />-->
+    <!--</m>-->
+    <!--<m v="block">-->
+    <!--<circle fill="#909090" radius="1.5" />-->
+    <!--</m>-->
+    <!--<m v="gate">-->
+    <!--<circle fill="#909090" radius="1.5" />-->
+    <!--</m>-->
+    <!--<m v="lift_gate">-->
+    <!--<circle fill="#909090" radius="1.5" />-->
+    <!--</m>-->
+    <!--</m>-->
+    <!--</m>-->
+
+    <!--<m k="highway">-->
+    <!--<m v="traffic_signals">-->
+    <!--<circle fill="#ff0000" radius="1.5" />-->
+    <!--</m>-->
+    <!--<m v="bus_stop">-->
+    <!--<circle fill="#ff0000" radius="1.5" />-->
+    <!--</m>-->
+    <!--<m v="turning_circle">-->
+    <!--<circle fill="#ffffff" radius="1.4" scale-radius="true" />-->
+    <!--</m>-->
+    <!--</m>-->
+
+    <!--<m k="natural">-->
+    <!--<m select="first">-->
+    <!--<m k="natural" v="tree" zoom-min="15">-->
+    <!--<circle radius="10" />-->
+    <!--</m>-->
+    <!--<m v="cave_entrance" zoom-min="15">-->
+    <!--<symbol src="assets:symbols/poi/cave.svg" />-->
+    <!--<m zoom-min="17">-->
+    <!--<text use="caption-small-blue" />-->
+    <!--</m>-->
+    <!--</m>-->
+    <!--<m v="peak" zoom-min="12">-->
+    <!--<symbol src="assets:symbols/peak.svg" />-->
+    <!--<caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"-->
+    <!--stroke-width="2.0" />-->
+    <!--<caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"-->
+    <!--stroke-width="2.0" />-->
+    <!--</m>-->
+    <!--<m v="volcano" zoom-min="12">-->
+    <!--<symbol src="assets:symbols/volcano.svg" />-->
+    <!--<caption style="bold" dy="12" fill="#4D2F08" k="name" size="14" stroke="#ffffff"-->
+    <!--stroke-width="2.0" />-->
+    <!--<caption style="bold" dy="-12" fill="#4D2F08" k="ele" size="12" stroke="#ffffff"-->
+    <!--stroke-width="2.0" />-->
+    <!--</m>-->
+    <!--</m>-->
+    <!--</m>-->
+
+    <!--<m k="railway">-->
+    <!--<m v="level_crossing">-->
+    <!--<circle fill="#ff0000" radius="1.5" />-->
+    <!--</m>-->
+    <!--</m>-->
+    <!--</m>-->
+
+</rendertheme>