diff --git a/vtm/assets/styles/default.xml b/vtm/assets/styles/default.xml
index 21f08e41..c2e33b93 100644
--- a/vtm/assets/styles/default.xml
+++ b/vtm/assets/styles/default.xml
@@ -2,37 +2,25 @@
 <rendertheme xmlns="http://opensciencemap.org/rendertheme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://opensciencemap.org/rendertheme ../../rendertheme.xsd" version="1" map-background="#fffcfa">
 
-  <style-text id="road" k="name" font-size="16" fill="#101010" stroke="#eeeeee" stroke-width="2.0"
-    priority="2" />
+  <!-- base style for fixed width lines -->
+  <style-line id="fix" width="1.0" cap="butt" fix="true" />
 
-  <style-text id="major-road" k="name" font-style="bold" font-size="16" fill="#101010" stroke="#eeeeee"
-    stroke-width="2.0" priority="1" />
+  <style-text id="road" k="name" size="16" fill="#101010" stroke="#eeeeee" stroke-width="2.0" priority="2" />
 
-  <style-text id="poi" k="name" font-size="16" fill="#777744" stroke="#aaffffff" stroke-width="2.0" dy="16"
+  <style-text id="major-road" k="name" style="bold" size="16" fill="#101010" stroke="#eeeeee" stroke-width="2.0"
+    priority="1" />
+
+  <style-text id="poi" k="name" size="16" fill="#777744" stroke="#aaffffff" stroke-width="2.0" dy="16"
     caption="true" />
 
-  <!--<style-area id="residential" fill="#e0dfde" fade="10"/> -->
   <style-area id="residential" fill="#e8e7e3" fade="11" />
 
   <style-area id="railway|industrial" fill="#e6e3e5" fade="10" />
 
-  <!-- "#f0fae7" mint green -->
-  <!-- <style-area id="farmland" fill="#fff8bf" fade="11" /> -->
-  <!--<style-area id="farmland" fill="#f1ebb2" fade="11" /> -->
   <style-area id="farmland" fill="#e7dab5" fade="11" />
 
   <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
-  <style-area id="wood" fill="#d1dbc7" fade="7" blend="11" blend-fill="#9ac56e" />
-
-  <!-- <style-area id="wood"
-    fill="#d1dbc7"
-    fade="7"
-    blend="10"
-    blend-fill="#9ac56e"
-    src="grass3.png"/> -->
-
-  <!-- base style for fixed width lines -->
-  <style-line id="fixed" width="1.0" cap="butt" fix="true" />
+  <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" src="textures/wood.png" />
 
   <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" />
 
@@ -44,13 +32,14 @@
   <style-area id="darkgreen" fill="#c2cba5" fade="10" />
 
   <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
+
   <!-- marsh|wetland|nature_reserve -->
   <style-area id="greens2" fill="#deecb9" fade="12" />
 
   <!-- park|common|green|cemetery|golf_course|dog_park -->
   <!-- <style-area id="park" fill="#a3ca7b" fade="11" src="grass2.png" /> -->
   <style-area id="park" fill="#a3ca7b" fade="11" />
-  <style-line id="park" stroke="#a3ca7b" width="1.0" fix="true" cap="butt" fade="11" />
+  <style-line id="park" stroke="#a3ca7b" width="1.0" fix="true" cap="butt" fade="11" src="textures/grass.png" />
 
   <!-- de:Kleingartengebiet -->
   <style-area id="allotments" fill="#efeae0" fade="12" />
@@ -94,7 +83,7 @@
   <style-line id="river" use="water" stroke="#a4bbcc" fix="false" />
 
   <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
-  <style-area id="water" fill="#99badf" src="water2.png" />
+  <style-area id="water" fill="#99badf" src="textures/water.png" />
 
   <!-- no-go area boundary -->
   <style-line id="fence" stroke="#444444" width="1.2" fix="true" cap="butt" />
@@ -103,12 +92,12 @@
   <!-- <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="#b7b6b3" width="1.0" fix="true" cap="butt" fade="15" />
-  <!-- <style-area id="building" fill="#eae8e6" fade="15"/> -->
-  <style-area id="building" fill="#f2f0eb" fade="15" />
+
+  <style-line id="building" use="fix" stroke="#eeb7b6b3" fade="15" />
+  <style-area id="building" fill="#f2f0eb" fade="15" stroke="#b7b6b3" stroke-width="1.0" />
 
 
-  <atlas img="osm.png">
+  <atlas img="styles/osm.png">
     <rect id="airport" pos="1 40 16 16" />
     <rect id="atm" pos="19 40 16 16" />
     <rect id="bar" pos="1 80 20 20" />
@@ -153,23 +142,30 @@
     <rect id="windmill" pos="55 23 10 15" />
   </atlas>
 
-  <!-- ways -->
-  <m e="way">
+  <!-- all closed ways that are not 'highway' or 'building'-->
+  
+  <m e="way" k="highway|building" v="~" closed="yes">
 
     <!-- landuse base -->
     <m k="landuse">
       <m v="urban">
         <area fill="#f4f3f0" />
       </m>
-      <m v="residential|commercial|retail">
+      
+      <m v="meadow|conservation">
+        <area use="greens" fade="11" />
+      </m>
+      
+      <m v="residential|commercial|retail|farmyard">
         <area use="residential" />
       </m>
     </m>
-    <m k="natural" v="grassland|scrub" zoom-min="10">
+    <m k="natural" v="grassland|scrub">
       <area use="darkgreen" />
     </m>
+
     <m k="landuse">
-      <m zoom-min="10" v="farmland|farm|orchard|vineyard|greenhouse_horticulture|plant_nursery">
+      <m v="farmland|farm|orchard|vineyard|greenhouse_horticulture|plant_nursery">
         <area use="farmland" />
       </m>
       <m v="quarry">
@@ -188,7 +184,7 @@
         stroke="#e4e4e4" width="0.2" /> </m> -->
       <!-- <m k="landuse" v="garages"> <area fill="#d6d6e4" /> </m> -->
     </m>
-    <m k="landuse|natural|leisure||amenity|tourism">
+    <m k="landuse|natural|leisure|amenity|tourism">
       <!-- kind of more like landuse imho -->
       <m k="leisure|landuse" v="nature_reserve">
         <area use="greens2" />
@@ -248,8 +244,8 @@
       </m>
 
       <!-- Heideland, keep below forest -->
-      <m zoom-min="11" v="heath|sand">
-        <area fill="#fffad1" fade="11" />
+      <m zoom-min="10" v="heath|sand">
+        <area fill="#fffad1" fade="10" />
       </m>
       <m k="landuse|natural" v="forest|wood">
         <area use="wood" />
@@ -264,9 +260,7 @@
       <m k="landuse" v="grass">
         <area use="lightgreen" />
       </m>
-      <m k="landuse" v="meadow|conservation">
-        <area use="greens" />
-      </m>
+
       <m k="leisure" v="garden">
         <area use="greens" />
       </m>
@@ -360,70 +354,70 @@
       <m k="leisure" v="track">
         <line stroke="#c1bcb6" width="1.3" cap="butt" fix="true" />
       </m>
-
     </m><!-- end landuse|natural|leisure||amenity|tourism -->
-
-    <!-- waterways -->
-    <m k="waterway">
-      <m v="ditch|drain" zoom-min="14">
-        <line use="water" width="0.2" fade="14" />
+  </m>
+  
+  <!-- waterways -->
+  <m e="way" k="waterway">
+    <m v="ditch|drain" zoom-min="14">
+      <line use="water" width="0.2" fade="14" />
+    </m>
+    <m v="canal">
+      <line use="river" width="-0.3" />
+    </m>
+    <m v="stream" zoom-min="13">
+      <line use="water" width="0.5" fade="13" />
+    </m>
+    <m v="river" select="first">
+      <m zoom-min="12">
+        <line use="river" width="0.3" />
       </m>
-      <m v="canal">
-        <line use="river" width="-0.3" />
+      <!-- zoom <= 11 -->
+      <m k="rank" v="~|-1" zoom-min="9">
+        <line use="water" width="0.2" fade="9" />
       </m>
-      <m v="stream" zoom-min="13">
-        <line use="water" width="0.5" fade="13"/>
+      <m k="rank" v="0|1|2">
+        <line use="water" width="0.3" fade="2" />
       </m>
-      <m v="river">
-        <m zoom-min="12">
-          <line use="river" width="0.3" />
-        </m>
-        <m zoom-max="11">
-          <m k="rank" v="0|1|2">
-            <line use="water" width="0.3" fade="2" />
-          </m>
-          <m k="rank" v="3" zoom-min="3">
-            <line use="water" width="0.3" fade="3" />
-          </m>
-          <m k="rank" v="4" zoom-min="4">
-            <line use="water" width="0.3" fade="4" />
-          </m>
-          <m k="rank" v="5" zoom-min="5">
-            <line use="water" width="0.3" fade="5" />
-          </m>
-          <m k="rank" v="6" zoom-min="6">
-            <line use="water" width="0.2" fade="6" />
-          </m>
-          <m k="rank" v="7" zoom-min="7">
-            <line use="water" width="0.2" fade="7" />
-          </m>
-          <m k="rank" v="8" zoom-min="8">
-            <line use="water" width="0.1" fade="8" />
-          </m>
-          <m k="rank" v="9" zoom-min="9">
-            <line use="water" width="0.1" fade="9" />
-          </m>
-          <m k="rank" v="~|-1" zoom-min="9">
-            <line use="water" width="0.2" fade="9" />
-          </m>
-        </m>
+      <m k="rank" v="3" zoom-min="3">
+        <line use="water" width="0.3" fade="3" />
       </m>
-      <m v="riverbank|dock">
-        <area use="water" />
-        <line use="water:outline" />
+      <m k="rank" v="4" zoom-min="4">
+        <line use="water" width="0.3" fade="4" />
       </m>
-      <m v="weir">
-        <line use="fixed" stroke="#000088" />
+      <m k="rank" v="5" zoom-min="5">
+        <line use="water" width="0.3" fade="5" />
       </m>
-      <m v="dam" zoom-min="12">
-        <line use="fixed" stroke="#ababab" width="0.2" />
+      <m k="rank" v="6" zoom-min="6">
+        <line use="water" width="0.2" fade="6" />
       </m>
-      <m k="lock" v="yes|true">
-        <line use="fixed" stroke="#f8f8f8" width="0.5" />
+      <m k="rank" v="7" zoom-min="7">
+        <line use="water" width="0.2" fade="7" />
+      </m>
+      <m k="rank" v="8" zoom-min="8">
+        <line use="water" width="0.1" fade="8" />
+      </m>
+      <m k="rank" v="9" zoom-min="9">
+        <line use="water" width="0.1" fade="9" />
       </m>
     </m>
+    <m v="riverbank|dock">
+      <area use="water" />
+      <line use="water:outline" />
+    </m>
+    <m v="weir">
+      <line use="fix" stroke="#000088" />
+    </m>
+    <m v="dam" zoom-min="12">
+      <line use="fix" stroke="#ababab" width="0.2" />
+    </m>
+    <m k="lock" v="yes|true">
+      <line use="fix" stroke="#f8f8f8" width="0.5" />
+    </m>
+  </m>
 
-    <m k="natural" v="water">
+  <m e="way">
+    <m k="natural" v="water" closed="yes">
       <area use="water" />
       <line use="water:outline" />
     </m>
@@ -436,101 +430,96 @@
       /> </m> </m> -->
 
     <!-- outline 0 -->
-    <style-outline id="glow" stroke="#000000" width="0.2" blur="1.0" />
-    <style-outline id="0" stroke="#44000000" width="0.1" />
-    <!-- tunnel -->
-    <m k="tunnel" v="yes" zoom-min="11">
-      <!-- highway tunnels -->
-      <m k="highway">
-        <m zoom-min="16">
-          <m v="steps">
-            <line use="steps" />
-            <!-- <outline use="0"/> -->
+    <outline-layer id="glow" stroke="#000000" width="0.2" blur="1.0" />
+    <outline-layer id="0" stroke="#44000000" width="0.1" />
+
+    <!-- match tunnel-tag (to ensure tunnel key is present) -->
+    <m k="tunnel" zoom-min="11">
+      <!-- match tunnel-tag that are not 'no' or 'false' -->
+      <m k="tunnel" v="-|no|false">
+        <!-- highway tunnels -->
+        <m k="highway">
+          <m zoom-min="16">
+            <m v="steps">
+              <line use="steps" />
+              <!-- <outline use="0"/> -->
+            </m>
+            <!-- <m v="track|footway|path|cycleway" zoom-min="16">
+              <line use="footway:z16"/>
+              </m> -->
           </m>
-          <!-- <m v="track|footway|path|cycleway" zoom-min="16">
-            <line use="footway:z16"/>
-            </m> -->
-        </m>
-        <m zoom-min="14">
-          <m v="footway">
-            <line use="footway" />
-          </m>
-          <m v="cycleway">
-            <line use="highway:cycleway" />
-          </m>
-          <m v="track">
-            <line use="highway:track" />
-          </m>
-          <m v="path">
-            <line use="highway:path" />
-          </m>
-          <m v="bridleway">
-            <line use="bridleway" />
-          </m>
-          <m v="construction">
-            <line use="construction" />
-            <outline use="0" />
-          </m>
-          <m v="service">
-            <m k="service" v="~|parking_aisle">
-              <line use="highway-service" />
+          <m zoom-min="14">
+            <m v="footway">
+              <line use="footway" />
+            </m>
+            <m v="cycleway">
+              <line use="highway:cycleway" />
+            </m>
+            <m v="track">
+              <line use="highway:track" />
+            </m>
+            <m v="path">
+              <line use="highway:path" />
+            </m>
+            <m v="bridleway">
+              <line use="bridleway" />
+            </m>
+            <m v="construction">
               <outline use="0" />
+              <line use="construction" outline="0" />
+            </m>
+            <m v="service">
+              <m k="service" v="~|parking_aisle">
+                <line use="highway-service" outline="0" />
+              </m>
             </m>
           </m>
-        </m>
-        <m v="trunk_link|motorway_link">
-          <line use="trunk_link" />
-          <outline use="0" />
-          <text use="major-road" />
-        </m>
-        <m zoom-min="13">
-          <m v="byway|pedestrian">
-            <line use="pedestrian" />
-            <outline use="0" />
+          <m v="trunk_link|motorway_link">
+            <line use="trunk_link" outline="0" />
+            <text use="major-road" />
+          </m>
+          <m zoom-min="13">
+            <m v="byway|pedestrian">
+              <line use="pedestrian" outline="0" />
+              <text use="road" />
+            </m>
+            <m v="residential|road|unclassified|living_street">
+              <line use="residential" outline="0" />
+              <text use="road" />
+            </m>
+          </m>
+          <m v="tertiary|secondary_link">
+            <line use="tertiary" outline="0" />
             <text use="road" />
           </m>
-          <m v="residential|road|unclassified|living_street">
-            <line use="residential" />
-            <outline use="0" />
-            <text use="road" />
+          <m v="secondary|primary_link">
+            <line use="secondary:z11" outline="0" />
+            <text use="major-road" />
+          </m>
+          <m v="primary">
+            <line use="primary:z11" outline="0" />
+            <text use="major-road" />
+          </m>
+          <m v="trunk">
+            <line use="trunk" blur="0.3" outline="0" />
+            <!-- <outline use="glow"/> -->
+            <text use="major-road" />
+          </m>
+          <m v="motorway">
+            <line use="highway:z11" blur="0.3" outline="0" />
+            <!-- <outline use="glow"/> -->
+            <text use="major-road" />
           </m>
         </m>
-        <m v="tertiary|secondary_link">
-          <line use="tertiary" />
-          <outline use="0" />
-          <text use="road" />
-        </m>
-        <m v="secondary|primary_link">
-          <line use="secondary:z11" />
-          <outline use="0" />
-          <text use="major-road" />
-        </m>
-        <m v="primary">
-          <line use="primary:z11" />
-          <outline use="0" />
-          <text use="major-road" />
-        </m>
-        <m v="trunk">
-          <line use="trunk" blur="0.3" />
-          <outline use="0" />
-          <!-- <outline use="glow"/> -->
-          <text use="major-road" />
-        </m>
-        <m v="motorway">
-          <line use="highway:z11" blur="0.3" />
-          <outline use="0" />
-          <!-- <outline use="glow"/> -->
-          <text use="major-road" />
-        </m>
-      </m>
 
