From 8ab84c4e8557dcd5fab1cc5e8ba812a7f22d2f65 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Mon, 30 Sep 2013 01:43:29 +0200
Subject: [PATCH] updates themes:

- nicer amenity area color
- add osmarender symbols
- use 'extrusion' layer styles
- keep meadow and conservation below residential
- fade wood on zoomlevel 8
---
 vtm/assets/styles/default.xml    | 1072 ++++++++++----------
 vtm/assets/styles/osmarender.png |  Bin 0 -> 23244 bytes
 vtm/assets/styles/osmarender.xml | 1561 ++++++++++++++++--------------
 vtm/assets/styles/tronrender.xml |  471 +++++++--
 4 files changed, 1724 insertions(+), 1380 deletions(-)
 create mode 100644 vtm/assets/styles/osmarender.png

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 0000000000000000000000000000000000000000..de48e3e5e8e36334c70954c4792e67a087e9a744
GIT binary patch
literal 23244
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
F{{X117#08k

literal 0
HcmV?d00001

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