-      <!-- railway tunnel -->
-      <m k="railway">
-        <!-- <m k="railway" v="tram|subway|light_rail|narrow_gauge">
-          <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
-          </m> -->
-        <m k="railway" v="rail">
-          <line stroke="#aa888888" width="0.9" cap="butt" fix="true" />
+        <!-- railway tunnel -->
+        <m k="railway">
+          <!-- <m k="railway" v="tram|subway|light_rail|narrow_gauge">
+            <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
+            </m> -->
+          <m k="railway" v="rail">
+            <line stroke="#aa888888" width="0.9" cap="butt" fix="true" />
+          </m>
         </m>
       </m>
     </m><!-- end tunnel -->
@@ -556,7 +545,6 @@
       </m>
       <!-- Airport passenger building -->
       <m v="terminal|hangar">
-        <line use="building" />
         <area use="building" />
       </m>
     </m>
@@ -568,32 +556,33 @@
 
     <!-- building -->
     <m k="building">
-
       <m zoom-min="14" zoom-max="16">
         <m closed="yes">
           <area use="building" fade="14" />
         </m>
-        <line use="building" fade="14" />
-        <!-- <line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/>
-          <area fill="#e9e6e3" fade="15" /> -->
+        <m closed="no">
+          <line use="building" fade="14" />
+        </m>
       </m>
       <m zoom-min="17">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
-        <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
-          stroke-width="2.0" />
+        <extrusion side-color="#faecebe9" top-color="#faf9f8f6" line-color="#ffd9d8d6" />
+      </m>
+      <m zoom-min="17">
+        <caption k="name" style="bold" size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
+        <caption k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff" stroke-width="2.0" />
       </m>
     </m>
 
     <!-- outline 1 - 4 -->
-    <style-outline id="1" stroke="#aa807040" width="0.1" />
-    <!-- <style-outline id="1" stroke="#404030"/> -->
-    <style-outline id="2" stroke="#c0c0c0" width="0.1" />
-    <style-outline id="primary" stroke="#aa7f7700" width="0.1" />
-    <style-outline id="motorway" stroke="#aa805f2e" width="0.1" />
+    <outline-layer id="1" stroke="#aa807040" width="0.1" />
+    <!-- <outline-layer id="1" stroke="#404030"/> -->
+    <outline-layer id="2" stroke="#c0c0c0" width="0.1" />
+    <outline-layer id="primary" stroke="#aa7f7700" width="0.1" />
+    <outline-layer id="motorway" stroke="#aa805f2e" width="0.1" />
 
     <!-- highway -->
     <m k="highway">
-      <m zoom-min="3" zoom-max="5">
+      <m zoom-min="3" zoom-max="5" select="first">
         <m k="area" v="~|no|false">
           <!-- <m v="secondary|primary_link" zoom-min="9">
             <line stroke="#f2df6d" width="1.3" cap="butt" fix="true" fade="9"/>
@@ -610,47 +599,46 @@
           </m>
         </m>
       </m>
-      <m zoom-min="5" zoom-max="10">
+      <m zoom-min="5" zoom-max="10" select="first">
         <m k="area" v="~|no|false">
           <m v="secondary|primary_link" zoom-min="9">
-            <line stroke="#e2cf5d" width="1.3" cap="butt" fix="true" fade="9" />
+            <line use="fix" stroke="#e2cf5d" width="0.3" fade="9" />
           </m>
           <m v="trunk_link|motorway_link" zoom-min="8">
-            <line stroke="#eec693" width="1.4" cap="butt" fix="true" fade="8" />
+            <line use="fix" stroke="#eec693" width="0.4" fade="8" />
           </m>
           <m v="primary" zoom-min="5">
-            <line stroke="#c6c5a2" width="1.5" cap="butt" fix="true" fade="5" />
+            <line use="fix" stroke="#c6c5a2" width="0.5" fade="5" />
           </m>
           <m v="trunk" zoom-min="5">
-            <line stroke="#c6c5a2" width="1.5" cap="butt" fix="true" fade="5" />
+            <line use="fix" stroke="#c6c5a2" width="0.5" fade="5" />
           </m>
           <m v="motorway">
-            <line stroke="#deb683" width="1.6" cap="butt" fix="true" fade="3" />
+            <line use="fix" stroke="#deb683" width="0.6" fade="3" />
           </m>
         </m>
       </m>
       <m zoom-min="11">
         <!-- when tunnel|bridge is present it must be 'no' -->
         <m k="tunnel|bridge" v="~|no">
-
           <!-- highway area -->
+
           <m k="area" v="yes|true">
-            <m k="tunnel|bridge" v="~|no">
-              <m v="footway" zoom-min="15">
-                <area fill="#fefefe" />
-                <line stroke="#c0c0c0" width="1.0" fix="true" cap="butt" />
-              </m>
-              <m zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
-
-                <area fill="#ffffff" />
-                <line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
-              </m>
-
-              <!-- <m v="path" zoom-min="14">
-                <area fill="#d0d0d0" />
-                </m> -->
+            <m v="footway" zoom-min="15">
+              <area fill="#fefefe" />
+              <line stroke="#c0c0c0" width="1.0" fix="true" cap="butt" />
             </m>
+
+            <m zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
+              <area fill="#ffffff" />
+              <line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
+            </m>
+
+            <!-- <m v="path" zoom-min="14">
+              <area fill="#d0d0d0" />
+              </m> -->
           </m>
+
           <m k="area" v="~|no|false">
             <m zoom-min="16">
               <m v="steps">
@@ -661,8 +649,7 @@
                 <line use="footway:z16"/>
                 </m> -->
               <m v="track|footway|path|cycleway" zoom-min="17">
-                <line use="footway:z17" />
-                <outline use="1" />
+                <line use="footway:z17" outline="1" />
               </m>
             </m>
             <m zoom-min="14">
@@ -682,168 +669,154 @@
                 <line use="bridleway" />
               </m>
               <m v="construction">
-                <line use="construction" />
-                <outline use="1" />
+                <line use="construction" outline="1" />
               </m>
               <m v="service">
                 <!-- matches every service but parking_isle -->
                 <m k="service" v="-|parking_aisle">
-                  <line use="highway-service" />
-                  <outline use="1" />
+                  <line use="highway-service" outline="1" />
                 </m>
                 <m k="service" v="parking_aisle" zoom-min="16">
-                  <line use="highway-service" width="-0.4" />
-                  <outline use="1" />
+                  <line use="highway-service" width="-0.4" outline="1" />
                 </m>
               </m>
             </m>
             <m v="trunk_link|motorway_link">
-              <line use="trunk_link" />
-              <outline use="motorway" />
+              <line use="trunk_link" outline="motorway" />
               <text use="major-road" />
             </m>
             <m zoom-min="13">
               <m v="byway|pedestrian">
-                <line use="residential" width="-0.4" />
-                <outline use="1" />
+                <line use="residential" width="-0.4" outline="1" />
                 <text use="road" />
               </m>
 
             </m>
             <m v="residential|road|unclassified|living_street">
-              <line use="residential" />
-              <outline use="1" />
+              <line use="residential" outline="1" />
               <text use="road" />
             </m>
             <m v="tertiary|secondary_link">
-              <line use="tertiary" />
-              <outline use="1" />
+              <line use="tertiary" outline="1" />
               <text use="road" />
             </m>
             <m v="secondary|primary_link">
-              <!-- <line stroke="#fff939" width="1.6" /> -->
-              <line use="secondary:z11" />
-              <outline use="primary" />
+              <line use="secondary:z11" outline="primary" />
               <text use="major-road" />
             </m>
             <m v="primary">
-              <line use="primary:z11" />
-              <outline use="primary" />
+              <line use="primary:z11" outline="primary" />
               <text use="major-road" />
             </m>
             <m v="trunk">
-              <line use="trunk" />
-              <outline use="motorway" />
+              <line use="trunk" outline="motorway" />
               <text use="major-road" />
             </m>
             <m v="motorway">
-              <line use="highway:z11" />
-              <outline use="motorway" />
+              <line use="highway:z11" outline="motorway" />
               <text use="major-road" />
             </m>
           </m> <!-- end area=~|no|false -->
         </m><!-- end tunnel|bridge=~|no|false -->
-        <m k="bridge" v="yes|true|viaduct|suspension">
-          <!--<m k="bridge" v="\|no|false"> -->
-          <m k="area" v="~|no|false">
 
-            <style-outline id="bridge" stroke="#aa202020" width="0.08" />
-            <m zoom-min="16">
-              <m v="steps">
-                <line use="steps" />
-                <!-- <outline use="bridge"/> -->
-              </m>
-            </m>
-            <m v="track|footway|path|cycleway" zoom-min="15">
-              <line use="footway:z17" cap="butt" />
-              <outline use="bridge" />
-            </m>
-            <m zoom-min="14">
-              <m v="footway">
-                <line use="footway" />
-              </m>
-              <m v="cycleway">
-                <line use="highway:cycleway" />
-              </m>
-              <m v="track">
-                <line use="highway:track" />
-              </m>
-              <m v="path">
-                <line use="highway:path" />
-              </m>
-              <m v="bridleway">
-                <line use="bridleway" />
-              </m>
-              <m v="construction">
-                <line use="construction" cap="square" />
-                <outline use="bridge" />
-              </m>
-              <m v="service">
-                <line use="highway-service" cap="square" />
-                <outline use="bridge" />
-              </m>
-            </m>
-            <m zoom-min="13">
-              <m v="byway|pedestrian">
-                <line use="pedestrian:bridge" />
-                <outline use="bridge" />
-                <text use="road" />
-              </m>
-              <m v="residential|road|unclassified|living_street">
-                <line use="residential:bridge" />
-                <outline use="bridge" />
-                <text use="road" />
-              </m>
-            </m>
-            <m v="tertiary|secondary_link">
-              <line use="tertiary" cap="square" />
-              <outline use="bridge" />
-              <text use="road" />
-            </m>
-            <m v="trunk_link|motorway_link">
-              <line use="trunk_link" cap="square" />
-              <outline use="bridge" />
-              <text use="major-road" />
-            </m>
-            <m v="secondary|primary_link">
-              <!-- <line stroke="#fff939" width="1.6" cap="butt" /> -->
-              <line use="secondary:z11" cap="square" />
-              <outline use="bridge" />
-              <text use="major-road" />
-            </m>
-            <m v="primary">
-              <line use="primary:z11" cap="square" />
-              <outline use="bridge" />
-              <text use="major-road" />
-            </m>
-            <m v="trunk">
-              <line use="trunk" cap="square" />
-              <outline use="bridge" />
-              <text use="major-road" />
-            </m>
-            <m v="motorway">
-              <line use="highway:z11" cap="square" />
-              <outline use="bridge" />
-              <text use="major-road" />
-            </m>
-          </m><!-- end area=~|no|false -->
+        <!-- Bridge casings should be above other roads -->
+        <outline-layer id="bridge" stroke="#aa202020" width="0.08" />
 
-          <!-- highway area -->
-          <m k="area" v="yes|true">
-            <m v="footway" zoom-min="15">
-              <area fill="#fefefe" />
-              <line stroke="#c0c0c0" width="0.15" cap="butt" />
-            </m>
-            <m zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
-              <area fill="#ffffff" />
-              <line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
-            </m>
+        <!-- muse contain bridge -->
+        <m k="bridge">
+          <!-- except bridge=no|false -->
+          <m k="bridge" v="-|no|false">
 
-            <!-- <m v="path" zoom-min="14">
-              <area fill="#d0d0d0" />
-              </m> -->
-          </m>  <!-- end area=yes|true -->
-        </m>  <!-- end bridge=yes -->
+            <!-- no areas -->
+            <m k="area" v="~|no|false">
+
+              <m zoom-min="16">
+                <m v="steps">
+                  <line use="steps" />
+                  <!-- <outline use="bridge"/> -->
+                </m>
+              </m>
+
+              <m zoom-min="15" v="track|footway|path|cycleway">
+                <line use="footway:z17" cap="butt" outline="bridge" />
+              </m>
+
+              <m zoom-min="14" select="first">
+                <m v="footway">
+                  <line use="footway" />
+                </m>
+                <m v="cycleway">
+                  <line use="highway:cycleway" />
+                </m>
+                <m v="track">
+                  <line use="highway:track" />
+                </m>
+                <m v="path">
+                  <line use="highway:path" />
+                </m>
+                <m v="bridleway">
+                  <line use="bridleway" />
+                </m>
+                <m v="construction">
+                  <line use="construction" cap="square" outline="bridge" />
+                </m>
+                <m v="service">
+                  <line use="highway-service" cap="square" outline="bridge" />
+                </m>
+              </m>
+
+              <m zoom-min="13" select="first">
+                <m v="byway|pedestrian">
+                  <line use="pedestrian:bridge" outline="bridge" />
+                  <text use="road" />
+                </m>
+                <m v="residential|road|unclassified|living_street">
+                  <line use="residential:bridge" outline="bridge" />
+                  <text use="road" />
+                </m>
+              </m>
+
+              <m select="first">
+                <m v="tertiary|secondary_link">
+                  <line use="tertiary" cap="square" outline="bridge" />
+                  <text use="road" />
+                </m>
+                <m v="trunk_link|motorway_link">
+                  <line use="trunk_link" cap="square" outline="bridge" />
+                  <text use="major-road" />
+                </m>
+                <m v="secondary|primary_link">
+                  <line use="secondary:z11" cap="square" outline="bridge" />
+                  <text use="major-road" />
+                </m>
+                <m v="primary">
+                  <line use="primary:z11" cap="square" outline="bridge" />
+                  <text use="major-road" />
+                </m>
+                <m v="trunk">
+                  <line use="trunk" cap="square" outline="bridge" />
+                  <text use="major-road" />
+                </m>
+                <m v="motorway">
+                  <line use="highway:z11" cap="square" outline="bridge" />
+                  <text use="major-road" />
+                </m>
+              </m>
+            </m><!-- end area=~|no|false -->
+
+
+            <m k="area" v="yes|true" select="first">
+              <m zoom-min="15" v="footway">
+                <area fill="#fefefe" />
+                <line stroke="#c0c0c0" width="0.15" cap="butt" />
+              </m>
+              <m zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
+                <area fill="#ffffff" />
+                <line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
+              </m>
+            </m>  <!-- end area=yes|true -->
+          </m>  <!-- end bridge=yes -->
+        </m>
       </m> <!-- end zoom-min=11 -->
     </m><!-- end highway -->
 
@@ -858,15 +831,15 @@
     </m>
 
     <!-- man_made features -->
-    <!-- <m k="man_made" v="pier">
+    <m k="man_made" v="pier">
       <m closed="no">
-      <line stroke="#d0d0d0" width="0.4" cap="butt" />
-      <line stroke="#e4e4e4" width="0.3" cap="butt" />
+        <line stroke="#d0d0d0" width="0.4" cap="butt" />
+        <line stroke="#e4e4e4" width="0.3" cap="butt" />
       </m>
       <m closed="yes">
-      <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
+        <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="1.05" />
       </m>
-      </m> -->
+    </m>
 
     <!-- barriers -->
     <m k="barrier">
@@ -877,19 +850,6 @@
       </m>
     </m>
 
-    <!-- non-physical routes -->
-    <!-- <m k="route" v="ferry"> <line stroke="#707070" width="0.3"
-      stroke-dasharray="15,10" cap="butt" /> </m> -->
-
-    <!-- aerial ways -->
-    <!-- <m k="aerialway"> <line stroke="#202020" width="0.4"
-      cap="butt" /> <m k="aerialway" v="cable_car"> <lineSymbol
-      src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png"
-      /> </m> <m k="aerialway" v="chair_lift"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png"
-      /> </m> <m k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png"
-      /> </m> <m zoom-min="14"> <text k="name" font-style="bold"
-      font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </m>
-      </m> -->
 
     <!-- railway (no tunnel) -->
     <m k="railway" zoom-min="12">
@@ -957,20 +917,8 @@
 
     <!--<m k="boundary" v="administrative"> -->
     <m k="admin_level">
-      <!-- <m k="admin_level" v="11"> <line stroke="#f9574b" width="0.1"
-        fix="true" cap="butt" /> </m> <m k="admin_level"
-        v="10"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt"
-        /> </m> <m k="admin_level" v="9"> <line stroke="#f9574b" width="0.1"
-        fix="true" cap="butt" /> </m> <m k="admin_level"
-        v="8"> <line stroke="#f9574b" width="0.3" fix="true" cap="butt"
-        /> </m> <m k="admin_level" v="7"> <line stroke="#f9574b" width="0.1"
-        fix="true" cap="butt" /> </m> <m k="admin_level"
-        v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt"
-        /> </m> <m k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
-        fix="true" cap="butt" /> </m> -->
       <m k="admin_level" v="4">
         <line stroke="#fafafa" width="1.1" fix="true" cap="butt" stipple-width="1.05" stipple="2" stipple-stroke="#888888" />
-
       </m>
       <m k="admin_level" v="3">
         <line stroke="#999999" width="1.2" fix="true" cap="butt" />
@@ -978,95 +926,97 @@
       <m k="admin_level" v="2">
         <line stroke="#606060" width="1.2" fix="true" cap="butt" />
       </m>
-      <!-- <m k="admin_level" v="1">
-        <line stroke="#ff0000" width="0.95" fix="true" cap="butt" />
-        </m> -->
-
     </m>
     <!-- </m> -->
 
     <!-- historic -->
     <!-- <m k="historic" v="ruins" zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0"
+      <caption k="name" style="bold" size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0"
       />
       </m> -->
 
     <!-- place -->
     <m k="place" v="locality" zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
-    </m>
-    <m k="debug" v="area">
-      <line stroke="#ff0000" width="1.2" fix="true" cap="butt" />
-      <area fill="#880000ff" />
-      <caption k="name" font-size="15" fill="#ff0000" stroke="#444444" stroke-width="2.0" />
-    </m>
-    <m k="debug" v="way">
-      <line stroke="#00ffff" width="1.5" fix="true" cap="butt" />
-      <caption k="name" font-size="15" fill="#00ffff" stroke="#444444" stroke-width="2.0" />
-    </m>
-    <m k="debug" v="box">
-      <line stroke="#000000" width="1.5" fix="true" cap="butt" />
+      <caption k="name" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
     </m>
 
-    <!-- HACK!!! render building models last -->
-    <m k="building" zoom-min="17">
-      <area use="building" fade="15" />
+    <m k="highway" v="track">
+      <m k="areay" v="yes">
+        <area fill="#aaff0000" />
+      </m>
     </m>
+
   </m><!-- end e="way" -->
-  <m e="node">
-    <!-- barrier -->
-    <m k="barrier" v="bollard">
-      <circle r="1.5" fill="#909090" />
-    </m>
-    <m k="debug">
-      <caption k="name" font-size="16" fill="#0000ff" />
+
+  <m e="node" select="first">
+
+    <m k="barrier">
+      <m zoom-min="10">
+        <m v="bollard">
+          <circle r="1.5" fill="#909090" />
+        </m>
+        <m v="block">
+          <circle r="1.5" fill="#909090" />
+        </m>
+        <m v="gate">
+          <circle r="1.5" fill="#909090" />
+        </m>
+        <m v="lift_gate">
+          <circle r="1.5" fill="#909090" />
+        </m>
+      </m>
     </m>
 
-    <!-- highway -->
-    <!-- <m k="highway"> <m k="highway" v="turning_circle">
-      <circle r="1.4" scale-radius="true" fill="#ffffff" /> </m> </m> -->
+    <m k="highway">
+      <m v="traffic_signals">
+        <circle r="1.5" fill="#ff0000" />
+      </m>
+      <m v="bus_stop">
+        <circle r="1.5" fill="#ff0000" />
+      </m>
+      <m v="turning_circle">
+        <circle r="1.4" scale-radius="true" fill="#ffffff" />
+      </m>
+    </m>
 
     <!-- historic -->
     <!-- <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
       width="1.5" /> <m zoom-min="17"> <caption
-      k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
+      k="name" dy="-10" style="bold" size="10" fill="#4040ff" stroke="#ffffff"
       width="2.0" /> </m> </m> -->
 
     <!-- house numbers -->
     <!-- <m k="addr:housenumber" zoom-min="18"> <caption
-      k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
+      k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff"
       width="2.0" /> </m> -->
 
     <!-- place -->
     <m k="place">
       <m v="suburb" zoom-max="14">
-        <caption k="name" font-style="italic" font-size="17" fill="#606060" stroke="#ffffff" stroke-width="2.0"
-          priority="4" />
+        <caption k="name" style="italic" size="17" fill="#606060" stroke="#ffffff" stroke-width="2.0" priority="4" />
       </m>
       <m v="village" zoom-max="14">
-        <caption k="name" font-size="17" fill="#444411" stroke="#ffffff" stroke-width="2.0" priority="3" />
+        <caption k="name" size="17" fill="#444411" stroke="#ffffff" stroke-width="2.0" priority="3" />
       </m>
       <m v="island" zoom-min="10">
-        <caption k="name" font-style="bold" font-size="20" fill="#000000" stroke="#ffffff" stroke-width="2.0"
-          priority="1" />
+        <caption k="name" style="bold" size="20" fill="#000000" stroke="#ffffff" stroke-width="2.0" priority="1" />
       </m>
       <m v="town">
-        <caption k="name" font-size="19" fill="#000000" stroke="#ffffff" stroke-width="2.0" priority="2" dy="20"
+        <caption k="name" size="19" fill="#000000" stroke="#ffffff" stroke-width="2.0" priority="2" dy="20"
           symbol="town" />
       </m>
       <m v="city">
         <m zoom-min="7">
-          <caption k="name" font-style="bold" font-size="19" fill="#000000" stroke="#ffffff" stroke-width="2.0"
-            priority="1" dy="14" symbol="city" />
+          <caption k="name" style="bold" size="19" fill="#000000" stroke="#ffffff" stroke-width="2.0" priority="1"
+            dy="14" symbol="city" />
         </m>
         <m zoom-max="6">
-          <caption k="name" font-size="19" fill="#000000" stroke="#ffffff" stroke-width="2.0" priority="1" dy="14"
+          <caption k="name" size="19" fill="#000000" stroke="#ffffff" stroke-width="2.0" priority="1" dy="14"
             symbol="city" />
         </m>
       </m>
       <m v="country">
-        <caption k="name" font-style="bold" font-size="20" fill="#000000" stroke="#ffffff" stroke-width="2.0"
-          priority="0" />
+        <caption k="name" style="bold" size="20" fill="#000000" stroke="#ffffff" stroke-width="2.0" priority="0" />
       </m>
     </m>
 
@@ -1074,13 +1024,15 @@
     <m k="railway">
       <m v="station" zoom-min="14">
         <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
-        <!-- <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d"
-          stroke="#ffffff" stroke-width="2.0" /> -->
+        <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
-      <m v="halt|tram_stop" zoom-min="17">
+
+      <m v="halt|tram_stop">
         <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
-        <!-- <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d"
-          stroke="#ffffff" stroke-width="2.0" /> -->
+        <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
+      </m>
+      <m v="level_crossing">
+        <circle r="1.5" fill="#ff0000" />
       </m>
     </m>
 
@@ -1093,11 +1045,29 @@
         <symbol src="airport" />
       </m>
     </m>
-    <m k="amenity" zoom-min="15">
-      <m v="hospital" zoom-min="15">
-        <symbol src="hospital" />
+
+    <m k="amenity">
+
+      <m zoom-min="15" select="first">
+        <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>
+        <text use="poi" />
       </m>
-      <m zoom-min="16">
+
+      <m zoom-min="16" select="first">
         <m v="atm" zoom-min="17">
           <symbol src="atm" />
         </m>
@@ -1116,158 +1086,146 @@
         <m v="restaurant">
           <symbol src="restaurant" />
         </m>
-      </m>
-      <m v="toilets" zoom-min="17">
-        <symbol src="toilets" />
-      </m>
-      <m zoom-min="17">
+        <m k="amenity" v="bus_station">
+          <symbol src="bus_station" />
+        </m>
         <text use="poi" />
       </m>
-    </m>
 
-    <!-- amenity
-      <m k="amenity">
-      <m k="amenity" v="atm" zoom-min="17">
-      <symbol src="jar:symbols/atm.png" />
-      </m>
-      <m k="amenity" v="bank" zoom-min="17">
-      <symbol src="jar:symbols/bank.png" />
-      </m>
-      <m k="amenity" v="bench" zoom-min="17">
-      <symbol src="jar:symbols/bench.png" />
-      </m>
-      <m k="amenity" v="bicycle_rental" zoom-min="17">
-      <symbol src="jar:symbols/bicycle_rental.png" />
-      </m>
-      <m k="amenity" v="bus_station" zoom-min="17">
-      <symbol src="jar:symbols/bus_sta.png" />
-      </m>
-      <m k="amenity" v="cafe" zoom-min="17">
-      <symbol src="jar:symbols/cafe.png" />
-      </m>
-      <m k="amenity" v="cinema" zoom-min="17">
-      <symbol src="jar:symbols/cinema.png" />
-      </m>
-      <m k="amenity" v="drinking_water" zoom-min="17">
-      <symbol src="jar:symbols/drinking_water.png" />
-      </m>
-      <m k="amenity" v="fast_food" zoom-min="17">
-      <symbol src="jar:symbols/fastfood.png" />
-      </m>
-      <m k="amenity" v="fire_station" zoom-min="17">
-      <symbol src="jar:symbols/firebrigade.png" />
-      </m>
-      <m k="amenity" v="fountain" zoom-min="17">
-      <symbol src="jar:symbols/fountain.png" />
-      </m>
-      <m k="amenity" v="fuel" zoom-min="17">
-      <symbol src="jar:symbols/petrolStation.png" />
-      </m>
-      <m k="amenity" v="hospital" zoom-min="15">
-      <symbol src="jar:symbols/hospital.png" />
-      </m>
-      <m k="amenity" v="kindergarten" zoom-min="17">
-      <symbol src="jar:symbols/kindergarten.png" />
-      </m>
-      <m k="amenity" v="library" zoom-min="17">
-      <symbol src="jar:symbols/library.png" />
-      </m>
-      <m k="amenity" v="parking" zoom-min="17">
-      <symbol src="jar:symbols/parking.png" />
-      </m>
-      <m k="amenity" v="pharmacy" zoom-min="17">
-      <symbol src="jar:symbols/pharmacy.png" />
-      </m>
-      <m k="amenity" v="place_of_worship" zoom-min="17">
-      <m k="denomination|religion" v="jewish">
-      <symbol src="jar:symbols/synagogue.png" />
-      </m>
-      <m k="denomination|religion" v="muslim|moslem">
-      <symbol src="jar:symbols/mosque.png" />
-      </m>
-      <m k="denomination|religion" v="christian">
-      <symbol src="jar:symbols/church.png" />
-      </m>
-      </m>
-      <m k="amenity" v="post_box" zoom-min="17">
-      <symbol src="jar:symbols/postbox.png" />
-      </m>
-      <m k="amenity" v="post_office" zoom-min="17">
-      <symbol src="jar:symbols/postoffice.png" />
-      </m>
-      <m k="amenity" v="pub|bar" zoom-min="17">
-      <symbol src="jar:symbols/pub.png" />
-      </m>
-      <m k="amenity" v="recycling" zoom-min="17">
-      <symbol src="jar:symbols/recycling.png" />
-      </m>
-      <m k="amenity" v="restaurant" zoom-min="17">
-      <symbol src="jar:symbols/restaurant.png" />
-      </m>
-      <m k="amenity" v="school" zoom-min="17">
-      <symbol src="jar:symbols/school.png" />
-      </m>
-      <m k="amenity" v="shelter" zoom-min="17">
-      <symbol src="jar:symbols/shelter.png" />
-      </m>
-      <m k="amenity" v="telephone" zoom-min="17">
-      <symbol src="jar:symbols/telephone.png" />
-      </m>
-      <m k="amenity" v="theatre" zoom-min="17">
-      <symbol src="jar:symbols/theatre.png" />
-      </m>
-      <m k="amenity" v="toilets" zoom-min="17">
-      <symbol src="jar:symbols/toilets.png" />
-      </m>
-      <m k="amenity" v="university|college" zoom-min="17">
-      <symbol src="jar:symbols/university.png" />
+      <m zoom-min="17" select="first">
+        <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>
+        <text use="poi" />
       </m>
 
       <m zoom-min="17">
-      <caption k="name" font-size="15" fill="#bb4040" stroke="#ffffff" stroke-width="2.0" />
-      </m>
-      </m> -->
-    <m k="shop" 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">
-        <text use="poi" />
-      </m>
-    </m>
-    <m k="tourism" zoom-min="15">
-      <m v="alpine_hut">
-        <symbol src="triangle-stroked" />
-      </m>
-      <m v="camp_site">
-        <symbol src="camping" />
-      </m>
-      <m v="hostel">
-        <symbol src="hostel" />
-      </m>
-      <m v="hotel">
-        <symbol src="hotel" />
-      </m>
-      <m v="information" zoom-min="16">
-        <m k="name">
-          <symbol src="information" />
+        <m k="amenity" v="toilets">
+          <symbol src="toilets" />
         </m>
       </m>
+    </m>
+
+    <m k="shop">
+      <m zoom-min="15" select="first">
+        <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>
+          <symbol src="city" />
+        </m>
+      </m>
+      <m zoom-min="17">
+        <text use="poi" />
+      </m>
+    </m>
+
+    <m k="tourism">
+
+      <m zoom-min="15" select="first">
+        <m v="alpine_hut">
+          <symbol src="triangle-stroked" />
+        </m>
+        <m v="camp_site">
+          <symbol src="camping" />
+        </m>
+        <m v="hostel">
+          <symbol src="hostel" />
+        </m>
+        <m v="hotel">
+          <symbol src="hotel" />
+        </m>
+        <text use="poi" />
+      </m>
+
+      <m zoom-min="16" select="first">
+        <m v="information" select="first">
+          <m k="name">
+            <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 zoom-min="17">
-        <text use="poi" />
+      <m v="museum">
+        <symbol src="museum" />
       </m>
+
+    </m>
+
+    <m k="natural" v="tree" zoom-min="15">
+      <circle r="10" />
     </m>
   </m>
 
diff --git a/vtm/assets/styles/osmarender.png b/vtm/assets/styles/osmarender.png
new file mode 100644
index 00000000..de48e3e5
Binary files /dev/null and b/vtm/assets/styles/osmarender.png differ
diff --git a/vtm/assets/styles/osmarender.xml b/vtm/assets/styles/osmarender.xml
index 61f0006c..f0329a95 100644
--- a/vtm/assets/styles/osmarender.xml
+++ b/vtm/assets/styles/osmarender.xml
@@ -2,38 +2,348 @@
 <rendertheme xmlns="http://opensciencemap.org/rendertheme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://opensciencemap.org/rendertheme ../../rendertheme.xsd" version="1" map-background="#fffcfa">
 
+  <atlas img="styles/osmarender.png">
+    <rect id="airport" pos="226 38 24 24" />
+    <rect id="alpine_hut" pos="198 41 26 21" />
+    <rect id="atm" pos="279 2 14 16" />
+    <rect id="bakery" pos="305 46 22 16" />
+    <rect id="bank" pos="395 43 19 19" />
+    <rect id="bench" pos="213 29 8 10" />
+    <rect id="bicycle_rental" pos="295 2 13 16" />
+    <rect id="bus" pos="130 32 23 9" />
+    <rect id="bus_sta" pos="36 30 31 32" />
+    <rect id="cable_car" pos="2 2 29 26" />
+    <rect id="cafe" pos="216 2 14 14" />
+    <rect id="campSite" pos="329 42 20 20" />
+    <rect id="cave_entrance" pos="297 23 16 10" />
+    <rect id="chair_lift" pos="130 2 13 28" />
+    <rect id="church" pos="61 9 9 19" />
+    <rect id="cinema" pos="145 8 16 22" />
+    <rect id="drinking_water" pos="416 43 19 19" />
+    <rect id="fastfood" pos="351 42 20 20" />
+    <rect id="firebrigade" pos="130 43 36 19" />
+    <rect id="florist" pos="342 24 12 16" />
+    <rect id="fountain" pos="500 46 10 16" />
+    <rect id="gondola" pos="252 38 21 24" />
+    <rect id="helipad" pos="69 31 31 31" />
+    <rect id="hospital" pos="437 43 19 19" />
+    <rect id="hostel" pos="168 44 28 18" />
+    <rect id="hotel" pos="93 11 18 17" />
+    <rect id="information" pos="458 43 19 19" />
+    <rect id="kindergarten" pos="184 2 14 19" />
+    <rect id="library" pos="372 22 9 18" />
+    <rect id="mosque" pos="248 2 17 15" />
+    <rect id="oneway" pos="275 38 25 7" />
+    <rect id="parking" pos="373 42 20 20" />
+    <rect id="peak" pos="267 9 9 8" />
+    <rect id="petrolStation" pos="263 19 14 17" />
+    <rect id="pharmacy" pos="479 43 19 19" />
+    <rect id="playground" pos="223 18 18 18" />
+    <rect id="postbox" pos="232 2 14 14" />
+    <rect id="postoffice" pos="172 23 19 19" />
+    <rect id="pub" pos="326 26 14 14" />
+    <rect id="railway-crossing" pos="275 47 28 15" />
+    <rect id="railway-crossing-small" pos="155 32 15 9" />
+    <rect id="recycling" pos="72 11 19 18" />
+    <rect id="restaurant" pos="356 28 14 12" />
+    <rect id="school" pos="200 2 14 19" />
+    <rect id="shelter" pos="33 4 26 24" />
+    <rect id="soccer-borderless" pos="102 30 26 32" />
+    <rect id="supermarket" pos="193 23 18 16" />
+    <rect id="synagogue" pos="113 11 15 17" />
+    <rect id="telephone" pos="383 21 7 19" />
+    <rect id="tennis" pos="2 30 32 32" />
+    <rect id="theatre" pos="243 19 18 17" />
+    <rect id="toilets" pos="163 2 19 19" />
+    <rect id="traffic_signal" pos="392 21 7 19" />
+    <rect id="tree" pos="145 2 4 4" />
+    <rect id="university" pos="302 35 19 9" />
+    <rect id="viewpoint" pos="279 20 16 16" />
+    <rect id="vulcan" pos="315 25 9 8" />
+    <rect id="windmill" pos="310 2 13 19" />
+  </atlas>
+
+  <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 id="caption-small-blue" caption="true" dy="12" k="name" style="bold" size="14" fill="#4040ff"
+    stroke="#ffffff" stroke-width="2.0" />
+
   <!-- ways -->
   <m e="way">
     <!-- landuse -->
     <m k="landuse">
-      <m v="military">
-        <area src="patterns/military.png" stroke="#e4e4e4" stroke-width="0.2" />
-      </m>
-      <m v="residential|farmyard">
-        <area fill="#e4e4e4" />
-      </m>
-      <m v="retail">
-        <area fill="#ffebeb" stroke="#e4e4e4" stroke-width="0.2" />
-      </m>
-      <m v="industrial|brownfield|railway">
-        <area fill="#ecd8ff" stroke="#e4e4e4" stroke-width="0.2" />
-      </m>
-      <m v="commercial">
-        <area fill="#ffffc0" stroke="#e4e4e4" stroke-width="0.2" />
-      </m>
-      <m v="construction|greenfield">
-        <area fill="#a47c41" stroke="#e4e4e4" stroke-width="0.2" />
-      </m>
-      <m v="garages">
-        <area fill="#d6d6e4" />
-      </m>
+      <m select="first">
+        <m v="military">
+          <area src="patterns/military.png" stroke="#e4e4e4" stroke-width="0.2" />
+        </m>
+        <m v="residential|farmyard">
+          <area fill="#e4e4e4" />
+        </m>
+        <m v="retail">
+          <area fill="#ffebeb" stroke="#e4e4e4" stroke-width="0.2" />
+        </m>
+        <m v="industrial|brownfield|railway">
+          <area fill="#ecd8ff" stroke="#e4e4e4" stroke-width="0.2" />
+        </m>
+        <m v="commercial">
+          <area fill="#ffffc0" stroke="#e4e4e4" stroke-width="0.2" />
+        </m>
+        <m v="construction|greenfield">
+          <area fill="#a47c41" stroke="#e4e4e4" stroke-width="0.2" />
+        </m>
+        <m v="garages">
+          <area fill="#d6d6e4" />
+        </m>
 
-      <m zoom-min="16">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
+        <m v="landfill|quarry">
+          <area fill="#e9dd72" stroke="#556b2f" stroke-width="0.2" />
+        </m>
+        <m v="cemetery">
+          <area src="patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2" />
+        </m>
+        <m v="field|farm|farmland|meadow|grass">
+          <area fill="#ebfff2" stroke="#9ee673" stroke-width="0.1" />
+        </m>
+        <m v="allotments|village_green|recreation_ground">
+          <area fill="#bde3cb" stroke="#6fc13d" stroke-width="0.2" />
+        </m>
+        <m v="reservoir|basin">
+          <area fill="#b5d6f1" />
+        </m>
+      </m>
+      <m k="name" zoom-min="16">
+        <text use="caption-small-blue" />
       </m>
     </m>
 
 
+    <m k="natural|landuse" v="forest|wood|scrub">
+      <m k="wood">
+        <m k="wood" v="coniferous">
+          <area src="patterns/wood-coniferous.png" />
+        </m>
+        <m k="wood" v="deciduous">
+          <area src="patterns/wood-deciduous.png" />
+        </m>
+        <m k="wood" v="mixed">
+          <area src="patterns/wood-mixed.png" />
+        </m>
+      </m>
+      <m k="wood" v="~">
+        <area fill="#6fc18e" stroke="#6fc18e" stroke-width="0.2" />
+      </m>
+
+      <m zoom-min="16">
+        <text use="caption-small-blue" />
+      </m>
+    </m>
+
+
+    <!-- amenity -->
+    <m k="amenity">
+      <m select="first">
+        <m v="kindergarten|school|college|university">
+          <area fill="#cdabde" stroke="#e9dd72" stroke-width="0.2" />
+        </m>
+        <m v="grave_yard">
+          <area src="patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2" />
+        </m>
+        <m v="parking">
+          <area fill="#ffffc0" stroke="#e9dd72" stroke-width="0.2" />
+          <m k="access" v="private" zoom-min="15">
+            <area src="patterns/access-private.png" />
+          </m>
+          <m zoom-min="17">
+            <symbol src="parking" />
+          </m>
+        </m>
+        <m v="fountain" closed="yes">
+          <area fill="#b5d6f1" stroke="#000080" stroke-width="0.15" />
+          <m zoom-min="17">
+            <symbol src="fountain" />
+          </m>
+        </m>
+        <m v="hospital" zoom-min="15">
+          <symbol src="hospital" />
+        </m>
+        <m v="theatre" zoom-min="17">
+          <symbol src="theatre" />
+        </m>
+        <m v="toilets" zoom-min="17">
+          <symbol src="toilets" />
+        </m>
+      </m>
+      <m k="name" zoom-min="17">
+        <text use="caption-small-blue" />
+      </m>
+    </m>
+
+
+    <!-- natural -->
+    <m k="natural">
+      <m select="first">
+        <m v="coastline">
+          <!-- <m closed="no">
+            <line stroke="#708599" fix="true" cap="butt" width="2.0" />
+            </m> -->
+          <m closed="yes">
+            <area fill="#b5d6f1" stroke="#b5d6f1" stroke-width="0.4" />
+          </m>
+        </m>
+        <m v="glacier">
+          <area fill="#fafaff" stroke="#add8e6" stroke-width="0.8" />
+        </m>
+        <m v="land">
+          <area fill="#f8f8f8" stroke="#e0e0e0" stroke-width="0.1" />
+        </m>
+        <m v="beach">
+          <area fill="#eecc55" />
+        </m>
+        <m v="heath">
+          <area fill="#ffffc0" stroke="#ffff90" stroke-width="0.2" />
+        </m>
+        <m v="marsh|wetland">
+          <area src="patterns/marsh.png" />
+        </m>
+      </m>
+      <m k="name" zoom-min="16">
+        <text use="caption-small-blue" />
+      </m>
+    </m>
+
+
+    <!-- leisure -->
+    <m k="leisure">
+      <m select="first">
+        <m v="park|garden|golf_course|common|green">
+          <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
+        </m>
+        <m v="playground|playing_fields|pitch|dog_park">
+          <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
+          <m v="playground" zoom-min="17">
+            <symbol src="playground" />
+          </m>
+        </m>
+        <m v="nature_reserve">
+          <area src="patterns/nature-reserve.png" stroke="#6fc18e" stroke-width="0.2" />
+        </m>
+
+        <m v="stadium|sports_centre|water_park">
+          <area fill="#bde3cb" stroke="#6fc18e" stroke-width="0.2" />
+        </m>
+        <m v="track">
+          <m k="area" v="yes|true">
+            <area fill="#bde3cb" stroke="#6fc18e" stroke-width="0.025" />
+          </m>
+          <m k="area" v="~|no|false">
+            <line stroke="#6fc18e" width="0.75" />
+            <line stroke="#bde3cb" width="0.7" />
+          </m>
+        </m>
+        <m v="swimming_pool">
+          <area fill="#b5d6f1" stroke="#6060ff" stroke-width="0.2" />
+        </m>
+      </m>
+      <m k="name" zoom-min="16">
+        <text use="caption-small-blue" />
+      </m>
+    </m>
+
+
+    <!-- waterways -->
+    <m k="waterway">
+      <!-- waterway casings -->
+
+      <m v="canal">
+        <line stroke="#b0b0b0" width="1.0" />
+      </m>
+
+      <!-- waterway cores -->
+      <m v="ditch">
+        <line stroke="#b5d6f1" width="0.1" />
+      </m>
+      <m v="drain">
+        <line stroke="#b5d6f1" width="1.2" fix="true" fade="13" />
+      </m>
+      <m v="canal">
+        <line stroke="#b5d6f1" width="0.8" />
+      </m>
+      <m v="stream">
+        <line stroke="#b5d6f1" width="0.275" />
+      </m>
+      <m v="river">
+        <line stroke="#b5d6f1" width="1.0" />
+      </m>
+
+      <m v="dock">
+        <area fill="#b5d6f1" />
+      </m>
+      <m v="riverbank">
+        <area fill="#b5d6f1" />
+      </m>
+      <m v="weir">
+        <line stroke="#000044" width="0.375" />
+      </m>
+      <m v="dam">
+        <line stroke="#000000" width="0.5" />
+      </m>
+      <m k="lock" v="yes|true">
+        <line stroke="#000000" width="2.0" cap="butt" />
+        <line stroke="#f8f8f8" width="1.5" cap="butt" />
+      </m>
+    </m>
+
+
+    <!-- military -->
+    <m k="military">
+      <area src="patterns/military.png" stroke="#e4e4e4" stroke-width="0.2" />
+    </m>
+
+
+    <!-- sport -->
+    <m k="sport">
+      <m v="soccer" zoom-min="17">
+        <symbol src="soccer-borderless" />
+      </m>
+      <m v="swimming|canoe|diving|scuba_diving">
+        <area fill="#b5d6f1" stroke="#6060ff" stroke-width="0.2" />
+      </m>
+      <m v="tennis">
+        <area fill="#d18a6a" stroke="#b36c4c" stroke-width="0.2" />
+        <m zoom-min="17">
+          <symbol src="tennis" />
+        </m>
+      </m>
+    </m>
+
+
+    <!-- tourism areas -->
+    <m k="tourism">
+      <m v="attraction">
+        <area fill="#f2caea" />
+      </m>
+      <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>
+
+
+    <m k="natural" v="water">
+      <area fill="#b5d6f1" />
+    </m>
+
+    <m k="natural" v="coastline" closed="no">
+      <line stroke="#708599" fix="true" cap="butt" width="2.0" />
+    </m>
+
     <!-- tunnel -->
     <m k="tunnel" v="true|yes">
       <!-- highway tunnels -->
@@ -100,275 +410,32 @@
     </m>
 
 
-    <!-- landuse -->
-    <m k="landuse">
-      <m v="landfill|quarry">
-        <area fill="#e9dd72" stroke="#556b2f" stroke-width="0.2" />
-      </m>
-      <m v="cemetery">
-        <area src="patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2" />
-      </m>
-      <m v="field|farm|farmland|meadow|grass">
-        <area fill="#ebfff2" stroke="#9ee673" stroke-width="0.1" />
-      </m>
-      <m v="allotments|village_green|recreation_ground">
-        <area fill="#bde3cb" stroke="#6fc13d" stroke-width="0.2" />
-      </m>
-      <m v="reservoir|basin">
-        <area fill="#b5d6f1" />
-      </m>
-
-      <m zoom-min="16">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
-      </m>
-    </m>
-
-
-    <m k="natural|landuse" v="forest|wood|scrub">
-      <m k="wood">
-        <m k="wood" v="coniferous">
-          <area src="patterns/wood-coniferous.png" />
-        </m>
-        <m k="wood" v="deciduous">
-          <area src="patterns/wood-deciduous.png" />
-        </m>
-        <m k="wood" v="mixed">
-          <area src="patterns/wood-mixed.png" />
-        </m>
-      </m>
-      <m k="wood" v="~">
-        <area fill="#6fc18e" stroke="#6fc18e" stroke-width="0.2" />
-      </m>
-
-      <m zoom-min="16">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
-      </m>
-    </m>
-
-
-    <!-- amenity -->
-    <m k="amenity">
-      <m v="kindergarten|school|college|university">
-        <area fill="#cdabde" stroke="#e9dd72" stroke-width="0.2" />
-      </m>
-      <m v="grave_yard">
-        <area src="patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2" />
-      </m>
-      <m v="parking">
-        <area fill="#ffffc0" stroke="#e9dd72" stroke-width="0.2" />
-        <m k="access" v="private" zoom-min="15">
-          <area src="patterns/access-private.png" />
-        </m>
-        <m zoom-min="17">
-          <symbol src="symbols/parking.png" />
-        </m>
-      </m>
-      <m v="fountain" closed="yes">
-        <area fill="#b5d6f1" stroke="#000080" stroke-width="0.15" />
-        <m zoom-min="17">
-          <symbol src="symbols/fountain.png" />
-        </m>
-      </m>
-      <m v="hospital" zoom-min="15">
-        <symbol src="symbols/hospital.png" />
-      </m>
-      <m v="theatre" zoom-min="17">
-        <symbol src="symbols/theatre.png" />
-      </m>
-      <m v="toilets" zoom-min="17">
-        <symbol src="symbols/toilets.png" />
-      </m>
-
-      <m zoom-min="17">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
-      </m>
-    </m>
-
-
-    <!-- natural -->
-    <m k="natural">
-      <m v="coastline">
-        <m closed="no">
-          <line stroke="#708599" width="2.0" />
-        </m>
-        <m closed="yes">
-          <area fill="#b5d6f1" stroke="#b5d6f1" stroke-width="0.4" />
-        </m>
-      </m>
-      <m v="glacier">
-        <area fill="#fafaff" stroke="#add8e6" stroke-width="0.8" />
-      </m>
-      <m v="land">
-        <area fill="#f8f8f8" stroke="#e0e0e0" stroke-width="0.1" />
-      </m>
-      <m v="beach">
-        <area fill="#eecc55" />
-      </m>
-      <m v="heath">
-        <area fill="#ffffc0" stroke="#ffff90" stroke-width="0.2" />
-      </m>
-      <m v="marsh|wetland">
-        <area src="patterns/marsh.png" />
-      </m>
-
-      <m zoom-min="16">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
-      </m>
-    </m>
-
-
-    <!-- leisure -->
-    <m k="leisure">
-      <m v="park|garden|golf_course|common|green">
-        <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
-      </m>
-      <m v="playground|playing_fields|pitch|dog_park">
-        <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
-        <m v="playground" zoom-min="17">
-          <symbol src="symbols/playground.png" />
-        </m>
-      </m>
-      <m v="nature_reserve">
-        <area src="patterns/nature-reserve.png" stroke="#6fc18e" stroke-width="0.2" />
-      </m>
-
-      <m v="stadium|sports_centre|water_park">
-        <area fill="#bde3cb" stroke="#6fc18e" stroke-width="0.2" />
-      </m>
-      <m v="track">
-        <m k="area" v="yes|true">
-          <area fill="#bde3cb" stroke="#6fc18e" stroke-width="0.025" />
-        </m>
-        <m k="area" v="~|no|false">
-          <line stroke="#6fc18e" width="0.75" />
-          <line stroke="#bde3cb" width="0.7" />
-        </m>
-      </m>
-      <m v="swimming_pool">
-        <area fill="#b5d6f1" stroke="#6060ff" stroke-width="0.2" />
-      </m>
-
-      <m zoom-min="16">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
-      </m>
-    </m>
-
-
-    <!-- waterways -->
-    <m k="waterway">
-      <!-- waterway casings -->
-      <m v="drain">
-        <line stroke="#b0b0b0" width="1.0" />
-      </m>
-      <m v="canal">
-        <line stroke="#b0b0b0" width="1.0" />
-      </m>
-
-      <!-- waterway cores -->
-      <m v="ditch">
-        <line stroke="#b5d6f1" width="0.1" />
-      </m>
-      <m v="drain">
-        <line stroke="#b5d6f1" width="0.8" />
-      </m>
-      <m v="canal">
-        <line stroke="#b5d6f1" width="0.8" />
-      </m>
-      <m v="stream">
-        <line stroke="#b5d6f1" width="0.275" />
-      </m>
-      <m v="river">
-        <line stroke="#b5d6f1" width="1.0" />
-      </m>
-
-      <m v="dock">
-        <area fill="#b5d6f1" />
-      </m>
-      <m v="riverbank">
-        <area fill="#b5d6f1" />
-      </m>
-      <m v="weir">
-        <line stroke="#000044" width="0.375" />
-      </m>
-      <m v="dam">
-        <line stroke="#000000" width="0.5" />
-      </m>
-      <m k="lock" v="yes|true">
-        <line stroke="#000000" width="2.0" cap="butt" />
-        <line stroke="#f8f8f8" width="1.5" cap="butt" />
-      </m>
-    </m>
-
-
-    <!-- military -->
-    <m k="military">
-      <area src="patterns/military.png" stroke="#e4e4e4" stroke-width="0.2" />
-    </m>
-
-
-    <!-- sport -->
-    <m k="sport">
-      <m v="soccer" zoom-min="17">
-        <symbol src="symbols/soccer-borderless.png" />
-      </m>
-      <m v="swimming|canoe|diving|scuba_diving">
-        <area fill="#b5d6f1" stroke="#6060ff" stroke-width="0.2" />
-      </m>
-      <m v="tennis">
-        <area fill="#d18a6a" stroke="#b36c4c" stroke-width="0.2" />
-        <m zoom-min="17">
-          <symbol src="symbols/tennis.png" />
-        </m>
-      </m>
-    </m>
-
-
-    <!-- tourism areas -->
-    <m k="tourism">
-      <m v="attraction">
-        <area fill="#f2caea" />
-      </m>
-      <m v="zoo|picnic_site|caravan_site|camp_site">
-        <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
-      </m>
-
-      <m zoom-min="16">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
-      </m>
-    </m>
-
-
-    <m k="natural" v="water">
-      <area fill="#b5d6f1" />
-    </m>
-
-
     <!-- highway area -->
     <m k="area" v="yes|true">
       <m k="highway">
         <m v="footway|footpath">
-          <area fill="#e5e0c2" stroke="#707070" stroke-width="0.15" />
+          <area fill="#e5e0c2" stroke="#707070" stroke-width="1.15" />
         </m>
         <m v="pedestrian">
-          <area fill="#e5e0c2" stroke="#707070" stroke-width="0.15" />
+          <area fill="#e5e0c2" stroke="#707070" stroke-width="1.15" />
         </m>
         <m v="path">
-          <area fill="#d0d0d0" stroke="#d0d0d0" stroke-width="0.45" />
+          <area fill="#d0d0d0" stroke="#d0d0d0" stroke-width="1.15" />
         </m>
         <m v="service">
-          <area fill="#ffffff" stroke="#707070" stroke-width="0.15" />
+          <area fill="#ffffff" stroke="#707070" stroke-width="1.15" />
         </m>
         <m v="unclassified">
-          <area fill="#ffffff" stroke="#707070" stroke-width="0.3" />
+          <area fill="#ffffff" stroke="#707070" stroke-width="1.3" />
         </m>
         <m v="residential">
-          <area fill="#ffffff" stroke="#707070" stroke-width="0.15" />
+          <area fill="#ffffff" stroke="#707070" stroke-width="1.15" />
         </m>
         <m v="road">
           <area fill="#d0d0d0" />
         </m>
         <m v="living_street">
-          <area fill="#ffffff" stroke="#ffffff" stroke-width="0.15" />
+          <area fill="#ffffff" stroke="#ffffff" stroke-width="1.15" />
         </m>
       </m>
     </m>
@@ -388,7 +455,7 @@
     <!-- runways casings and areas -->
     <m k="aeroway">
       <m v="aerodrome" closed="yes">
-        <area fill="#d8dcce" stroke="#000000" stroke-width="0.5" />
+        <area fill="#d8dcce" stroke="#b8acae" stroke-width="0.8" />
       </m>
       <m v="apron">
         <area fill="#f0f0f0" />
@@ -396,16 +463,16 @@
       <m v="terminal">
         <area fill="#f3d6b6" stroke="#6a5a8e" stroke-width="0.2" />
       </m>
-      
+
       <!-- <m v="runway">
         <line stroke="#000000" width="6.3" cap="square" />
-      </m>
-      <m v="taxiway">
+        </m>
+        <m v="taxiway">
         <line stroke="#000000" width="2.7" cap="butt" />
-      </m>-->
+        </m> -->
 
-      <m zoom-min="16">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
+      <m k="name" zoom-min="16">
+        <text use="caption-small-blue" />
       </m>
     </m>
   </m>
@@ -418,23 +485,21 @@
 
 
   <m e="way">
-
-    <style-outline id="casing" stroke="#707070" width="0.15" />
-
     <!-- highway casings -->
 
     <m k="tunnel" v="~|no|false">
       <m k="area" v="~|no|false">
         <m k="highway">
-          <!--
-            <m k="bridge" v="~|no|false">
+          <m k="bridge" v="~|no|false">
             <m v="steps">
-            <line stroke="#707070" width="0.6" />
+              <line stroke="#707070" width="0.6" />
             </m>
             <m v="footway|path">
-            <line stroke="#707070" width="0.6" dasharray="2,2" cap="butt" />
+              <line stipple-stroke="#909090" width="2.6" stroke="#00ffffff" stipple="2" stipple-width="1.0" cap="butt"
+                fix="true" />
             </m>
-            <m v="track">
+          </m>
+          <!-- <m v="track">
             <m k="tracktype" v="grade1">
             <line stroke="#d79331" width="1.0" />
             </m>
@@ -471,281 +536,357 @@
             </m>
             </m>
           -->
-          <m k="bridge" v="yes|true">
+          <!-- <m k="bridge" v="yes|true">
             <m v="steps|footway|path">
-              <line stroke="#000000" width="0.7" cap="butt" />
+            <line stroke="#000000" width="0.7" cap="butt" />
             </m>
             <m v="track|cycleway|bridleway|service">
-              <line stroke="#000000" width="1.1" cap="butt" />
+            <line stroke="#000000" width="1.1" cap="butt" />
             </m>
             <m v="construction">
-              <line stroke="#000000" width="1.2" cap="butt" />
+            <line stroke="#000000" width="1.2" cap="butt" />
             </m>
             <m v="road">
-              <line stroke="#000000" width="1.4" cap="butt" />
+            <line stroke="#000000" width="1.4" cap="butt" />
             </m>
             <m v="pedestrian|unclassified|residential|living_street|byway">
-              <line stroke="#000000" width="1.6" cap="butt" />
+            <line stroke="#000000" width="1.6" cap="butt" />
             </m>
             <m v="tertiary|secondary_link|primary_link|trunk_link|motorway_link|secondary|primary|trunk">
-              <line stroke="#000000" width="1.9" cap="butt" />
+            <line stroke="#000000" width="1.9" cap="butt" />
             </m>
             <m v="motorway">
-              <line stroke="#000000" width="2.1" cap="butt" />
+            <line stroke="#000000" width="2.1" cap="butt" />
             </m>
-          </m>
+            </m> -->
         </m>
       </m>
     </m>
 
 
+
     <!-- building -->
     <m k="building">
-      <area fill="#f3d6b6" stroke="#6a5a8e" stroke-width="0.2" />
-      <line stroke="#6a5a8e" width="1.0" fix="true" />
+      <m select="first">
+        <m closed="yes">
+          <area fill="#f3d6b6" stroke="#6a5a8e" stroke-width="1.0" />
+        </m>
+        <m zoom-max="16">
+          <line stroke="#6a5a8e" width="1.0" fix="true" cap="butt" />
+        </m>
+      </m>
+
       <m zoom-min="17">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
-        <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
-          stroke-width="2.0" />
+        <extrusion side-color="#fff3d6b6" top-color="#fff8d9b9" line-color="#ff6a5a8e" />
+      </m>
+
+      <m zoom-min="17">
+        <text use="caption-small-blue" priority="9" />
+        <caption k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff" stroke-width="2.0"
+          priority="10" />
       </m>
     </m>
 
+    <outline-layer id="casing" stroke="#707070" width="0.15" cap="round" />
+    <outline-layer id="casing-bridge" stroke="#404040" width="0.25" cap="butt" />
 
     <m k="highway">
       <m k="tunnel" v="~|no|false">
-        <m k="area" v="~|no|false">
+        <m k="area" v="~|no|false" select="first">
+
           <m v="steps">
             <line stroke="#e5e0c2" width="0.45" dasharray="3,1" cap="butt" />
             <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#e5e0c2" stroke-width="2.0" />
+              <text k="name" style="bold" size="10" stroke="#e5e0c2" stroke-width="2.0" />
             </m>
           </m>
-          <m v="footway">
-            <line stroke="#e5e0c2" width="0.45" />
+          <m v="footway|platform|corridor">
+            <line stroke="#e5e0c2" width="1.4" fix="true" cap="butt" />
             <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#e5e0c2" stroke-width="2.0" />
+              <text k="name" style="bold" size="10" stroke="#e5e0c2" stroke-width="2.0" />
+            </m>
+          </m>
+          <m v="cycleway">
+            <line stipple="4" stipple-width="0.8" fix="true" stipple-stroke="#0000dd" stroke="#d1fad1" width="1.4" />
+            <m zoom-min="15">
+              <text k="name" style="bold" size="10" stroke="#d1fad1" stroke-width="2.0" />
+            </m>
+          </m>
+          <m v="bridleway">
+            <line stroke="#d3cb98" width="0.85" />
+            <m zoom-min="15">
+              <text k="name" style="bold" size="10" stroke="#d3cb98" stroke-width="2.0" />
             </m>
           </m>
           <m v="path">
-            <line stroke="#d0d0d0" width="0.45" />
+            <line stroke="#d0d0d0" width="1.45" fix="true" />
             <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#d0d0d0" stroke-width="2.0" />
+              <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
             </m>
           </m>
-          <m v="track">
+          <m v="track" select="first">
             <m k="tracktype" v="grade1">
               <line stroke="#fffaf2" width="0.75" />
               <m zoom-min="15">
-                <text k="name" font-style="bold" font-size="10" stroke="#fffaf2" stroke-width="2.0" />
+                <text k="name" style="bold" size="10" stroke="#fffaf2" stroke-width="2.0" />
               </m>
             </m>
             <m k="tracktype" v="grade2">
               <line stroke="#fff2de" width="0.75" />
               <m zoom-min="15">
-                <text k="name" font-style="bold" font-size="10" stroke="#fff2de" stroke-width="2.0" />
+                <text k="name" style="bold" size="10" stroke="#fff2de" stroke-width="2.0" />
               </m>
             </m>
             <m k="tracktype" v="grade3">
               <line stroke="#fff2de" width="0.7" />
               <m zoom-min="15">
-                <text k="name" font-style="bold" font-size="10" stroke="#fff2de" stroke-width="2.0" />
+                <text k="name" style="bold" size="10" stroke="#fff2de" stroke-width="2.0" />
               </m>
             </m>
             <m k="tracktype" v="grade4">
               <line stroke="#fff2de" width="0.7" />
               <m zoom-min="15">
-                <text k="name" font-style="bold" font-size="10" stroke="#fff2de" stroke-width="2.0" />
+                <text k="name" style="bold" size="10" stroke="#fff2de" stroke-width="2.0" />
               </m>
             </m>
             <m k="tracktype" v="grade5">
               <line stroke="#fff2de" width="0.7" />
               <m zoom-min="15">
-                <text k="name" font-style="bold" font-size="10" stroke="#fff2de" stroke-width="2.0" />
+                <text k="name" style="bold" size="10" stroke="#fff2de" stroke-width="2.0" />
               </m>
             </m>
             <m k="tracktype" v="~|no|false">
               <line stroke="#fff2de" width="0.75" />
               <m zoom-min="15">
-                <text k="name" font-style="bold" font-size="10" stroke="#fff2de" stroke-width="2.0" />
+                <text k="name" style="bold" size="10" stroke="#fff2de" stroke-width="2.0" />
               </m>
             </m>
           </m>
-          <m v="cycleway">
-            <line stroke="#d1fad1" width="0.85" />
-            <m k="bridge" v="~|no|false">
+
+          <m k="bridge" v="~|no|false">
+            <m select="first">
+              <m v="service">
+                <line stroke="#ffffff" width="0.85" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="construction">
+                <line stroke="#d0d0d0" width="1.0" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="road">
+                <line stroke="#d0d0d0" width="1.25" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="pedestrian">
+                <line stroke="#e5e0c2" width="0.85" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#e5e0c2" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="unclassified|residential|living_street">
+                <line stroke="#ffffff" width="1.25" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="byway">
+                <line stroke="#efadaa" width="1.15" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#efadaa" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="tertiary|tertiary_link">
+                <line use="tertiary" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#ffff90" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="secondary_link">
+                <line use="secondary" width="-0.1" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="primary_link">
+                <line use="primary" width="-0.1" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="trunk_link">
+                <line use="trunk" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="motorway_link">
+                <line use="motorway" width="-0.2" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="secondary">
+                <line use="secondary" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="primary">
+                <line use="primary" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" />
+                  <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="trunk">
+                <line use="trunk" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" />
+                  <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="motorway">
+                <line use="motorway" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" />
+                  <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
+                </m>
+              </m>
+
+              <!-- <m zoom-min="16">
+
+                <line width="1.0" stroke="#ff0000" />
+
+                <m k="access" v="destination">
+                <line src="patterns/access-destination.png" width="1.5" />
+                </m>
+                <m k="access" v="private">
+                <line src="patterns/access-private.png" width="1.5" />
+                </m>
+                </m> -->
+
+              <!-- add outline for all matches -->
               <outline use="casing" />
             </m>
-            <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#d1fad1" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="bridleway">
-            <line stroke="#d3cb98" width="0.85" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#d3cb98" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="service">
-            <line stroke="#ffffff" width="0.85" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#ffffff" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="construction">
-            <line stroke="#d0d0d0" width="1.0" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#d0d0d0" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="road">
-            <line stroke="#d0d0d0" width="1.25" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#d0d0d0" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="pedestrian">
-            <line stroke="#e5e0c2" width="1.35" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#e5e0c2" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="unclassified|residential|living_street">
-            <line stroke="#ffffff" width="1.35" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#ffffff" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="byway">
-            <line stroke="#efadaa" width="1.35" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="15">
-              <text k="name" font-style="bold" font-size="10" stroke="#efadaa" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="tertiary">
-            <line stroke="#ffff90" width="1.5" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#ffff90" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="secondary_link">
-            <line stroke="#fdbf6f" width="1.5" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#fdbf6f" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="primary_link">
-            <line stroke="#e46d71" width="1.5" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#e46d71" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="trunk_link">
-            <line stroke="#7fc97f" width="1.5" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#7fc97f" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="motorway_link">
-            <line stroke="#809bc0" width="1.5" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#809bc0" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="secondary">
-            <line stroke="#fdbf6f" width="1.5" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#fdbf6f" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="primary">
-            <line stroke="#e46d71" width="1.5" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#e46d71" stroke-width="2.0" />
-              <text k="ref" font-style="bold" font-size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="trunk">
-            <line stroke="#7fc97f" width="1.5" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#7fc97f" stroke-width="2.0" />
-              <text k="ref" font-style="bold" font-size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
-            </m>
-          </m>
-          <m v="motorway">
-            <line stroke="#809bc0" width="1.7" />
-            <m k="bridge" v="~|no|false">
-              <outline use="casing" />
-            </m>
-            <m zoom-min="14">
-              <text k="name" font-style="bold" font-size="10" stroke="#809bc0" stroke-width="2.0" />
-              <text k="ref" font-style="bold" font-size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
-            </m>
           </m>
 
-          <!-- <m zoom-min="16">
-            <m k="access" v="destination">
-              <line src="patterns/access-destination.png" width="1.5" />
+          <m k="bridge" v="yes|true">
+            <m select="first">
+              <m v="service">
+                <line stroke="#ffffff" width="0.85" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="construction">
+                <line stroke="#d0d0d0" width="1.0" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="road">
+                <line stroke="#d0d0d0" width="1.25" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#d0d0d0" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="pedestrian">
+                <line stroke="#e5e0c2" width="0.85" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#e5e0c2" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="unclassified|residential|living_street">
+                <line stroke="#ffffff" width="1.25" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#ffffff" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="byway">
+                <line stroke="#efadaa" width="1.15" />
+                <m zoom-min="15">
+                  <text k="name" style="bold" size="10" stroke="#efadaa" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="tertiary|tertiary_link">
+                <line use="tertiary" cap="square" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#ffff90" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="secondary_link">
+                <line use="secondary" width="-0.1" cap="square" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="primary_link">
+                <line use="primary" width="-0.1" cap="square" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="trunk_link">
+                <line use="trunk" cap="square" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="motorway_link">
+                <line use="motorway" width="-0.2" cap="square" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="secondary">
+                <line use="secondary" cap="square" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#fdbf6f" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="primary">
+                <line use="primary" cap="square" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#e46d71" stroke-width="2.0" />
+                  <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="trunk">
+                <line use="trunk" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#7fc97f" stroke-width="2.0" />
+                  <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
+                </m>
+              </m>
+              <m v="motorway">
+                <line use="motorway" cap="square" />
+                <m zoom-min="14">
+                  <text k="name" style="bold" size="10" stroke="#809bc0" stroke-width="2.0" />
+                  <text k="ref" style="bold" size="12" stroke="#ffffff" fill="#606060" stroke-width="2.0" />
+                </m>
+              </m>
+              <!-- add outline for all matches -->
+              <outline use="casing-bridge" />
+              <m>
+              </m>
             </m>
-            <m k="access" v="private">
-              <line src="patterns/access-private.png" width="1.5" />
-            </m>
-          </m>-->
+          </m>
         </m>
       </m>
     </m>
 
-
     <!-- runways cores -->
     <m k="aeroway">
       <m k="aeroway" v="runway">
         <line stroke="#d4dcbd" width="4.5" cap="square" />
         <outline use="casing" />
-        </m>
+      </m>
       <m k="aeroway" v="taxiway">
         <line stroke="#d4dcbd" width="1.8" cap="butt" />
         <outline use="casing" />
@@ -768,7 +909,7 @@
     <!-- barriers -->
     <m k="barrier">
       <m k="barrier" v="fence|wall|city_wall">
-        <line stroke="#000000" width="0.1" cap="butt" />
+        <line stroke="#0000ff" width="0.8" fix="true" cap="butt" />
       </m>
       <m k="barrier" v="retaining_wall">
         <line stroke="#888888" width="0.1" cap="butt" />
@@ -787,7 +928,7 @@
       <m k="area" v="~|false|no">
       <m k="highway">
       <m k="oneway" v="yes|true" zoom-min="16">
-      <lineSymbol src="symbols/oneway.png" align-center="true"
+      <lineSymbol src="oneway" align-center="true"
       repeat="true" />
       </m>
       </m>
@@ -795,105 +936,40 @@
       </m> -->
 
 
-    <!-- <m k="piste:type">
-      <m k="piste:type" v="downhill" closed="yes">
-      <m k="piste:difficulty" v="novice">
-      <area fill="#5540ff40" stroke="#5540ff40" stroke-width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="easy">
-      <area fill="#554040ff" stroke="#554040ff" stroke-width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="intermediate">
-      <area fill="#55ff4040" stroke="#55ff4040" stroke-width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="advanced">
-      <area fill="#55000000" stroke="#55000000" stroke-width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="expert">
-      <area fill="#55f6800a" stroke="#55f6800a" stroke-width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="freeride">
-      <area fill="#55f6dd0a" stroke="#55f6dd0a" stroke-width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="~">
-      <area fill="#55505050" stroke="#55505050" stroke-width="5.0" />
-      </m>
-
-      <m zoom-min="16">
-      <caption k="name" font-style="bold" font-size="10" fill="#000000"
-      stroke="#ffffff" width="2.0" />
-      </m>
-      </m>
-
-      <m k="piste:type" v="downhill" closed="no">
-      <m k="piste:difficulty" v="novice">
-      <line stroke="#5540ff40" width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="easy">
-      <line stroke="#554040ff" width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="intermediate">
-      <line stroke="#55ff4040" width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="advanced">
-      <line stroke="#55000000" width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="expert">
-      <line stroke="#55f6800a" width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="freeride">
-      <line stroke="#55f6dd0a" width="5.0" />
-      </m>
-      <m k="piste:difficulty" v="~">
-      <line stroke="#55505050" width="5.0" />
-      </m>
-      <m zoom-min="14">
-      <text k="name" font-style="bold" font-size="10" fill="#000000"
-      stroke="#ffffff" width="2.0" />
-      </m>
-      </m>
-      <m k="piste:type" v="sled">
-      <line stroke="#cdabde" width="2.5" />
-      </m>
-      <m k="piste:type" v="nordic">
-      <line stroke="#c00000" width="1.0" dasharray="30,5" cap="butt" />
-      </m>
-      </m> -->
-
-
     <m k="aerialway">
       <line stroke="#202020" width="0.4" cap="butt" />
       <line stroke="#202020" width="4.0" dasharray="2,200" cap="butt" />
       <m k="aerialway" v="cable_car">
-        <lineSymbol src="symbols/cable_car.png" />
+        <lineSymbol src="cable_car" />
       </m>
       <m k="aerialway" v="chair_lift">
-        <lineSymbol src="symbols/chair_lift_2.png" />
+        <lineSymbol src="chair_lift_2" />
       </m>
       <m k="aerialway" v="gondola">
-        <lineSymbol src="symbols/gondola.png" />
+        <lineSymbol src="gondola" />
       </m>
       <m zoom-min="14">
-        <text k="name" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff" stroke-width="2.0" />
+        <text k="name" style="bold" size="10" fill="#606060" stroke="#ffffff" stroke-width="2.0" />
       </m>
     </m>
 
 
     <m k="railway">
       <m k="tunnel" v="~|false|no">
+
         <m k="railway" v="station">
           <area fill="#9b9b79" stroke="#707070" stroke-width="0.3" />
         </m>
 
         <m k="bridge" v="yes|true">
           <m k="railway" v="tram">
-            <line stroke="#cc000000" width="0.4" cap="butt" />
+            <line stroke="#cc000000" width="1.4" cap="butt" fix="true" />
           </m>
           <m k="railway" v="subway|light_rail|narrow_gauge">
-            <line stroke="#cc000000" width="0.6" cap="butt" />
+            <line stroke="#cc000000" width="1.6" cap="butt" fix="true" />
           </m>
           <m k="railway" v="rail">
-            <line stroke="#cc000000" width="0.6" cap="butt" />
+            <line stroke="#cc000000" width="1.6" cap="butt" fix="true" />
           </m>
         </m>
 
@@ -907,11 +983,9 @@
         </m>
         <m k="railway" v="light_rail">
           <!-- <line stroke="#0f4c0f" width="0.4" cap="butt" />
-          <line stroke="#b7e6e6" width="0.25" cap="butt" />
-          <line stroke="#0f4c0f" width="0.25" dasharray="12,18" cap="butt" />-->
-          <line stroke="#0f4c0f" width="0.4" cap="butt" fade="12"
-               stipple="10" stipple-width="0.8"
-              stipple-stroke="#b7e6e6" />
+            <line stroke="#b7e6e6" width="0.25" cap="butt" />
+            <line stroke="#0f4c0f" width="0.25" dasharray="12,18" cap="butt" /> -->
+          <line stroke="#0f4c0f" width="0.4" cap="butt" fade="12" stipple="10" stipple-width="0.8" stipple-stroke="#b7e6e6" />
         </m>
         <m k="railway" v="narrow_gauge">
           <line stroke="#333333" width="0.4" cap="butt" />
@@ -920,11 +994,10 @@
         </m>
         <m k="railway" v="rail">
           <!-- <line stroke="#333333" width="0.55" cap="butt" />
-          <line stroke="#e6e6e6" width="0.4" cap="butt" />
-          <line stroke="#333333" width="0.4" dasharray="15,15" cap="butt" />-->
-             <line stroke="#333333" width="1.6" cap="butt" fade="12" fix="true"
-               stipple="10" stipple-width="0.8"
-              stipple-stroke="#e6e6e6" />
+            <line stroke="#e6e6e6" width="0.4" cap="butt" />
+            <line stroke="#333333" width="0.4" dasharray="15,15" cap="butt" /> -->
+          <line stroke="#333333" width="1.6" cap="butt" fade="12" fix="true" stipple="10" stipple-width="0.8"
+            stipple-stroke="#e6e6e6" />
         </m>
       </m>
     </m>
@@ -958,18 +1031,16 @@
             <line stroke="#f9574b" width="1.25" fix="true" dasharray="15, 15" />
           </m>
           <m k="admin_level" v="4">
-            <line stroke="#00000000" width="1.25" fix="true"
-              stipple="4" stipple-width="0.9" stipple-stroke="#f9574b"
+            <line stroke="#00000000" width="1.25" fix="true" stipple="4" stipple-width="0.9" stipple-stroke="#f9574b"
               dasharray="15, 5, 5, 5" />
           </m>
           <m k="admin_level" v="3">
-            <line stroke="#f9574b" width="1.25" fix="true"  />
+            <line stroke="#f9574b" width="1.25" fix="true" />
           </m>
           <m k="admin_level" v="2">
             <!-- <line stroke="#80ffff00" width="0.75" />
-            <line stroke="#f9574b" width="1.25" fix="true" dasharray="15, 15" />-->
-            <line stroke="#f9574b" width="1.25" fix="true"
-              stipple="6" stipple-width="0.9" stipple-stroke="#80ffff00"
+              <line stroke="#f9574b" width="1.25" fix="true" dasharray="15, 15" /> -->
+            <line stroke="#f9574b" width="1.25" fix="true" stipple="6" stipple-width="0.9" stipple-stroke="#80ffff00"
               dasharray="15, 5, 5, 5" />
           </m>
         </m>
@@ -978,277 +1049,273 @@
 
 
     <!-- <m k="historic" v="ruins" zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#4040ff"
+      <caption k="name" style="bold" size="10" fill="#4040ff"
       stroke="#ffffff" width="2.0" />
       </m>
 
 
       <m k="place" v="locality" zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#000000"
+      <caption k="name" style="bold" size="10" fill="#000000"
       stroke="#ffffff" width="2.0" />
       </m> -->
   </m>
 
 
   <m e="node">
-    <!--
-      <m k="aeroway">
+
+    <m k="aeroway">
       <m k="aeroway" v="helipad" zoom-min="17">
-      <symbol src="symbols/helipad.png" />
+        <symbol src="helipad" />
       </m>
       <m k="aeroway" v="aerodrome|airport" zoom-max="13">
-      <symbol src="symbols/airport.png" />
-      </m>
+        <symbol src="airport" />
       </m>
+    </m>
 
-
-      <m k="amenity">
-      <m k="amenity" v="atm" zoom-min="17">
-      <symbol src="symbols/atm.png" />
+    <m k="amenity">
+      <m select="first">
+        <m v="atm" zoom-min="17">
+          <symbol src="atm" />
+        </m>
+        <m v="bank" zoom-min="17">
+          <symbol src="bank" />
+        </m>
+        <m v="bench" zoom-min="17">
+          <symbol src="bench" />
+        </m>
+        <m v="bicycle_rental" zoom-min="17">
+          <symbol src="bicycle_rental" />
+        </m>
+        <m v="bus_station" zoom-min="17">
+          <symbol src="bus_sta" />
+        </m>
+        <m v="cafe" zoom-min="17">
+          <symbol src="cafe" />
+        </m>
+        <m v="cinema" zoom-min="17">
+          <symbol src="cinema" />
+        </m>
+        <m v="drinking_water" zoom-min="17">
+          <symbol src="drinking_water" />
+        </m>
+        <m v="fast_food" zoom-min="17">
+          <symbol src="fastfood" />
+        </m>
+        <m v="fire_station" zoom-min="17">
+          <symbol src="firebrigade" />
+        </m>
+        <m v="fountain" zoom-min="17">
+          <symbol src="fountain" />
+        </m>
+        <m v="fuel" zoom-min="17">
+          <symbol src="petrolStation" />
+        </m>
+        <m v="hospital" zoom-min="15">
+          <symbol src="hospital" />
+        </m>
+        <m v="kindergarten" zoom-min="17">
+          <symbol src="kindergarten" />
+        </m>
+        <m v="library" zoom-min="17">
+          <symbol src="library" />
+        </m>
+        <m v="parking" zoom-min="17">
+          <symbol src="parking" />
+        </m>
+        <m v="pharmacy" zoom-min="17">
+          <symbol src="pharmacy" />
+        </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="post_office" zoom-min="17">
+          <symbol src="postoffice" />
+        </m>
+        <m v="pub|bar" zoom-min="17">
+          <symbol src="pub" />
+        </m>
+        <m v="recycling" zoom-min="17">
+          <symbol src="recycling" />
+        </m>
+        <m v="restaurant" zoom-min="17">
+          <symbol src="restaurant" />
+        </m>
+        <m v="school" zoom-min="17">
+          <symbol src="school" />
+        </m>
+        <m v="shelter" zoom-min="17">
+          <symbol src="shelter" />
+        </m>
+        <m v="telephone" zoom-min="17">
+          <symbol src="telephone" />
+        </m>
+        <m v="theatre" zoom-min="17">
+          <symbol src="theatre" />
+        </m>
+        <m v="toilets" zoom-min="17">
+          <symbol src="toilets" />
+        </m>
+        <m v="university|college" zoom-min="17">
+          <symbol src="university" />
+        </m>
       </m>
-      <m k="amenity" v="bank" zoom-min="17">
-      <symbol src="symbols/bank.png" />
-      </m>
-      <m k="amenity" v="bench" zoom-min="17">
-      <symbol src="symbols/bench.png" />
-      </m>
-      <m k="amenity" v="bicycle_rental" zoom-min="17">
-      <symbol src="symbols/bicycle_rental.png" />
-      </m>
-      <m k="amenity" v="bus_station" zoom-min="17">
-      <symbol src="symbols/bus_sta.png" />
-      </m>
-      <m k="amenity" v="cafe" zoom-min="17">
-      <symbol src="symbols/cafe.png" />
-      </m>
-      <m k="amenity" v="cinema" zoom-min="17">
-      <symbol src="symbols/cinema.png" />
-      </m>
-      <m k="amenity" v="drinking_water" zoom-min="17">
-      <symbol src="symbols/drinking_water.png" />
-      </m>
-      <m k="amenity" v="fast_food" zoom-min="17">
-      <symbol src="symbols/fastfood.png" />
-      </m>
-      <m k="amenity" v="fire_station" zoom-min="17">
-      <symbol src="symbols/firebrigade.png" />
-      </m>
-      <m k="amenity" v="fountain" zoom-min="17">
-      <symbol src="symbols/fountain.png" />
-      </m>
-      <m k="amenity" v="fuel" zoom-min="17">
-      <symbol src="symbols/petrolStation.png" />
-      </m>
-      <m k="amenity" v="hospital" zoom-min="15">
-      <symbol src="symbols/hospital.png" />
-      </m>
-      <m k="amenity" v="kindergarten" zoom-min="17">
-      <symbol src="symbols/kindergarten.png" />
-      </m>
-      <m k="amenity" v="library" zoom-min="17">
-      <symbol src="symbols/library.png" />
-      </m>
-      <m k="amenity" v="parking" zoom-min="17">
-      <symbol src="symbols/parking.png" />
-      </m>
-      <m k="amenity" v="pharmacy" zoom-min="17">
-      <symbol src="symbols/pharmacy.png" />
-      </m>
-      <m k="amenity" v="place_of_worship" zoom-min="17">
-      <m k="denomination|religion" v="jewish">
-      <symbol src="symbols/synagogue.png" />
-      </m>
-      <m k="denomination|religion" v="muslim|moslem">
-      <symbol src="symbols/mosque.png" />
-      </m>
-      <m k="denomination|religion" v="christian">
-      <symbol src="symbols/church.png" />
-      </m>
-      </m>
-      <m k="amenity" v="post_box" zoom-min="17">
-      <symbol src="symbols/postbox.png" />
-      </m>
-      <m k="amenity" v="post_office" zoom-min="17">
-      <symbol src="symbols/postoffice.png" />
-      </m>
-      <m k="amenity" v="pub|bar" zoom-min="17">
-      <symbol src="symbols/pub.png" />
-      </m>
-      <m k="amenity" v="recycling" zoom-min="17">
-      <symbol src="symbols/recycling.png" />
-      </m>
-      <m k="amenity" v="restaurant" zoom-min="17">
-      <symbol src="symbols/restaurant.png" />
-      </m>
-      <m k="amenity" v="school" zoom-min="17">
-      <symbol src="symbols/school.png" />
-      </m>
-      <m k="amenity" v="shelter" zoom-min="17">
-      <symbol src="symbols/shelter.png" />
-      </m>
-      <m k="amenity" v="telephone" zoom-min="17">
-      <symbol src="symbols/telephone.png" />
-      </m>
-      <m k="amenity" v="theatre" zoom-min="17">
-      <symbol src="symbols/theatre.png" />
-      </m>
-      <m k="amenity" v="toilets" zoom-min="17">
-      <symbol src="symbols/toilets.png" />
-      </m>
-      <m k="amenity" v="university|college" zoom-min="17">
-      <symbol src="symbols/university.png" />
-      </m>
-
       <m zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#4040ff"
-      stroke="#ffffff" width="2.0" />
-      </m>
+        <text use="caption-small-blue" />
       </m>
+    </m>
 
-
-      <m k="barrier" v="bollard">
+    <m k="barrier" v="bollard">
       <circle radius="1.5" fill="#707070" />
-      </m>
+    </m>
 
 
-      <m k="highway">
+    <m k="highway">
       <m k="highway" v="bus_stop" zoom-min="16">
-      <symbol src="symbols/bus.png" />
+        <symbol src="bus" />
       </m>
       <m k="highway" v="traffic_signals" zoom-min="17">
-      <symbol src="symbols/traffic_signal.png" />
+        <symbol src="traffic_signal" />
       </m>
       <m k="highway" v="turning_circle">
-      <circle radius="1.4" scale-radius="true" fill="#ffffff" />
-      </m>
+        <circle radius="1.4" scale-radius="true" fill="#ffffff" />
       </m>
+    </m>
 
 
-      <m k="historic">
+    <m k="historic">
       <circle radius="3" fill="#4040ff" stroke="#606060" width="1.5" />
 
       <m zoom-min="17">
-      <caption k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff"
-      stroke="#ffffff" width="2.0" />
-      </m>
+        <text use="caption-small-blue" />
       </m>
+    </m>
 
 
-      <m k="addr:housenumber" zoom-min="18">
-      <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060"
-      stroke="#ffffff" width="2.0" />
-      </m>
+    <m k="addr:housenumber" zoom-min="18">
+      <caption k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff" stroke-width="2.0" />
+    </m>
 
 
-      <m k="leisure" v="playground" zoom-min="17">
-      <symbol src="symbols/playground.png" />
-      </m>
+    <m k="leisure" v="playground" zoom-min="17">
+      <symbol src="playground" />
+    </m>
 
 
-      <m k="man_made" v="windmill" zoom-min="17">
-      <symbol src="symbols/windmill.png" />
-      </m>
+    <m k="man_made" v="windmill" zoom-min="17">
+      <symbol src="windmill" />
+    </m>
 
 
-      <m k="natural">
-      <m k="natural" v="cave_entrance" zoom-min="15">
-      <symbol src="symbols/cave_entrance.png" />
+    <m k="natural">
+      <m select="first">
+        <m v="cave_entrance" zoom-min="15">
+          <symbol src="cave_entrance" />
+        </m>
+        <m v="peak" zoom-min="12">
+          <symbol src="peak" />
+          <caption k="ele" dy="20" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+        </m>
+        <m v="tree" zoom-min="16">
+          <symbol src="tree" />
+        </m>
+        <m v="volcano" zoom-min="12">
+          <symbol src="vulcan" />
+        </m>
       </m>
-      <m k="natural" v="peak" zoom-min="12">
-      <symbol src="symbols/peak.png" />
-      <caption k="ele" dy="20" font-style="bold" font-size="10" fill="#000000"
-      stroke="#ffffff" width="2.0" />
-      </m>
-      <m k="natural" v="tree" zoom-min="16">
-      <symbol src="symbols/tree.png" />
-      </m>
-      <m k="natural" v="volcano" zoom-min="12">
-      <symbol src="symbols/vulcan.png" />
-      </m>
-
       <m zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#000000"
-      stroke="#ffffff" width="2.0" />
-      </m>
+        <caption k="name" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
+    </m>
 
-    -->
-    <m k="place">
-      <m k="place" v="hamlet" zoom-min="13">
-        <caption k="name" font-style="bold" font-size="13" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+
+    <m k="place" firt="true">
+      <m v="hamlet" zoom-min="13">
+        <caption k="name" style="bold" size="13" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
-      <m k="place" v="suburb|town|village" zoom-min="12">
-        <caption k="name" font-style="bold" font-size="15" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+      <m v="suburb|town|village" zoom-min="10">
+        <caption k="name" style="bold" size="15" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
-      <m k="place" v="island" zoom-min="10">
-        <caption k="name" font-style="bold" font-size="20" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+      <m v="island" zoom-min="10">
+        <caption k="name" style="bold" size="20" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
-      <m k="place" v="city" zoom-max="14">
-        <caption k="name" font-style="bold" font-size="25" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+      <m v="city" zoom-max="14">
+        <caption k="name" style="bold" size="25" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
-      <m k="place" v="country" zoom-max="6">
-        <caption k="name" font-style="bold" font-size="25" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+      <m v="country" zoom-max="6">
+        <caption k="name" style="bold" size="25" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
     </m>
 
 
     <m k="railway">
-      <!-- <m k="railway" v="crossing" zoom-min="16">
-        <symbol src="symbols/railway-crossing-small.png" />
+      <m k="railway" v="crossing" zoom-min="16">
+        <symbol src="railway-crossing-small" />
+      </m>
+      <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
+      <m k="railway" v="level_crossing" zoom-min="14">
+        <symbol src="railway-crossing" />
       </m>
-      <m k="railway" v="level_crossing" zoom-min="16">
-        <symbol src="symbols/railway-crossing.png" />
-      </m>-->
       <m k="railway" v="station" zoom-min="14">
         <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
-        <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
+        <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
-      <m k="railway" v="halt|tram_stop" zoom-min="17">
+      <m k="railway" v="halt|tram_stop" zoom-min="15">
         <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
-        <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
+        <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
     </m>
 
 
     <m k="shop">
       <m v="bakery" zoom-min="17">
-        <symbol src="symbols/bakery.png" />
+        <symbol src="bakery" />
       </m>
       <m v="florist" zoom-min="17">
-        <symbol src="symbols/florist.png" />
+        <symbol src="florist" />
       </m>
       <m v="supermarket|organic" zoom-min="17">
-        <symbol src="symbols/supermarket.png" />
+        <symbol src="supermarket" />
       </m>
 
       <m zoom-min="17">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
+        <text use="caption-small-blue" />
       </m>
     </m>
 
 
     <m k="tourism">
       <m v="alpine_hut" zoom-min="16">
-        <symbol src="symbols/alpine_hut.png" />
+        <symbol src="alpine_hut" />
       </m>
       <m v="camp_site" zoom-min="17">
-        <symbol src="symbols/campSite.png" />
+        <symbol src="campSite" />
       </m>
       <m v="hostel" zoom-min="17">
-        <symbol src="symbols/hostel.png" />
+        <symbol src="hostel" />
       </m>
       <m v="hotel" zoom-min="17">
-        <symbol src="symbols/hotel.png" />
+        <symbol src="hotel" />
       </m>
       <m v="information" zoom-min="17">
-        <symbol src="symbols/information.png" />
+        <symbol src="information" />
       </m>
       <m v="viewpoint" zoom-min="15">
-        <symbol src="symbols/viewpoint.png" />
+        <symbol src="viewpoint" />
       </m>
 
       <m zoom-min="17">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0" />
+        <text use="caption-small-blue" />
       </m>
     </m>
   </m>
diff --git a/vtm/assets/styles/tronrender.xml b/vtm/assets/styles/tronrender.xml
index 273ff8cc..e6d14289 100644
--- a/vtm/assets/styles/tronrender.xml
+++ b/vtm/assets/styles/tronrender.xml
@@ -2,10 +2,72 @@
 <rendertheme xmlns="http://opensciencemap.org/rendertheme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://opensciencemap.org/rendertheme ../../rendertheme.xsd" version="1" map-background="#050508">
 
-  <style-text id="road" k="name" font-style="bold" font-size="18" stroke="#606050"
-    fill="#eeffee" stroke-width="2.5" />
-  <style-text id="major-road" k="name" font-style="bold" font-size="19" fill="#e2cf5d"
-    stroke="#101010" stroke-width="2.5" />
+    <atlas img="styles/osmarender.png">
+    <rect id="airport" pos="226 38 24 24" />
+    <rect id="alpine_hut" pos="198 41 26 21" />
+    <rect id="atm" pos="279 2 14 16" />
+    <rect id="bakery" pos="305 46 22 16" />
+    <rect id="bank" pos="395 43 19 19" />
+    <rect id="bench" pos="213 29 8 10" />
+    <rect id="bicycle_rental" pos="295 2 13 16" />
+    <rect id="bus" pos="130 32 23 9" />
+    <rect id="bus_sta" pos="36 30 31 32" />
+    <rect id="cable_car" pos="2 2 29 26" />
+    <rect id="cafe" pos="216 2 14 14" />
+    <rect id="campSite" pos="329 42 20 20" />
+    <rect id="cave_entrance" pos="297 23 16 10" />
+    <rect id="chair_lift" pos="130 2 13 28" />
+    <rect id="church" pos="61 9 9 19" />
+    <rect id="cinema" pos="145 8 16 22" />
+    <rect id="drinking_water" pos="416 43 19 19" />
+    <rect id="fastfood" pos="351 42 20 20" />
+    <rect id="firebrigade" pos="130 43 36 19" />
+    <rect id="florist" pos="342 24 12 16" />
+    <rect id="fountain" pos="500 46 10 16" />
+    <rect id="gondola" pos="252 38 21 24" />
+    <rect id="helipad" pos="69 31 31 31" />
+    <rect id="hospital" pos="437 43 19 19" />
+    <rect id="hostel" pos="168 44 28 18" />
+    <rect id="hotel" pos="93 11 18 17" />
+    <rect id="information" pos="458 43 19 19" />
+    <rect id="kindergarten" pos="184 2 14 19" />
+    <rect id="library" pos="372 22 9 18" />
+    <rect id="mosque" pos="248 2 17 15" />
+    <rect id="oneway" pos="275 38 25 7" />
+    <rect id="parking" pos="373 42 20 20" />
+    <rect id="peak" pos="267 9 9 8" />
+    <rect id="petrolStation" pos="263 19 14 17" />
+    <rect id="pharmacy" pos="479 43 19 19" />
+    <rect id="playground" pos="223 18 18 18" />
+    <rect id="postbox" pos="232 2 14 14" />
+    <rect id="postoffice" pos="172 23 19 19" />
+    <rect id="pub" pos="326 26 14 14" />
+    <rect id="railway-crossing" pos="275 47 28 15" />
+    <rect id="railway-crossing-small" pos="155 32 15 9" />
+    <rect id="recycling" pos="72 11 19 18" />
+    <rect id="restaurant" pos="356 28 14 12" />
+    <rect id="school" pos="200 2 14 19" />
+    <rect id="shelter" pos="33 4 26 24" />
+    <rect id="soccer-borderless" pos="102 30 26 32" />
+    <rect id="supermarket" pos="193 23 18 16" />
+    <rect id="synagogue" pos="113 11 15 17" />
+    <rect id="telephone" pos="383 21 7 19" />
+    <rect id="tennis" pos="2 30 32 32" />
+    <rect id="theatre" pos="243 19 18 17" />
+    <rect id="toilets" pos="163 2 19 19" />
+    <rect id="traffic_signal" pos="392 21 7 19" />
+    <rect id="tree" pos="145 2 4 4" />
+    <rect id="university" pos="302 35 19 9" />
+    <rect id="viewpoint" pos="279 20 16 16" />
+    <rect id="vulcan" pos="315 25 9 8" />
+    <rect id="windmill" pos="310 2 13 19" />
+  </atlas>
+  
+   <style-text id="caption-small-blue" caption="true" dy="12" k="name" style="bold" size="16" fill="#4040ff"
+    stroke="#ffffff" stroke-width="2.0" />
+    
+  <style-text id="road" k="name" style="bold" size="18" stroke="#606050" fill="#eeffee" stroke-width="2.5" />
+  <style-text id="major-road" k="name" style="bold" size="19" fill="#ffef7d" stroke="#624f00" stroke-width="2.5" />
 
   <style-area id="residential" fill="#ff0000" fade="10" />
 
@@ -56,8 +118,7 @@
 
   <!-- track|footway|path|cycleway -->
   <style-line id="footway" stroke="#c1bcb6" width="1.2" cap="butt" fix="true" />
-  <style-line id="footway:z16" use="footway" width="-1.0" fix="false"
-    fade="-1" />
+  <style-line id="footway:z16" use="footway" width="-1.0" fix="false" fade="-1" />
   <style-line id="footway:z17" stroke="#faf8f5" width="0.3" />
 
   <!-- de: ein Weg der für Reiter vorgeshen ist.. -->
@@ -71,12 +132,12 @@
   <!-- no-go area boundary -->
   <style-line id="fence" stroke="#444444" width="1.2" fix="true" cap="butt" />
 
-  <style-line id="aeroway:runway" stroke="#008888" width="1.8" cap="butt"
-    blur="0.7" />
+  <style-line id="aeroway:runway" stroke="#008888" width="1.8" cap="butt" blur="0.7" />
 
   <style-line id="building" stroke="#dd888888" width="1.5" fix="true" cap="butt" />
   <style-area id="building" fill="#ee202020" fade="15" />
 
+  
   <!-- ways -->
   <m e="way">
 
@@ -178,9 +239,11 @@
       <!-- amenity -->
       <m k="amenity">
         <m v="kindergarten|school|college|university" zoom-min="14">
-          <area fill="#cdabde" stroke="#b094bf" stroke-width="0.2" />
+          <area fill="#524459" stroke="#b094bf" stroke-width="0.2" />
+        </m>
+        <m v="hospital">
+          <area fill="#716553" />
         </m>
-
         <m v="parking" zoom-min="14">
           <area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
         </m>
@@ -282,7 +345,7 @@
         <line use="water" width="-0.1" />
       </m>
 
-      <style-outline id="river" width="1.0" stroke="#456799" blur="1.0" />
+      <outline-layer id="river" width="1.0" stroke="#456799" blur="1.0" />
 
       <m k="waterway" v="river" closed="no">
         <m zoom-min="12">
@@ -346,7 +409,7 @@
 
     <!-- outline 0 -->
 
-    <style-outline id="0" stroke="#44000000" width="0.1" />
+    <outline-layer id="0" stroke="#44000000" width="0.1" />
     <!-- tunnel -->
     <m k="tunnel" v="yes|true" zoom-min="11">
       <!-- highway tunnels -->
@@ -489,26 +552,26 @@
         <!-- <line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/>
           <area fill="#e9e6e3" fade="15" /> -->
       </m>
-
+      <m zoom-min="17">
+        <extrusion side-color="#cc707070" top-color="#cc707070" line-color="#50ff00ff" />
+      </m>
       <!-- <m zoom-min="17">
-        <caption k="name" font-style="bold" font-size="10" fill="#4040ff"
+        <caption k="name" style="bold" size="10" fill="#4040ff"
         stroke="#ffffff" stroke-width="2.0" />
-        <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060"
+        <caption k="addr:housenumber" style="bold" size="10" fill="#606060"
         stroke="#ffffff" stroke-width="2.0" />
         </m> -->
     </m>
 
     <!-- outline 1 - 4 -->
-    <style-outline id="glow3" stroke="#ddffffff" width="0.8" blur="0.5"
-      fade="13" />
-    <!-- > <style-outline id="glow" stroke="#ee909090" width="0.8" blur="0.5" fade="14"/> -->
-    <style-outline id="glow2" width="1.0" stroke="#ffffff" blur="1.0"
-      fade="13" />
-    <style-outline id="1" stroke="#dd000000" width="-0.3" fade="14" />
-    <!-- <style-outline id="1" stroke="#404030"/> -->
-    <style-outline id="2" stroke="#c0c0c0" />
-    <style-outline id="primary" stroke="#7f7700" width="0.025" />
-    <style-outline id="motorway" stroke="#805f2e" width="0.025" />
+    <outline-layer id="glow3" stroke="#ddffffff" width="0.8" blur="0.5" fade="13" />
+    <!-- > <outline-layer id="glow" stroke="#ee909090" width="0.8" blur="0.5" fade="14"/> -->
+    <outline-layer id="glow2" width="1.0" stroke="#ffffff" blur="1.0" fade="13" />
+    <outline-layer id="1" stroke="#dd000000" width="-0.3" fade="14" />
+    <!-- <outline-layer id="1" stroke="#404030"/> -->
+    <outline-layer id="2" stroke="#c0c0c0" />
+    <outline-layer id="primary" stroke="#7f7700" width="0.025" />
+    <outline-layer id="motorway" stroke="#805f2e" width="0.025" />
 
 
     <!-- highway -->
@@ -680,7 +743,7 @@
         <m k="bridge" v="yes|true|viaduct|suspension">
           <m k="area" v="~|no|false">
 
-            <style-outline id="bridge" stroke="#aa202020" width="0.08" />
+            <outline-layer id="bridge" stroke="#aa202020" width="0.08" />
 
             <m zoom-min="15">
               <m v="steps">
@@ -775,7 +838,7 @@
             </m>
 
             <m zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
-              <area fill="#ffffff" />
+              <area fill="#aaffffff" />
               <line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
             </m>
 
@@ -831,8 +894,8 @@
       src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png"
       /> </m> <m k="aerialway" v="chair_lift"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png"
       /> </m> <m k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png"
-      /> </m> <m zoom-min="14"> <text k="name" font-style="bold"
-      font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </m>
+      /> </m> <m zoom-min="14"> <text k="name" style="bold"
+      size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </m>
       </m> -->
 
 
@@ -875,8 +938,7 @@
         </m>
 
         <m k="railway" v="rail|turntable" zoom-min="16">
-          <line stroke="#ddaa9988" width="1.0" cap="butt" fix="true" fade="12"
-            stipple="1" />
+          <line stroke="#ddaa9988" width="1.0" cap="butt" fix="true" fade="12" stipple="1" />
         </m>
 
         <!-- <m k="railway" v="rail" zoom-max="14" zoom-min="13">
@@ -931,94 +993,351 @@
 
     <!-- historic -->
     <!-- <m k="historic" v="ruins" zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0"
+      <caption k="name" style="bold" size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0"
       />
       </m> -->
 
     <!-- place -->
     <m k="place" v="locality" zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#000000" stroke="#ffffff"
-        stroke-width="2.0" />
+      <caption k="name" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
     </m>
     <m k="debug" v="area">
       <line stroke="#ff0000" width="1.2" fix="true" cap="butt" />
       <area fill="#880000ff" />
-      <caption k="name" font-size="15" fill="#ff0000" stroke="#444444"
-        stroke-width="2.0" />
+      <caption k="name" size="15" fill="#ff0000" stroke="#444444" stroke-width="2.0" />
     </m>
     <m k="debug" v="way">
       <line stroke="#00ffff" width="1.5" fix="true" cap="butt" />
-      <caption k="name" font-size="15" fill="#00ffff" stroke="#444444"
-        stroke-width="2.0" />
+      <caption k="name" size="15" fill="#00ffff" stroke="#444444" stroke-width="2.0" />
     </m>
     <m k="debug" v="box">
       <line stroke="#dedeae" width="1.5" fix="true" cap="butt" />
     </m>
   </m>
 
-  <m e="node">
-    <!-- barrier -->
+  <!-- <m e="node">
+    barrier
     <m k="barrier" v="bollard">
-      <circle r="1.5" fill="#909090" />
+    <circle r="1.5" fill="#909090" />
     </m>
 
     <m k="debug">
-      <caption k="name" font-size="16" fill="#fefece" />
+    <caption k="name" size="16" fill="#fefece" />
+    </m>
+
+    highway
+    <m k="highway"> <m k="highway" v="turning_circle">
+    <circle r="1.4" scale-radius="true" fill="#ffffff" /> </m> </m>
+
+    historic
+    <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
+    width="1.5" /> <m zoom-min="17"> <caption
+    k="name" dy="-10" style="bold" size="10" fill="#4040ff" stroke="#ffffff"
+    width="2.0" /> </m> </m>
+
+    house numbers
+    <m k="addr:housenumber" zoom-min="18"> <caption
+    k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff"
+    width="2.0" /> </m>
+
+    place
+    <m k="place">
+    <m v="suburb|town|village">
+    <caption k="name" size="20" fill="#eeeeee" stroke="#000020"
+    stroke-width="4.0" priority="2" />
+    </m>
+    <m v="island" zoom-min="10">
+    <caption k="name" style="bold" size="20" fill="#ffffff" stroke="#ffffff"
+    stroke-width="1.0" priority="1" />
+    </m>
+    <m v="city">
+    <caption k="name" style="bold" size="22" fill="#ffffff" stroke="#002020"
+    stroke-width="4.0" priority="1" />
+    </m>
+    <m v="country">
+    <caption k="name" size="22" fill="#ffffff" stroke="#000000"
+    stroke-width="2.0" priority="0" />
+    </m>
     </m>
 
 
-    <!-- highway -->
-    <!-- <m k="highway"> <m k="highway" v="turning_circle">
-      <circle r="1.4" scale-radius="true" fill="#ffffff" /> </m> </m> -->
+    railway
+    <m k="railway">
+    <m v="station" zoom-min="14">
+    <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+    <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d"
+    stroke="#ffffff" stroke-width="2.0" />
+    </m>
+    <m v="halt|tram_stop" zoom-min="17">
+    <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+    <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d"
+    stroke="#ffffff" stroke-width="2.0" />
+    </m>
+    </m>
 
-    <!-- historic -->
-    <!-- <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
-      width="1.5" /> <m zoom-min="17"> <caption
-      k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
-      width="2.0" /> </m> </m> -->
+    <m k="natural" v="tree" zoom-min="15">
+    <circle r="10"/>
+    </m>
+
+    </m> -->
 
 
-    <!-- house numbers -->
-    <!-- <m k="addr:housenumber" zoom-min="18"> <caption
-      k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
-      width="2.0" /> </m> -->
+  <m e="node">
+
+    <m k="aeroway">
+      <m k="aeroway" v="helipad" zoom-min="17">
+        <symbol src="helipad" />
+      </m>
+      <m k="aeroway" v="aerodrome|airport" zoom-max="13">
+        <symbol src="airport" />
+      </m>
+    </m>
+
+    <m k="amenity">
+      <m select="first">
+        <m v="atm" zoom-min="17">
+          <symbol src="atm" />
+        </m>
+        <m v="bank" zoom-min="17">
+          <symbol src="bank" />
+        </m>
+        <m v="bench" zoom-min="17">
+          <symbol src="bench" />
+        </m>
+        <m v="bicycle_rental" zoom-min="17">
+          <symbol src="bicycle_rental" />
+        </m>
+        <m v="bus_station" zoom-min="17">
+          <symbol src="bus_sta" />
+        </m>
+        <m v="cafe" zoom-min="17">
+          <symbol src="cafe" />
+        </m>
+        <m v="cinema" zoom-min="17">
+          <symbol src="cinema" />
+        </m>
+        <m v="drinking_water" zoom-min="17">
+          <symbol src="drinking_water" />
+        </m>
+        <m v="fast_food" zoom-min="17">
+          <symbol src="fastfood" />
+        </m>
+        <m v="fire_station" zoom-min="17">
+          <symbol src="firebrigade" />
+        </m>
+        <m v="fountain" zoom-min="17">
+          <symbol src="fountain" />
+        </m>
+        <m v="fuel" zoom-min="17">
+          <symbol src="petrolStation" />
+        </m>
+        <m v="hospital" zoom-min="15">
+          <symbol src="hospital" />
+        </m>
+        <m v="kindergarten" zoom-min="17">
+          <symbol src="kindergarten" />
+        </m>
+        <m v="library" zoom-min="17">
+          <symbol src="library" />
+        </m>
+        <m v="parking" zoom-min="17">
+          <symbol src="parking" />
+        </m>
+        <m v="pharmacy" zoom-min="17">
+          <symbol src="pharmacy" />
+        </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="post_office" zoom-min="17">
+          <symbol src="postoffice" />
+        </m>
+        <m v="pub|bar" zoom-min="17">
+          <symbol src="pub" />
+        </m>
+        <m v="recycling" zoom-min="17">
+          <symbol src="recycling" />
+        </m>
+        <m v="restaurant" zoom-min="17">
+          <symbol src="restaurant" />
+        </m>
+        <m v="school" zoom-min="17">
+          <symbol src="school" />
+        </m>
+        <m v="shelter" zoom-min="17">
+          <symbol src="shelter" />
+        </m>
+        <m v="telephone" zoom-min="17">
+          <symbol src="telephone" />
+        </m>
+        <m v="theatre" zoom-min="17">
+          <symbol src="theatre" />
+        </m>
+        <m v="toilets" zoom-min="17">
+          <symbol src="toilets" />
+        </m>
+        <m v="university|college" zoom-min="17">
+          <symbol src="university" />
+        </m>
+      </m>
+      <m zoom-min="17">
+        <text use="caption-small-blue" />
+      </m>
+    </m>
+
+    <m k="barrier" v="bollard">
+      <circle radius="1.5" fill="#707070" />
+    </m>
 
 
+    <m k="highway">
+      <m k="highway" v="bus_stop" zoom-min="16">
+        <symbol src="bus" />
+      </m>
+      <m k="highway" v="traffic_signals" zoom-min="17">
+        <symbol src="traffic_signal" />
+      </m>
+      <m k="highway" v="turning_circle">
+        <circle radius="1.4" scale-radius="true" fill="#ffffff" />
+      </m>
+    </m>
 
-    <!-- place -->
-    <m k="place">
-      <m v="suburb|town|village">
-        <caption k="name" font-size="20" fill="#eeeeee" stroke="#000020"
-          stroke-width="4.0" priority="2" />
+
+    <m k="historic">
+      <circle radius="3" fill="#4040ff" stroke="#606060" width="1.5" />
+
+      <m zoom-min="17">
+        <text use="caption-small-blue" />
+      </m>
+    </m>
+
+
+    <m k="addr:housenumber" zoom-min="18">
+      <caption k="addr:housenumber" style="bold" size="10" fill="#606060" stroke="#ffffff" stroke-width="2.0" />
+    </m>
+
+
+    <m k="leisure" v="playground" zoom-min="17">
+      <symbol src="playground" />
+    </m>
+
+
+    <m k="man_made" v="windmill" zoom-min="17">
+      <symbol src="windmill" />
+    </m>
+
+
+    <m k="natural">
+      <m select="first">
+        <m v="cave_entrance" zoom-min="15">
+          <symbol src="cave_entrance" />
+        </m>
+        <m v="peak" zoom-min="12">
+          <symbol src="peak" />
+          <caption k="ele" dy="20" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+        </m>
+        <m v="tree" zoom-min="16">
+          <symbol src="tree" />
+        </m>
+        <m v="volcano" zoom-min="12">
+          <symbol src="vulcan" />
+        </m>
+      </m>
+      <m zoom-min="17">
+        <caption k="name" style="bold" size="10" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+      </m>
+    </m>
+
+
+    <m k="place" firt="true">
+      <m v="hamlet" zoom-min="13">
+        <caption k="name" style="bold" size="13" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
+      </m>
+      <m v="suburb|town|village" zoom-min="10">
+        <caption k="name" style="bold" size="15" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
       <m v="island" zoom-min="10">
-        <caption k="name" font-style="bold" font-size="20" fill="#ffffff" stroke="#ffffff"
-          stroke-width="1.0" priority="1" />
+        <caption k="name" style="bold" size="20" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
-      <m v="city">
-        <caption k="name" font-style="bold" font-size="22" fill="#ffffff" stroke="#002020"
-          stroke-width="4.0" priority="1" />
+      <m v="city" zoom-max="14">
+        <caption k="name" style="bold" size="25" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
-      <m v="country">
-        <caption k="name" font-size="22" fill="#ffffff" stroke="#000000"
-          stroke-width="2.0" priority="0" />
+      <m v="country" zoom-max="6">
+        <caption k="name" style="bold" size="25" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
     </m>
 
 
-    <!-- railway -->
     <m k="railway">
-      <m v="station" zoom-min="14">
-        <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
-        <!-- <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d"
-          stroke="#ffffff" stroke-width="2.0" /> -->
+      <m k="railway" v="crossing" zoom-min="16">
+        <symbol src="railway-crossing-small" />
       </m>
-      <m v="halt|tram_stop" zoom-min="17">
+      <!-- in Bremen this is also used for crossings between tram-lines and roads... -->
+      <m k="railway" v="level_crossing" zoom-min="14">
+        <symbol src="railway-crossing" />
+      </m>
+      <m k="railway" v="station" zoom-min="14">
+        <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
+      </m>
+      <m k="railway" v="halt|tram_stop" zoom-min="15">
         <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
-        <!-- <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d"
-          stroke="#ffffff" stroke-width="2.0" /> -->
+        <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
+      </m>
+    </m>
+
+
+    <m k="shop">
+      <m v="bakery" zoom-min="17">
+        <symbol src="bakery" />
+      </m>
+      <m v="florist" zoom-min="17">
+        <symbol src="florist" />
+      </m>
+      <m v="supermarket|organic" zoom-min="17">
+        <symbol src="supermarket" />
+      </m>
+
+      <m zoom-min="17">
+        <text use="caption-small-blue" />
+      </m>
+    </m>
+
+
+    <m k="tourism">
+      <m v="alpine_hut" zoom-min="16">
+        <symbol src="alpine_hut" />
+      </m>
+      <m v="camp_site" zoom-min="17">
+        <symbol src="campSite" />
+      </m>
+      <m v="hostel" zoom-min="17">
+        <symbol src="hostel" />
+      </m>
+      <m v="hotel" zoom-min="17">
+        <symbol src="hotel" />
+      </m>
+      <m v="information" zoom-min="17">
+        <symbol src="information" />
+      </m>
+      <m v="viewpoint" zoom-min="15">
+        <symbol src="viewpoint" />
+      </m>
+
+      <m zoom-min="17">
+        <text use="caption-small-blue" />
       </m>
     </m>
   </m>
-
 </rendertheme>
\ No newline at end of file