diff --git a/src/org/oscim/theme/styles/default.xml b/src/org/oscim/theme/styles/default.xml
index e75118b4..9c6d0fb5 100644
--- a/src/org/oscim/theme/styles/default.xml
+++ b/src/org/oscim/theme/styles/default.xml
@@ -1,158 +1,167 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rendertheme xmlns="http://mapsforge.org/renderTheme"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://mapsforge.org/renderTheme ../renderTheme.xsd"
-             version="1" map-background="#fffcfa"> <!--fdfdfc">-->
+<rendertheme xmlns="http://mapsforge.org/renderTheme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://mapsforge.org/renderTheme ../renderTheme.xsd" version="1"
+  map-background="#fffcfa"> <!--fdfdfc"> -->
 
-  <style-text name="road" k="name"         font-size="16" fill="#101010" stroke="#eeeeee" stroke-width="2.0" priority="2"/>
-  <style-text name="major-road" k="name"   font-style="bold" font-size="16" fill="#101010" stroke="#eeeeee" stroke-width="2.0" priority="1"/>
+  <style-text name="road" k="name" font-size="16" fill="#101010" stroke="#eeeeee"
+    stroke-width="2.0" priority="2" />
+  <style-text name="major-road" k="name" font-style="bold" font-size="16" fill="#101010"
+    stroke="#eeeeee" stroke-width="2.0" priority="1" />
 
-  <!--<style-area name="residential"         fill="#e0dfde" fade="10"/>-->
-    <style-area name="residential"         fill="#e8e7e3" fade="10"/>
+  <!--<style-area name="residential" fill="#e0dfde" fade="10"/> -->
+  <style-area name="residential" fill="#e8e7e3" fade="10" />
 
-  <style-area name="railway|industrial"  fill="#e6e3e5" fade="10"/>
-  <!-- "#f0fae7" mint green  -->
-  <!-- <style-area name="farmland"            fill="#fff8bf" fade="11" />-->
-   <!--<style-area name="farmland"            fill="#f1ebb2" fade="11" />-->
-   <style-area name="farmland"            fill="#e7dab5" fade="11" />
-   <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
-  <!-- <style-area name="forest|wood"         fill="#ebefe5" fade="7" blend="11" blend-fill="#cee0bc"/>   d3dec8-->
-  <style-area name="forest|wood"         fill="#d1dbc7" fade="7" blend="10" blend-fill="#9ac56e"/>
+  <style-area name="railway|industrial" fill="#e6e3e5" fade="10" />
+  <!-- "#f0fae7" mint green -->
+  <!-- <style-area name="farmland" fill="#fff8bf" fade="11" /> -->
+  <!--<style-area name="farmland" fill="#f1ebb2" fade="11" /> -->
+  <style-area name="farmland" fill="#e7dab5" fade="11" />
+  <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
+  <!-- <style-area name="forest|wood" fill="#ebefe5" fade="7" blend="11" blend-fill="#cee0bc"/>
+    d3dec8 -->
+  <style-area name="forest|wood" fill="#d1dbc7" fade="7" blend="10" blend-fill="#9ac56e" />
 
   <!-- grass|meadow|garden|grassland|scrub -->
- 	<style-area name="greens"              fill="#c9dc91" fade="10" />
- 	 	<!-- <style-area name="greens"              fill="#d2e5ce" fade="10" />-->
- 	<!-- marsh|wetland|nature_reserve -->
- 	<style-area name="greens2"             fill="#deecb9" fade="12" />
+  <style-area name="greens" fill="#c9dc91" fade="10" />
+  <!-- <style-area name="greens" fill="#d2e5ce" fade="10" /> -->
+  <!-- marsh|wetland|nature_reserve -->
+  <style-area name="greens2" fill="#deecb9" fade="12" />
 
- 	<!-- park|common|green|cemetery|golf_course|dog_park -->
- 	<style-area name="park"                fill="#a3ca7b" fade="11" />
+  <!-- park|common|green|cemetery|golf_course|dog_park -->
+  <style-area name="park" fill="#a3ca7b" fade="11" />
 
   <!-- de:Kleingartengebiet -->
-  <style-area name="allotments"          fill="#efeae0" fade="12" />
+  <style-area name="allotments" fill="#efeae0" fade="12" />
 
- 	<!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
-  <style-area name="quarry"              fill="#ddddcc" fade="10" />
+  <!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
+  <style-area name="quarry" fill="#ddddcc" fade="10" />
 
-  <style-area name="military"            fill="#eeedea" fade="10"/>
+  <style-area name="military" fill="#eeedea" fade="10" />
 
 
-  <style-line name="residential"         stroke="#ffffff" width="1.3"/>
-  <style-line name="residential:bridge"  from="residential" cap="square"/>
+  <style-line name="residential" stroke="#ffffff" width="1.3" />
+  <style-line name="residential:bridge" from="residential" cap="square" />
 
- 	<!-- when inheriting another style with 'from' then 'witdth' is meant relative to the parent -->
- 	<style-line name="pedestrian"          from="residential" width="-0.4"/>
-  <style-line name="pedestrian:bridge"   from="pedestrian" cap="square"/>
+  <!-- when inheriting another style with 'from' then 'witdth' is meant relative to the parent -->
+  <style-line name="pedestrian" from="residential" width="-0.4" />
+  <style-line name="pedestrian:bridge" from="pedestrian" cap="square" />
 
-  <style-line name="highway:z11"         stroke="#fcba5a" width="1.8" />
-  <!-- <style-line name="highway:z11:bridge"    from="highway:z11" cap="butt" /> -->
+  <style-line name="highway:z11" stroke="#fcba5a" width="1.8" />
+  <!-- <style-line name="highway:z11:bridge" from="highway:z11" cap="butt" /> -->
 
-  <style-line name="trunk_link"          stroke="#fee16e" width="1.3" cap="butt"/>
-  <style-line name="trunk"               stroke="#fedb52" width="1.6"/>
-  <style-line name="primary:z11"         stroke="#fdeb05" width="1.5"/>
-  <style-line name="secondary:z11"       from="primary:z11" width="-0.1"/>
+  <style-line name="trunk_link" stroke="#fee16e" width="1.3" cap="butt" />
+  <style-line name="trunk" stroke="#fedb52" width="1.6" />
+  <style-line name="primary:z11" stroke="#fdeb05" width="1.5" />
+  <style-line name="secondary:z11" from="primary:z11" width="-0.1" />
 
-  <style-line name="tertiary"            from="residential" stroke="#fefefa" width="0.2" />
-  <style-line name="construction"        stroke="#e0e0e0" width="1.2" />
+  <style-line name="tertiary" from="residential" stroke="#fefefa" width="0.2" />
+  <style-line name="construction" stroke="#e0e0e0" width="1.2" />
 
-  <style-line name="highway-service"     from="residential" width="-0.6" />
+  <style-line name="highway-service" from="residential" width="-0.6" />
 
   <!-- track|footway|path|cycleway -->
-  <style-line name="footway"             stroke="#aaffffff" width="1.8" cap="butt" fixed="true"
-      									 stipple="4" stipple-width="0.6" stipple-stroke="#d35c48"/>
-  <style-line name="highway:cycleway"    from="footway" width="0.1" stipple-stroke="#4040ee"/>
-  <style-line name="highway:track"       from="footway" width="0.1" stipple="4" stipple-stroke="#a39b68"/>
-  <style-line name="highway:path"        from="footway" width="0.1" stipple="4" stipple-stroke="#837b58"/>
+  <style-line name="footway" stroke="#aaffffff" width="1.8" cap="butt" fixed="true"
+    stipple="4" stipple-width="0.6" stipple-stroke="#d35c48" />
+  <style-line name="highway:cycleway" from="footway" width="0.1"
+    stipple-stroke="#4040ee" />
+  <style-line name="highway:track" from="footway" width="0.1" stipple="4"
+    stipple-stroke="#a39b68" />
+  <style-line name="highway:path" from="footway" width="0.1" stipple="4"
+    stipple-stroke="#837b58" />
 
-  <!-- <style-line name="footway:z16"         from="footway" width="-0.95" fixed="false" fade="-1"/>-->
-  <style-line name="footway:z17"         stroke="#faf8f5" width="0.3"/>
+  <!-- <style-line name="footway:z16" from="footway" width="-0.95" fixed="false" fade="-1"/> -->
+  <style-line name="footway:z17" stroke="#faf8f5" width="0.3" />
 
   <!-- de: ein Weg der für Reiter vorgeshen ist.. -->
-  <style-line name="bridleway"           from="footway" stroke="#d3cb98" width="0.1" cap="butt"
-      									 stipple-stroke="#837b58"/>
+  <style-line name="bridleway" from="footway" stroke="#d3cb98" width="0.1" cap="butt"
+    stipple-stroke="#837b58" />
 
-  <style-line name="steps"               stroke="#aaffffff" width="4.2" cap="butt" fixed="true"
-      								     stipple="2" stipple-width="1.0" stipple-stroke="#be6253"/>
+  <style-line name="steps" stroke="#aaffffff" width="4.2" cap="butt" fixed="true"
+    stipple="2" stipple-width="1.0" stipple-stroke="#be6253" />
 
-  <style-line name="water:outline"       stroke="#a4bbcc" width="1.0" fixed="true" cap="butt" />
-	<style-line name="water"               stroke="#afc5e3" width="1.0" cap="butt" />
+  <style-line name="water:outline" stroke="#a4bbcc" width="1.0" fixed="true"
+    cap="butt" />
 
-  <!--<style-area name="water"               fill="#97b7e5" />-->
-	  <style-area name="water"               fill="#afc5e3" />
+  <style-line name="water" stroke="#a4bbcc" width="1.0" cap="butt" />
+
+  <!--<style-area name="water" fill="#97b7e5" /> -->
+  <style-area name="water" fill="#afc5e3" />
 
   <!-- no-go area boundary -->
-  <style-line name="fence"               stroke="#444444" width="1.2" fixed="true" cap="butt"/>
+  <style-line name="fence" stroke="#444444" width="1.2" fixed="true" cap="butt" />
 
-  <style-line name="aeroway:runway"      stroke="#c8ccbe" width="1.8" cap="butt" />
+  <style-line name="aeroway:runway" stroke="#c8ccbe" width="1.8" cap="butt" />
 
-  <!-- <style-line name="building"            stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" fade="15"/>  -->
-  <!-- <style-line name="building"            stroke="#d0cec8" width="1.0" fixed="true" cap="butt" fade="15"/>
-  <style-area name="building"            fill="#e9e6e3" fade="15"/>-->
-   <style-line name="building"            stroke="#b7b6b3" width="1.0" fixed="true" cap="butt" fade="15"/>
-  <!-- <style-area name="building"            fill="#eae8e6" fade="15"/>-->
-     <style-area name="building"            fill="#f2f0eb" fade="15"/>
-   <!-- ways -->
-  <rule e="way" k="*" v="*" >
+  <!-- <style-line name="building" stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" fade="15"/> -->
+  <!-- <style-line name="building" stroke="#d0cec8" width="1.0" fixed="true" cap="butt" fade="15"/>
+    <style-area name="building" fill="#e9e6e3" fade="15"/> -->
+  <style-line name="building" stroke="#b7b6b3" width="1.0" fixed="true" cap="butt"
+    fade="15" />
+  <!-- <style-area name="building" fill="#eae8e6" fade="15"/> -->
+  <style-area name="building" fill="#f2f0eb" fade="15" />
+  <!-- ways -->
+  <rule e="way" k="*" v="*">
 
 
 
     <!-- landuse base -->
     <rule e="way" k="landuse" v="*">
-     <rule e="way" k="*" v="urban">
-        <area fill="#f4f3f0"/>
+      <rule e="way" k="*" v="urban">
+        <area fill="#f4f3f0" />
       </rule>
       <rule e="way" k="*" v="residential">
         <use-area name="residential" />
       </rule>
-     </rule>
-
-    <rule e="way" k="natural"  v="grassland|scrub" zoom-min="10">
-      <use-area name="greens"/>
     </rule>
 
-     <rule e="way" k="landuse" v="*">
-      <rule e="way" k="*"  zoom-min="10" v="farmland|farm|orchard|vineyard|greenhouse_horticulture|plant_nursery">
-        <use-area name="farmland"/>
+    <rule e="way" k="natural" v="grassland|scrub" zoom-min="10">
+      <use-area name="greens" />
+    </rule>
+
+    <rule e="way" k="landuse" v="*">
+      <rule e="way" k="*" zoom-min="10"
+        v="farmland|farm|orchard|vineyard|greenhouse_horticulture|plant_nursery">
+        <use-area name="farmland" />
       </rule>
 
-      <rule e="way" k="*"  v="quarry">
-        <use-area name="quarry"/>
+      <rule e="way" k="*" v="quarry">
+        <use-area name="quarry" />
       </rule>
 
 
 
       <!-- <rule e="way" k="*" v="farmyard|retail|commercial|industrial;retail">
         <use-area name="residential" />
-      </rule>-->
+        </rule> -->
 
       <rule e="way" k="*" v="industrial|railway">
-         <use-area name ="railway|industrial"/>
+        <use-area name="railway|industrial" />
       </rule>
 
-     <!--   <rule e="way" k="*" v="military">
-				 <use-area name="military"/>
-      </rule> -->
+      <!-- <rule e="way" k="*" v="military">
+        <use-area name="military"/>
+        </rule> -->
 
       <!--<rule e="way" k="landuse" v="construction|greenfield"> <area fill="#a47c41"
-         stroke="#e4e4e4" width="0.2" /> </rule> -->
+        stroke="#e4e4e4" width="0.2" /> </rule> -->
       <!-- <rule e="way" k="landuse" v="garages"> <area fill="#d6d6e4" /> </rule> -->
     </rule>
 
 
 
-	  <rule e="way" k="landuse|natural|leisure||amenity|tourism" v="*">
-			<!-- kind of more like landuse imho -->
-		  <rule e="way" k="leisure|landuse" v="nature_reserve">
-		    <use-area name="greens2" />
-		    <rule e="way" k="*" v="*" zoom-min="14">
-		       <line stroke="#abe29c" width="1.0" fixed="true" cap="butt" />
-	      </rule>
-	    </rule>
+    <rule e="way" k="landuse|natural|leisure||amenity|tourism" v="*">
+      <!-- kind of more like landuse imho -->
+      <rule e="way" k="leisure|landuse" v="nature_reserve">
+        <use-area name="greens2" />
+        <rule e="way" k="*" v="*" zoom-min="14">
+          <line stroke="#abe29c" width="1.0" fixed="true" cap="butt" />
+        </rule>
+      </rule>
 
 
-	    <!-- tourism areas
-	    	Berlin Zoologischer Garten has lots of details that should be drawn above
-	    -->
+      <!-- tourism areas
+        Berlin Zoologischer Garten has lots of details that should be drawn above
+      -->
       <rule e="way" k="tourism" v="*">
         <!-- <rule e="way" k="tourism" v="attraction"> <area fill="#f2caea" /> </rule> -->
 
@@ -161,179 +170,179 @@
         </rule>
       </rule>
 
-       <!-- amenity -->
-	    <rule e="way" k="amenity" v="*">
-	      <rule e="way" k="*" v="kindergarten|school|college|university" zoom-min="15">
-	       <!--  <area fill="#cdabde" />-->
-	       <area fill="#cdbbca" fade="15"/>
-	       <line  stroke="#9aabae" width="1.0" fixed="true" cap="butt" fade="15"/>
-	      </rule>
+      <!-- amenity -->
+      <rule e="way" k="amenity" v="*">
+        <rule e="way" k="*" v="kindergarten|school|college|university" zoom-min="15">
+          <!-- <area fill="#cdabde" /> -->
+          <area fill="#cdbbca" fade="15" />
+          <line stroke="#9aabae" width="1.0" fixed="true" cap="butt" fade="15" />
+        </rule>
 
-	      <rule e="way" k="*" v="hospital" zoom-min="14">
-	        <area fill="#e6e4c5" />
-	      </rule>
+        <rule e="way" k="*" v="hospital" zoom-min="14">
+          <area fill="#e6e4c5" />
+        </rule>
 
-	      <!--  <rule e="way" k="*" v="parking" zoom-min="15">
-	        <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
-	      </rule>
+        <!-- <rule e="way" k="*" v="parking" zoom-min="15">
+          <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
+          </rule>
 
-	      <rule e="way" k="*" v="fountain" closed="yes">
-	        <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
-	      </rule>-->
-	    </rule>
+          <rule e="way" k="*" v="fountain" closed="yes">
+          <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+          </rule> -->
+      </rule>
 
-	    <!-- landuse -->
-	    <rule e="way" k="landuse" v="*"  zoom-min="11">
-	      <!-- how about 'leisure' for this one? -->
-	      <rule e="way" k="*" v="cemetery">
-	        <use-area name="park"/>
-	      </rule>
+      <!-- landuse -->
+      <rule e="way" k="landuse" v="*" zoom-min="11">
+        <!-- how about 'leisure' for this one? -->
+        <rule e="way" k="*" v="cemetery">
+          <use-area name="park" />
+        </rule>
 
-	    </rule>
+      </rule>
 
-	    <rule e="way" k="landuse" v="village_green|recreation_ground" >
-	      <use-area name="greens" />
-	    </rule>
+      <rule e="way" k="landuse" v="village_green|recreation_ground">
+        <use-area name="greens" />
+      </rule>
 
-	     <rule e="way" k="landuse" v="allotments" zoom-min="12">
-	     <use-area name="allotments"/>
-	    </rule>
+      <rule e="way" k="landuse" v="allotments" zoom-min="12">
+        <use-area name="allotments" />
+      </rule>
 
-	    <rule e="way" k="leisure" v="park|common|green|golf_course|dog_park" zoom-min="11">
-	      <use-area name="park"/>
-	    </rule>
+      <rule e="way" k="leisure" v="park|common|green|golf_course|dog_park" zoom-min="11">
+        <use-area name="park" />
+      </rule>
 
-	       <!-- Heideland, keep below forest -->
-	    <rule e="way" k="*" zoom-min="11" v="heath|sand">
-	      <area fill="#fffad1" fade="11" />
-	    </rule>
+      <!-- Heideland, keep below forest -->
+      <rule e="way" k="*" zoom-min="11" v="heath|sand">
+        <area fill="#fffad1" fade="11" />
+      </rule>
 
-	    <rule e="way" k="landuse" v="forest">
-	         <use-area name="forest|wood"/>
-	    </rule>
+      <rule e="way" k="landuse" v="forest">
+        <use-area name="forest|wood" />
+      </rule>
 
-	    <rule e="way" k="natural" v="wood">
-	          <use-area name="forest|wood"/>
-	        <!--  <line stroke="#abcfab" width="1.5" fixed="true" cap="butt"/> -->
-	    </rule>
+      <rule e="way" k="natural" v="wood">
+        <use-area name="forest|wood" />
+        <!-- <line stroke="#abcfab" width="1.5" fixed="true" cap="butt"/> -->
+      </rule>
 
 
-			<!-- keep grass above forest:wood and leisure:park! -->
-			<rule e="way" k="landuse"  v="grass|meadow">
-			   <use-area name="greens"/>
-	    </rule>
+      <!-- keep grass above forest:wood and leisure:park! -->
+      <rule e="way" k="landuse" v="grass|meadow">
+        <use-area name="greens" />
+      </rule>
 
-	    <rule e="way" k="leisure"  v="garden">
-		    <use-area name="greens"/>
-	    </rule>
+      <rule e="way" k="leisure" v="garden">
+        <use-area name="greens" />
+      </rule>
 
 
-	    <rule e="way" k="leisure" v="track">
-	       <line stroke="#c1bcb6" width="1.3" cap="butt"  fixed="true" />
-	    </rule>
+      <rule e="way" k="leisure" v="track">
+        <line stroke="#c1bcb6" width="1.3" cap="butt" fixed="true" />
+      </rule>
 
-	    <!-- amenity -->
-	    <rule e="way" k="amenity" v="*">
-	     <!--<rule e="way" k="*" v="kindergarten|school|college|university" zoom-min="15">
-	       <area fill="#cdbbca" fade="15"/>
-	       <line  stroke="#9aabae" width="1.0" fixed="true" cap="butt" fade="15"/>
-	      </rule>
+      <!-- amenity -->
+      <rule e="way" k="amenity" v="*">
+        <!--<rule e="way" k="*" v="kindergarten|school|college|university" zoom-min="15">
+          <area fill="#cdbbca" fade="15"/>
+          <line stroke="#9aabae" width="1.0" fixed="true" cap="butt" fade="15"/>
+          </rule>
 
-	      <rule e="way" k="*" v="hospital" zoom-min="14">
-	        <area fill="#e6e4c5" />
-	      </rule>
-			-->
-	      <rule e="way" k="*" v="parking" zoom-min="15">
-	        <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
-	      </rule>
+          <rule e="way" k="*" v="hospital" zoom-min="14">
+          <area fill="#e6e4c5" />
+          </rule>
+        -->
+        <rule e="way" k="*" v="parking" zoom-min="15">
+          <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
+        </rule>
 
-	      <rule e="way" k="*" v="fountain" closed="yes">
-	        <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
-	      </rule>
-	    </rule>
+        <rule e="way" k="*" v="fountain" closed="yes">
+          <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+        </rule>
+      </rule>
 
-	    <!-- <rule e="way" k="natural" v="coastline">
-	      <line stroke="#a4bbcc" width="1.2" fixed="true" />
-	    </rule> -->
+      <!-- <rule e="way" k="natural" v="coastline">
+        <line stroke="#a4bbcc" width="1.2" fixed="true" />
+        </rule> -->
 
-	    <!-- natural -->
-	    <rule e="way" k="natural" v="*" zoom-min="10">
+      <!-- natural -->
+      <rule e="way" k="natural" v="*" zoom-min="10">
 
-	      <rule e="way" k="*" v="glacier">
-	        <area fill="#fafaff" />
-	      </rule>
-	      <rule e="way" k="*" v="land">
-	        <area fill="#f8f8f8" />
-	      </rule>
-	      <rule e="way" k="*" v="beach">
-	        <area fill="#f7f5c8" />
-	      </rule>
+        <rule e="way" k="*" v="glacier">
+          <area fill="#fafaff" />
+        </rule>
+        <rule e="way" k="*" v="land">
+          <area fill="#f8f8f8" />
+        </rule>
+        <rule e="way" k="*" v="beach">
+          <area fill="#f7f5c8" />
+        </rule>
 
-	      <rule e="way" k="*" v="marsh|wetland|mud">
-	         <use-area name="greens2" />
-	      </rule>
-	    </rule>
+        <rule e="way" k="*" v="marsh|wetland|mud">
+          <use-area name="greens2" />
+        </rule>
+      </rule>
 
 
-	    <!-- leisure -->
-	    <rule e="way" k="leisure" v="*" zoom-min="13">
+      <!-- leisure -->
+      <rule e="way" k="leisure" v="*" zoom-min="13">
 
-	      <rule e="way" k="*" v="stadium" >
-	        <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" />
-	        <area fill="#e9e6e3"  />
-	      </rule>
+        <rule e="way" k="*" v="stadium">
+          <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" />
+          <area fill="#e9e6e3" />
+        </rule>
 
-	      <!--should be under playing field -->
-	      <rule e="way" k="*" zoom-min="14" v="sports_centre|water_park">
-	        <area fill="#daefdb" fade="12" />
-	      </rule>
+        <!--should be under playing field -->
+        <rule e="way" k="*" zoom-min="14" v="sports_centre|water_park">
+          <area fill="#daefdb" fade="12" />
+        </rule>
 
-	      <rule e="way" k="*" zoom-min="15" v="playground|miniature_golf">
-	        <area fill="#f4f4de" />
-	        <line stroke="#d9d9a3" width="1.0" fixed="true" cap="butt" />
-	      </rule>
+        <rule e="way" k="*" zoom-min="15" v="playground|miniature_golf">
+          <area fill="#f4f4de" />
+          <line stroke="#d9d9a3" width="1.0" fixed="true" cap="butt" />
+        </rule>
 
-	      <rule e="way" k="*" v="playing_fields|pitch">
-	        <area fill="#f4f4de" />
-	        <line stroke="#d9d9a3" width="1.0" fixed="true" cap="butt" />
-	      </rule>
+        <rule e="way" k="*" v="playing_fields|pitch">
+          <area fill="#f4f4de" />
+          <line stroke="#d9d9a3" width="1.0" fixed="true" cap="butt" />
+        </rule>
 
-	      <rule e="way" k="*" v="swimming_pool">
-	        <area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" />
-	      </rule>
+        <rule e="way" k="*" v="swimming_pool">
+          <area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" />
+        </rule>
 
-	      <!-- <rule e="way" k="*" v="track"> <rule e="way" k="area" v="yes|true">
-	           <area fill="#c9d8a2" stroke="#b7c690" width="0.025" /> </rule> <rule
-	           e="way" k="area" v="~|no|false"> <line stroke="#b7c690" width="0.75"
-	           /> </rule> </rule> -->
-	    </rule>
+        <!-- <rule e="way" k="*" v="track"> <rule e="way" k="area" v="yes|true">
+          <area fill="#c9d8a2" stroke="#b7c690" width="0.025" /> </rule> <rule
+          e="way" k="area" v="~|no|false"> <line stroke="#b7c690" width="0.75"
+          /> </rule> </rule> -->
+      </rule>
 
 
-	     <!-- area outlines need to be above to avoid uggly pixelation where
-	       not aliased polygon overlaps the lines...   -->
+      <!-- area outlines need to be above to avoid uggly pixelation where
+        not aliased polygon overlaps the lines... -->
 
-	    <rule e="way" k="leisure|landuse" v="*" zoom-min="14">
+      <rule e="way" k="leisure|landuse" v="*" zoom-min="14">
 
-		    <rule e="way" k="*" v="nature_reserve">
-		       <line stroke="#abe29c" width="1.0" fixed="true" cap="butt" />
-	      </rule>
+        <rule e="way" k="*" v="nature_reserve">
+          <line stroke="#abe29c" width="1.0" fixed="true" cap="butt" />
+        </rule>
 
-		    <rule e="way" k="*" v="military">
-					 <use-line name="fence" />
-	      </rule>
-	    </rule>
+        <rule e="way" k="*" v="military">
+          <use-line name="fence" />
+        </rule>
+      </rule>
 
 
 
 
-	   <rule e="way" k="natural" v="water">
-	      <use-area name="water"/>
-	    	<use-line name="water:outline"/>
-	     </rule>
+      <rule e="way" k="natural" v="water">
+        <use-area name="water" />
+        <use-line name="water:outline" />
+      </rule>
 
-	   <rule e="way" k="landuse" v="reservoir|basin">
-	        <use-area name="water" />
-	   </rule>
+      <rule e="way" k="landuse" v="reservoir|basin">
+        <use-area name="water" />
+      </rule>
     </rule> <!-- end landuse|natural|leisure||amenity|tourism -->
 
 
@@ -341,29 +350,55 @@
     <rule e="way" k="waterway" v="*">
 
       <rule e="way" k="waterway" v="ditch|drain" zoom-min="14">
-        <use-line name="water" width="0.1" fixed="true"/>
+        <use-line name="water" width="0.1" fixed="true" />
       </rule>
 
       <rule e="way" k="waterway" v="canal">
-        <use-line name="water" width="-0.2"/>
+        <use-line name="water" width="-0.2" />
       </rule>
 
       <rule e="way" k="waterway" v="stream" zoom-min="14">
-         <use-line name="water" width="0.2" fixed="true"/>
+        <use-line name="water" width="0.2" fixed="true" />
       </rule>
 
       <rule e="way" k="waterway" v="river">
         <rule e="way" k="*" v="*" zoom-min="12">
-          <use-line name="water" width="0.3"/>
-     	  </rule>
+          <use-line name="water" width="0.3" />
+        </rule>
         <rule e="way" k="*" v="*" zoom-max="11">
-           <use-line name="water" width="0.3" fixed="true" fade="7"/>
+          <rule e="way" k="width" v="1|2">
+            <use-line name="water" width="0.3" fixed="true" fade="2"/>
+          </rule>
+          <rule e="way" k="width" v="3" zoom-min="3">
+            <use-line name="water" width="0.3" fixed="true" fade="3" />
+          </rule>
+          <rule e="way" k="width" v="4" zoom-min="4">
+            <use-line name="water" width="0.3" fixed="true" fade="4" />
+          </rule>
+          <rule e="way" k="width" v="5" zoom-min="5">
+            <use-line name="water" width="0.3" fixed="true" fade="5" />
+          </rule>
+          <rule e="way" k="width" v="6" zoom-min="6">
+            <use-line name="water" width="0.2" fixed="true" fade="6" />
+          </rule>
+          <rule e="way" k="width" v="7" zoom-min="7">
+            <use-line name="water" width="0.2" fixed="true" fade="7" />
+          </rule>
+          <rule e="way" k="width" v="8" zoom-min="8">
+            <use-line name="water" width="0.1" fixed="true" fade="8" />
+          </rule>
+          <rule e="way" k="width" v="9" zoom-min="9">
+            <use-line name="water" width="0.1" fixed="true" fade="9" />
+          </rule>
+          <rule e="way" k="width" v="-1" zoom-min="9">
+            <use-line name="water" width="0.2" fixed="true" fade="9" />
+          </rule>
         </rule>
       </rule>
 
       <rule e="way" k="waterway" v="riverbank|dock">
-        <use-area name="water"/>
-        <use-line name="water:outline"/>
+        <use-area name="water" />
+        <use-line name="water:outline" />
       </rule>
 
       <rule e="way" k="waterway" v="weir">
@@ -382,125 +417,125 @@
 
     <!-- sport -->
     <!-- <rule e="way" k="sport" v="*"> <rule e="way" k="sport" v="soccer"
-         zoom-min="17"> <rule e="way" k="sport" v="swimming|canoe|diving|scuba_diving">
-         <area fill="#b4cbdc" stroke="#6060ff" width="0.2" /> </rule> <rule
-         e="way" k="sport" v="tennis"> <area fill="#d18a6a" stroke="#b36c4c" width="0.2"
-         /> </rule> </rule> -->
+      zoom-min="17"> <rule e="way" k="sport" v="swimming|canoe|diving|scuba_diving">
+      <area fill="#b4cbdc" stroke="#6060ff" width="0.2" /> </rule> <rule
+      e="way" k="sport" v="tennis"> <area fill="#d18a6a" stroke="#b36c4c" width="0.2"
+      /> </rule> </rule> -->
 
 
 
 
 
-     <!-- outline 0 -->
-	  <style-outline name="glow" stroke="#000000" width="0.2" blur="1.0"/>
-	  <style-outline name="0" stroke="#44000000" width="0.1" />
+    <!-- outline 0 -->
+    <style-outline name="glow" stroke="#000000" width="0.2" blur="1.0" />
+    <style-outline name="0" stroke="#44000000" width="0.1" />
     <!-- tunnel -->
     <rule e="way" k="tunnel" v="yes|true" zoom-min="11">
       <!-- highway tunnels -->
       <rule e="way" k="highway" v="*">
-         <rule e="way" k="*" v="*" zoom-min="16">
-           <rule e="way" k="*" v="steps">
-             <use-line name="steps"/>
-            <!-- <use-outline name="0"/>-->
-           </rule>
-           <!-- <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="16">
-             <use-line name="footway:z16"/>
-           </rule>-->
-         </rule>
+        <rule e="way" k="*" v="*" zoom-min="16">
+          <rule e="way" k="*" v="steps">
+            <use-line name="steps" />
+            <!-- <use-outline name="0"/> -->
+          </rule>
+          <!-- <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="16">
+            <use-line name="footway:z16"/>
+            </rule> -->
+        </rule>
 
-         <rule e="way" k="*" v="*" zoom-min="14">
-           <rule e="way" k="*" v="footway" >
-            <use-line name="footway"/>
-           </rule>
-
-          <rule e="way" k="*" v="cycleway">
-            <use-line name="highway:cycleway"/>
+        <rule e="way" k="*" v="*" zoom-min="14">
+          <rule e="way" k="*" v="footway">
+            <use-line name="footway" />
           </rule>
 
- 		  <rule e="way" k="*" v="track" >
-            <use-line name="highway:track"/>
-           </rule>
+          <rule e="way" k="*" v="cycleway">
+            <use-line name="highway:cycleway" />
+          </rule>
 
- 		  <rule e="way" k="*" v="path">
-            <use-line name="highway:path"/>
-           </rule>
+          <rule e="way" k="*" v="track">
+            <use-line name="highway:track" />
+          </rule>
 
-           <rule e="way" k="*" v="bridleway">
-             <use-line name="bridleway"/>
-           </rule>
+          <rule e="way" k="*" v="path">
+            <use-line name="highway:path" />
+          </rule>
 
-           <rule e="way" k="*" v="construction">
-             <use-line name="construction"/>
-             <use-outline name="0"/>
-           </rule>
+          <rule e="way" k="*" v="bridleway">
+            <use-line name="bridleway" />
+          </rule>
 
-           <rule e="way" k="*" v="service">
-               <rule e="way" k="service" v="~|parking_aisle">
-           	 <use-line name="highway-service"/>
-             <use-outline name="0"/>
-             </rule>
-           </rule>
-         </rule>
+          <rule e="way" k="*" v="construction">
+            <use-line name="construction" />
+            <use-outline name="0" />
+          </rule>
 
-         <rule e="way" k="*" v="trunk_link|motorway_link">
-           <use-line name="trunk_link"/>
-           <use-outline name="0"/>
-            <use-text name="major-road"/>
-         </rule>
-
-         <rule e="way" k="*" v="*" zoom-min="13">
-            <rule e="way" k="*" v="byway|pedestrian">
-            	<use-line name="pedestrian"/>
-              <use-outline name="0"/>
-            	<use-text name="road"/>
+          <rule e="way" k="*" v="service">
+            <rule e="way" k="service" v="~|parking_aisle">
+              <use-line name="highway-service" />
+              <use-outline name="0" />
             </rule>
+          </rule>
+        </rule>
+
+        <rule e="way" k="*" v="trunk_link|motorway_link">
+          <use-line name="trunk_link" />
+          <use-outline name="0" />
+          <use-text name="major-road" />
+        </rule>
+
+        <rule e="way" k="*" v="*" zoom-min="13">
+          <rule e="way" k="*" v="byway|pedestrian">
+            <use-line name="pedestrian" />
+            <use-outline name="0" />
+            <use-text name="road" />
+          </rule>
 
 
-           <rule e="way" k="*" v="residential|road|unclassified|living_street">
-            	<use-line name="residential"/>
-            	<use-outline name="0"/>
-            	<use-text name="road"/>
-            </rule>
-         </rule>
+          <rule e="way" k="*" v="residential|road|unclassified|living_street">
+            <use-line name="residential" />
+            <use-outline name="0" />
+            <use-text name="road" />
+          </rule>
+        </rule>
 
-         <rule e="way" k="*" v="tertiary|secondary_link">
-           <use-line name="tertiary"/>
-           <use-outline name="0"/>
-  			    <use-text name="road"/>
-         </rule>
+        <rule e="way" k="*" v="tertiary|secondary_link">
+          <use-line name="tertiary" />
+          <use-outline name="0" />
+          <use-text name="road" />
+        </rule>
 
-         <rule e="way" k="*" v="secondary|primary_link">
-           <use-line name="secondary:z11"/>
-           <use-outline name="0"/>
-           <use-text name="major-road"/>
-         </rule>
+        <rule e="way" k="*" v="secondary|primary_link">
+          <use-line name="secondary:z11" />
+          <use-outline name="0" />
+          <use-text name="major-road" />
+        </rule>
 
-         <rule e="way" k="*" v="primary">
-           <use-line name="primary:z11"/>
-        	 <use-outline name="0"/>
-        	 <use-text name="major-road"/>
-         </rule>
+        <rule e="way" k="*" v="primary">
+          <use-line name="primary:z11" />
+          <use-outline name="0" />
+          <use-text name="major-road" />
+        </rule>
 
-         <rule e="way" k="*" v="trunk">
-          	<use-line name="trunk" blur="0.3"/>
-             <use-outline name="0"/>
-           <!--  <use-outline name="glow"/> -->
-            <use-text name="major-road"/>
-         </rule>
+        <rule e="way" k="*" v="trunk">
+          <use-line name="trunk" blur="0.3" />
+          <use-outline name="0" />
+          <!-- <use-outline name="glow"/> -->
+          <use-text name="major-road" />
+        </rule>
 
-         <rule e="way" k="*" v="motorway">
-           <use-line name="highway:z11" blur="0.3"/>
-           <use-outline name="0"/>
-         <!--   <use-outline name="glow"/> -->
-           <use-text name="major-road"/>
-         </rule>
-       </rule>
+        <rule e="way" k="*" v="motorway">
+          <use-line name="highway:z11" blur="0.3" />
+          <use-outline name="0" />
+          <!-- <use-outline name="glow"/> -->
+          <use-text name="major-road" />
+        </rule>
+      </rule>
 
-       <!-- railway tunnel -->
-       <rule e="way" k="railway" v="*">
-       <!-- <rule e="way" k="railway" v="tram|subway|light_rail|narrow_gauge">
-             <line stroke="#a0a0a0" width="0.8" cap="butt" fixed="true"/>
-             </rule> -->
+      <!-- railway tunnel -->
+      <rule e="way" k="railway" v="*">
+        <!-- <rule e="way" k="railway" v="tram|subway|light_rail|narrow_gauge">
+          <line stroke="#a0a0a0" width="0.8" cap="butt" fixed="true"/>
+          </rule> -->
         <rule e="way" k="railway" v="rail">
           <line stroke="#aa888888" width="0.9" cap="butt" fixed="true" />
         </rule>
@@ -537,318 +572,320 @@
 
     <!-- turning circles -->
     <!-- <rule e="node" k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
-         fill="#707070" />
-    </rule> -->
+      fill="#707070" />
+      </rule> -->
 
     <!-- building -->
     <rule e="way" k="building" v="*">
 
-      <rule e="way" k="*" v="*" zoom-min="15" zoom-max="16">
-        <use-area name="building" fade="15"/>
-        <use-line name="building" fade="15"/>
-      <!--   <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" fade="15"/>
-        <area fill="#e9e6e3" fade="15" /> -->
+      <rule e="way" k="*" v="*" zoom-min="14" zoom-max="16">
+        <use-area name="building" fade="14" />
+        <use-line name="building" fade="14" />
+        <!-- <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" fade="15"/>
+          <area fill="#e9e6e3" fade="15" /> -->
       </rule>
 
-       <rule e="way" k="*" v="*" zoom-min="17">
-          <caption k="name" font-style="bold" font-size="10" fill="#4040ff"
+      <rule e="way" k="*" v="*" 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" />
-          <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060"
-          stroke="#ffffff" stroke-width="2.0" />
-          </rule>
+      </rule>
     </rule>
 
     <!-- outline 1 - 4 -->
-     <style-outline name="1" stroke="#aa807040" width="0.1"/>
- <!--    <style-outline name="1" stroke="#404030"/>  -->
-    <style-outline name="2" stroke="#c0c0c0" width="0.1"/>
-    <style-outline name="primary"  stroke="#aa7f7700" width="0.1"/>
-    <style-outline name="motorway" stroke="#aa805f2e" width="0.1"/>
+    <style-outline name="1" stroke="#aa807040" width="0.1" />
+    <!-- <style-outline name="1" stroke="#404030"/> -->
+    <style-outline name="2" stroke="#c0c0c0" width="0.1" />
+    <style-outline name="primary" stroke="#aa7f7700" width="0.1" />
+    <style-outline name="motorway" stroke="#aa805f2e" width="0.1" />
 
 
     <!-- highway -->
     <rule e="way" k="highway" v="*">
       <rule e="way" k="*" v="*" zoom-min="3" zoom-max="5">
- 			  <rule e="way" k="area" v="~|no|false">
-        <!--   <rule e="way" k="*" v="secondary|primary_link" zoom-min="9">
+        <rule e="way" k="area" v="~|no|false">
+          <!-- <rule e="way" k="*" v="secondary|primary_link" zoom-min="9">
             <line stroke="#f2df6d" width="1.3" cap="butt" fixed="true" fade="9"/>
-          </rule> -->
+            </rule> -->
 
           <rule e="way" k="*" v="route_primary" zoom-min="3">
-            <line stroke="#f2df6d" width="1.4" cap="butt" fixed="true" fade="3"/>
+            <line stroke="#c6c5a2" width="1.4" cap="butt" fixed="true" fade="3" />
           </rule>
 
           <rule e="way" k="*" v="route_trunk" zoom-min="3">
-            <line stroke="#fed6a3" width="1.4" cap="butt" fixed="true" fade="3"/>
+            <line stroke="#c6c5a2" width="1.4" cap="butt" fixed="true" fade="3" />
           </rule>
 
           <rule e="way" k="*" v="route_motorway">
-            <line stroke="#eec693" width="1.5" cap="butt" fixed="true" fade="3"/>
+            <line stroke="#deb683" width="1.5" cap="butt" fixed="true" fade="3" />
           </rule>
         </rule>
       </rule>
       <rule e="way" k="*" v="*" zoom-min="5" zoom-max="10">
- 			  <rule e="way" k="area" v="~|no|false">
+        <rule e="way" k="area" v="~|no|false">
           <rule e="way" k="*" v="secondary|primary_link" zoom-min="9">
-            <line stroke="#e2cf5d" width="1.3" cap="butt" fixed="true" fade="9"/>
+            <line stroke="#e2cf5d" width="1.3" cap="butt" fixed="true" fade="9" />
           </rule>
 
           <rule e="way" k="*" v="trunk_link|motorway_link" zoom-min="8">
-            <line stroke="#eec693" width="1.4" cap="butt" fixed="true" fade="8"/>
+            <line stroke="#eec693" width="1.4" cap="butt" fixed="true" fade="8" />
           </rule>
 
           <rule e="way" k="*" v="primary" zoom-min="5">
-            <line stroke="#e2cf5d" width="1.5" cap="butt" fixed="true" fade="5"/>
+            <line stroke="#c6c5a2" width="1.5" cap="butt" fixed="true" fade="5" />
           </rule>
 
           <rule e="way" k="*" v="trunk" zoom-min="5">
-            <line stroke="#ebc493" width="1.5" cap="butt" fixed="true" fade="5"/>
+            <line stroke="#c6c5a2" width="1.5" cap="butt" fixed="true" fade="5" />
           </rule>
 
           <rule e="way" k="*" v="motorway">
-            <line stroke="#deb683" width="1.6" cap="butt" fixed="true" fade="3"/>
+            <line stroke="#deb683" width="1.6" cap="butt" fixed="true" fade="3" />
           </rule>
         </rule>
       </rule>
 
       <rule e="way" k="*" v="*" zoom-min="11">
-         <rule e="way" k="tunnel|bridge" v="~|no|false">
-               <!-- highway area -->
-				    <rule e="way" k="area" v="yes|true">
-				       <rule e="way" k="tunnel|bridge" v="~|no|false">
-					      <rule e="way" k="*" v="footway" zoom-min="15">
-					        <area fill="#fefefe" />
-					        <line stroke="#c0c0c0" width="1.0" fixed="true" cap="butt" />
-					      </rule>
+        <rule e="way" k="tunnel|bridge" v="~|no|false">
+          <!-- highway area -->
+          <rule e="way" k="area" v="yes|true">
+            <rule e="way" k="tunnel|bridge" v="~|no|false">
+              <rule e="way" k="*" v="footway" zoom-min="15">
+                <area fill="#fefefe" />
+                <line stroke="#c0c0c0" width="1.0" fixed="true" cap="butt" />
+              </rule>
 
-					      <rule e="way" k="*" zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
-					        <area fill="#ffffff" />
-					        <line stroke="#d0d0d0" width="1.0" fixed="true" cap="butt" />
-					      </rule>
+              <rule e="way" k="*" zoom-min="13"
+                v="pedestrian|service|unclassified|residential|road|living_street">
+                <area fill="#ffffff" />
+                <line stroke="#d0d0d0" width="1.0" fixed="true" cap="butt" />
+              </rule>
 
-					    <!--  <rule e="way" k="*" v="path" zoom-min="14">
-					        <area fill="#d0d0d0" />
-					      </rule>-->
-					    </rule>
-				    </rule>
+              <!-- <rule e="way" k="*" v="path" zoom-min="14">
+                <area fill="#d0d0d0" />
+                </rule> -->
+            </rule>
+          </rule>
 
-			    <rule e="way" k="area" v="~|no|false">
-	          <rule e="way" k="*" v="*" zoom-min="16">
-	            <rule e="way" k="*" v="steps">
-	            <use-line name="steps"/>
-	            <!-- <use-outline name="2"/>-->
-	            </rule>
-	            <!-- <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="16" zoom-max="16">
-	              <use-line name="footway:z16"/>
-	            </rule>-->
-	            <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="17">
-	              <use-line name="footway:z17"/>
-	              <use-outline name="1"/>
-	            </rule>
-	          </rule>
+          <rule e="way" k="area" v="~|no|false">
+            <rule e="way" k="*" v="*" zoom-min="16">
+              <rule e="way" k="*" v="steps">
+                <use-line name="steps" />
+                <!-- <use-outline name="2"/> -->
+              </rule>
+              <!-- <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="16" zoom-max="16">
+                <use-line name="footway:z16"/>
+                </rule> -->
+              <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="17">
+                <use-line name="footway:z17" />
+                <use-outline name="1" />
+              </rule>
+            </rule>
 
-	          <rule e="way" k="*" v="*" zoom-min="14">
-	            <rule e="way" k="*" v="footway">
-	              <use-line name="footway"/>
-	            </rule>
+            <rule e="way" k="*" v="*" zoom-min="14">
+              <rule e="way" k="*" v="footway">
+                <use-line name="footway" />
+              </rule>
 
-				<rule e="way" k="*" v="cycleway">
-            		<use-line name="highway:cycleway"/>
-          		</rule>
+              <rule e="way" k="*" v="cycleway">
+                <use-line name="highway:cycleway" />
+              </rule>
 
-	 	        <rule e="way" k="*" v="track">
-            	  <use-line name="highway:track"/>
-           		</rule>
+              <rule e="way" k="*" v="track">
+                <use-line name="highway:track" />
+              </rule>
 
-	 	        <rule e="way" k="*" v="path">
-                  <use-line name="highway:path"/>
+              <rule e="way" k="*" v="path">
+                <use-line name="highway:path" />
+              </rule>
+
+              <rule e="way" k="*" v="bridleway">
+                <use-line name="bridleway" />
+              </rule>
+
+              <rule e="way" k="*" v="construction">
+                <use-line name="construction" />
+                <use-outline name="1" />
+              </rule>
+
+              <rule e="way" k="*" v="service">
+                <rule e="way" k="service" v="-|parking_aisle">
+                  <use-line name="highway-service" />
+                  <use-outline name="1" />
                 </rule>
-
-	            <rule e="way" k="*" v="bridleway">
-	              <use-line name="bridleway"/>
-	            </rule>
-
-	            <rule e="way" k="*" v="construction">
-	              <use-line name="construction"/>
-	              <use-outline name="1"/>
-	            </rule>
-
-	            <rule e="way" k="*" v="service">
-	              <rule e="way" k="service" v="-|parking_aisle">
-	            	  <use-line name="highway-service"/>
-	                <use-outline name="1"/>
-	              </rule>
-         	      <rule e="way" k="service" v="parking_aisle" zoom-min="16">
-             	    <use-line name="highway-service" width="-0.4"/>
-                  <use-outline name="1"/>
+                <rule e="way" k="service" v="parking_aisle" zoom-min="16">
+                  <use-line name="highway-service" width="-0.4" />
+                  <use-outline name="1" />
                 </rule>
               </rule>
-	          </rule>
+            </rule>
 
-	          <rule e="way" k="*" v="trunk_link|motorway_link">
-	            <use-line name="trunk_link"/>
-	            <use-outline name="motorway"/>
-	         	  <use-text name="major-road"/>
-	          </rule>
+            <rule e="way" k="*" v="trunk_link|motorway_link">
+              <use-line name="trunk_link" />
+              <use-outline name="motorway" />
+              <use-text name="major-road" />
+            </rule>
 
-	          <rule e="way" k="*" v="*" zoom-min="13">
-	             <rule e="way" k="*" v="byway|pedestrian">
-              	<use-line name="residential" width="-0.4"/>
-                <use-outline name="1"/>
-              	<use-text name="road"/>
+            <rule e="way" k="*" v="*" zoom-min="13">
+              <rule e="way" k="*" v="byway|pedestrian">
+                <use-line name="residential" width="-0.4" />
+                <use-outline name="1" />
+                <use-text name="road" />
               </rule>
 
-	            <rule e="way" k="*" v="residential|road|unclassified|living_street">
-              	<use-line name="residential"/>
-              	<use-outline name="1"/>
-              	<use-text name="road"/>
+              <rule e="way" k="*" v="residential|road|unclassified|living_street">
+                <use-line name="residential" />
+                <use-outline name="1" />
+                <use-text name="road" />
               </rule>
-	          </rule>
+            </rule>
 
-	          <rule e="way" k="*" v="tertiary|secondary_link">
-	            <use-line name="tertiary"/>
-	            <use-outline name="1"/>
-	   			    <use-text name="road"/>
-	          </rule>
+            <rule e="way" k="*" v="tertiary|secondary_link">
+              <use-line name="tertiary" />
+              <use-outline name="1" />
+              <use-text name="road" />
+            </rule>
 
-	          <rule e="way" k="*" v="secondary|primary_link">
-	            <!-- <line stroke="#fff939" width="1.6" /> -->
-	            <use-line name="secondary:z11"/>
-	            <use-outline name="primary"/>
-	            <use-text name="major-road"/>
-	          </rule>
+            <rule e="way" k="*" v="secondary|primary_link">
+              <!-- <line stroke="#fff939" width="1.6" /> -->
+              <use-line name="secondary:z11" />
+              <use-outline name="primary" />
+              <use-text name="major-road" />
+            </rule>
 
-	          <rule e="way" k="*" v="primary">
-	            <use-line name="primary:z11"/>
-	         		<use-outline name="primary"/>
-	         	  <use-text name="major-road"/>
-	          </rule>
+            <rule e="way" k="*" v="primary">
+              <use-line name="primary:z11" />
+              <use-outline name="primary" />
+              <use-text name="major-road" />
+            </rule>
 
-	          <rule e="way" k="*" v="trunk">
-	             <use-line name="trunk"/>
-	             <use-outline name="motorway"/>
-	             <use-text name="major-road"/>
-	          </rule>
+            <rule e="way" k="*" v="trunk">
+              <use-line name="trunk" />
+              <use-outline name="motorway" />
+              <use-text name="major-road" />
+            </rule>
 
-	          <rule e="way" k="*" v="motorway">
-	            <use-line name="highway:z11"/>
-	            <use-outline name="motorway"/>
-	            <use-text name="major-road"/>
-	          </rule>
-	        </rule> <!-- end area=~|no|false -->
+            <rule e="way" k="*" v="motorway">
+              <use-line name="highway:z11" />
+              <use-outline name="motorway" />
+              <use-text name="major-road" />
+            </rule>
+          </rule> <!-- end area=~|no|false -->
         </rule> <!-- end tunnel|bridge=~|no|false -->
 
 
-	      <rule e="way" k="bridge" v="yes|true|viaduct|suspension">
+        <rule e="way" k="bridge" v="yes|true|viaduct|suspension">
           <rule e="way" k="area" v="~|no|false">
 
-	          <style-outline name="bridge" stroke="#aa202020" width="0.08"/>
+            <style-outline name="bridge" stroke="#aa202020" width="0.08" />
 
             <rule e="way" k="*" v="*" zoom-min="16">
-	            <rule e="way" k="*" v="steps">
-	              <use-line name="steps"/>
-	             <!--  <use-outline name="bridge"/>-->
-	            </rule>
-	          </rule>
-			  <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="15">
-	              <use-line name="footway:z17" cap="butt"/>
-	              <use-outline name="bridge"/>
-	            </rule>
-
-	          <rule e="way" k="*" v="*" zoom-min="14">
-	            <rule e="way" k="*" v="footway" >
-	               <use-line name="footway"/>
-	            </rule>
-	            <rule e="way" k="*" v="cycleway" >
-            	  <use-line name="highway:cycleway"/>
-          		</rule>
-	      	    <rule e="way" k="*" v="track" >
-            	  <use-line name="highway:track"/>
-           		</rule>
-           		<rule e="way" k="*" v="path" >
-	              <use-line name="highway:path"/>
-	            </rule>
-	            <rule e="way" k="*" v="bridleway">
-	              <use-line name="bridleway"/>
-	            </rule>
-
-	            <rule e="way" k="*" v="construction">
-	              <use-line name="construction" cap="square"/>
-	              <use-outline name="bridge"/>
-	            </rule>
-
-	            <rule e="way" k="*" v="service">
-            	  <use-line name="highway-service" cap="square"/>
-                <use-outline name="bridge"/>
+              <rule e="way" k="*" v="steps">
+                <use-line name="steps" />
+                <!-- <use-outline name="bridge"/> -->
               </rule>
-	          </rule>
+            </rule>
+            <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="15">
+              <use-line name="footway:z17" cap="butt" />
+              <use-outline name="bridge" />
+            </rule>
 
-	          <rule e="way" k="*" v="*" zoom-min="13">
-	            <rule e="way" k="*" v="byway|pedestrian">
-	             	<use-line name="pedestrian:bridge"/>
-	              <use-outline name="bridge"/>
-	            	<use-text name="road"/>
-	            </rule>
-	            <rule e="way" k="*" v="residential|road|unclassified|living_street">
-             		<use-line name="residential:bridge"/>
-             	 	<use-outline name="bridge"/>
-             		<use-text name="road"/>
-	            </rule>
-	          </rule>
+            <rule e="way" k="*" v="*" zoom-min="14">
+              <rule e="way" k="*" v="footway">
+                <use-line name="footway" />
+              </rule>
+              <rule e="way" k="*" v="cycleway">
+                <use-line name="highway:cycleway" />
+              </rule>
+              <rule e="way" k="*" v="track">
+                <use-line name="highway:track" />
+              </rule>
+              <rule e="way" k="*" v="path">
+                <use-line name="highway:path" />
+              </rule>
+              <rule e="way" k="*" v="bridleway">
+                <use-line name="bridleway" />
+              </rule>
 
-	          <rule e="way" k="*" v="tertiary|secondary_link">
-	            <use-line name="tertiary" cap="square"/>
-	            <use-outline name="bridge"/>
-	   			    <use-text name="road"/>
-	          </rule>
+              <rule e="way" k="*" v="construction">
+                <use-line name="construction" cap="square" />
+                <use-outline name="bridge" />
+              </rule>
 
-	          <rule e="way" k="*" v="trunk_link|motorway_link">
-	            <use-line name="trunk_link" cap="square"/>
-	            <use-outline name="bridge"/>
-	         	  <use-text name="major-road"/>
-	          </rule>
+              <rule e="way" k="*" v="service">
+                <use-line name="highway-service" cap="square" />
+                <use-outline name="bridge" />
+              </rule>
+            </rule>
 
-	          <rule e="way" k="*" v="secondary|primary_link">
-	           <!--  <line stroke="#fff939" width="1.6" cap="butt" /> -->
-	            <use-line name="secondary:z11" cap="square"/>
-	            <use-outline name="bridge"/>
-	            <use-text name="major-road"/>
-	          </rule>
+            <rule e="way" k="*" v="*" zoom-min="13">
+              <rule e="way" k="*" v="byway|pedestrian">
+                <use-line name="pedestrian:bridge" />
+                <use-outline name="bridge" />
+                <use-text name="road" />
+              </rule>
+              <rule e="way" k="*" v="residential|road|unclassified|living_street">
+                <use-line name="residential:bridge" />
+                <use-outline name="bridge" />
+                <use-text name="road" />
+              </rule>
+            </rule>
 
-	          <rule e="way" k="*" v="primary">
-	            <use-line name="primary:z11" cap="square"/>
-	         		<use-outline name="bridge"/>
-	         	  <use-text name="major-road"/>
-	          </rule>
+            <rule e="way" k="*" v="tertiary|secondary_link">
+              <use-line name="tertiary" cap="square" />
+              <use-outline name="bridge" />
+              <use-text name="road" />
+            </rule>
 
-	          <rule e="way" k="*" v="trunk">
-	             <use-line name="trunk" cap="square"/>
-	             <use-outline name="bridge"/>
-	             <use-text name="major-road"/>
-	          </rule>
+            <rule e="way" k="*" v="trunk_link|motorway_link">
+              <use-line name="trunk_link" cap="square" />
+              <use-outline name="bridge" />
+              <use-text name="major-road" />
+            </rule>
 
-	          <rule e="way" k="*" v="motorway">
-	            <use-line name="highway:z11" cap="square"/>
-	            <use-outline name="bridge"/>
-	            <use-text name="major-road"/>
-	          </rule>
+            <rule e="way" k="*" v="secondary|primary_link">
+              <!-- <line stroke="#fff939" width="1.6" cap="butt" /> -->
+              <use-line name="secondary:z11" cap="square" />
+              <use-outline name="bridge" />
+              <use-text name="major-road" />
+            </rule>
+
+            <rule e="way" k="*" v="primary">
+              <use-line name="primary:z11" cap="square" />
+              <use-outline name="bridge" />
+              <use-text name="major-road" />
+            </rule>
+
+            <rule e="way" k="*" v="trunk">
+              <use-line name="trunk" cap="square" />
+              <use-outline name="bridge" />
+              <use-text name="major-road" />
+            </rule>
+
+            <rule e="way" k="*" v="motorway">
+              <use-line name="highway:z11" cap="square" />
+              <use-outline name="bridge" />
+              <use-text name="major-road" />
+            </rule>
           </rule> <!-- end area=~|no|false -->
 
           <rule e="way" k="area" v="yes|true">
-			      <rule e="way" k="*" v="footway" zoom-min="15">
-			        <area fill="#fefefe" />
-			        <line stroke="#c0c0c0" width="0.15" cap="butt" />
-			      </rule>
+            <rule e="way" k="*" v="footway" zoom-min="15">
+              <area fill="#fefefe" />
+              <line stroke="#c0c0c0" width="0.15" cap="butt" />
+            </rule>
 
-			      <rule e="way" k="*" zoom-min="13" v="pedestrian|service|unclassified|residential|road|living_street">
-			        <area fill="#ffffff" />
-			        <line stroke="#d0d0d0" width="1.0" fixed="true" cap="butt" />
-			      </rule>
+            <rule e="way" k="*" zoom-min="13"
+              v="pedestrian|service|unclassified|residential|road|living_street">
+              <area fill="#ffffff" />
+              <line stroke="#d0d0d0" width="1.0" fixed="true" cap="butt" />
+            </rule>
 
-			    	<!--  <rule e="way" k="*" v="path" zoom-min="14">
-			        <area fill="#d0d0d0" />
-			      </rule>-->
-		      </rule>  <!-- end area=yes|true -->
+            <!-- <rule e="way" k="*" v="path" zoom-min="14">
+              <area fill="#d0d0d0" />
+              </rule> -->
+          </rule>  <!-- end area=yes|true -->
         </rule>  <!-- end bridge=yes -->
       </rule> <!-- end zoom-min=11 -->
     </rule> <!-- end highway -->
@@ -857,10 +894,10 @@
     <!-- runways cores -->
     <rule e="way" k="aeroway" v="*">
       <rule e="way" k="*" v="runway">
-       	<use-line name="aeroway:runway"/>
+        <use-line name="aeroway:runway" />
       </rule>
       <rule e="way" k="*" v="taxiway">
-        <use-line name="aeroway:runway" width="-0.8"/>
+        <use-line name="aeroway:runway" width="-0.8" />
       </rule>
     </rule>
 
@@ -868,19 +905,19 @@
     <!-- man_made features -->
     <!-- <rule e="way" k="man_made" v="pier">
       <rule e="way" k="*" v="*" 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" />
       </rule>
       <rule e="way" k="*" v="*" closed="yes">
-        <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
+      <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
       </rule>
-    </rule> -->
+      </rule> -->
 
 
     <!-- barriers -->
     <rule e="way" k="barrier" v="*">
       <!-- <rule e="way" k="*" v="fence|wall|city_wall" zoom-min="15"> <line
-           stroke="#909090" width="0.1" cap="butt" /> </rule> -->
+        stroke="#909090" width="0.1" cap="butt" /> </rule> -->
       <rule e="way" k="*" v="retaining_wall" zoom-min="15">
         <line stroke="#888888" width="1.1" fixed="true" cap="butt" />
       </rule>
@@ -889,17 +926,17 @@
 
     <!-- non-physical routes -->
     <!-- <rule e="way" k="route" v="ferry"> <line stroke="#707070" width="0.3"
-         stroke-dasharray="15,10" cap="butt" /> </rule> -->
+      stroke-dasharray="15,10" cap="butt" /> </rule> -->
 
     <!-- aerial ways -->
     <!-- <rule e="way" k="aerialway" v="*"> <line stroke="#202020" width="0.4"
-         cap="butt" /> <rule e="way" k="aerialway" v="cable_car"> <lineSymbol
-         src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png"
-         /> </rule> <rule e="way" k="aerialway" v="chair_lift"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png"
-         /> </rule> <rule e="way" k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png"
-         /> </rule> <rule e="way" k="*" v="*" zoom-min="14"> <text k="name" font-style="bold"
-         font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </rule>
-         </rule> -->
+      cap="butt" /> <rule e="way" k="aerialway" v="cable_car"> <lineSymbol
+      src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/cable_car.png"
+      /> </rule> <rule e="way" k="aerialway" v="chair_lift"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png"
+      /> </rule> <rule e="way" k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png"
+      /> </rule> <rule e="way" k="*" v="*" zoom-min="14"> <text k="name" font-style="bold"
+      font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </rule>
+      </rule> -->
 
 
     <!-- railway (no tunnel) -->
@@ -914,16 +951,13 @@
         <rule e="way" k="*" v="*" zoom-min="14">
           <rule e="way" k="bridge" v="yes|true">
             <rule e="way" k="railway" v="tram">
-              <line stroke="#777777" width="0.9" cap="butt"
-                    fixed="true" />
+              <line stroke="#777777" width="0.9" cap="butt" fixed="true" />
             </rule>
             <rule e="way" k="railway" v="subway|light_rail|narrow_gauge">
-              <line stroke="#777777" width="0.9" cap="butt"
-                    fixed="true" />
+              <line stroke="#777777" width="0.9" cap="butt" fixed="true" />
             </rule>
             <rule e="way" k="railway" v="rail">
-              <line stroke="#777777" width="0.9" cap="butt"
-                    fixed="true" />
+              <line stroke="#777777" width="0.9" cap="butt" fixed="true" />
             </rule>
           </rule>
         </rule>
@@ -938,24 +972,24 @@
         </rule>
 
         <rule e="way" k="railway" v="rail|turntable" zoom-max="14">
-          <line stroke="#ddaa9988" width="1.0" cap="butt" fixed="true" fade="12"/>
+          <line stroke="#ddaa9988" width="1.0" cap="butt" fixed="true" fade="12" />
         </rule>
 
         <rule e="way" k="railway" v="rail|turntable" zoom-min="15">
           <line stroke="#aaa6a4" width="2.0" cap="butt" fixed="true" fade="12"
-                stipple="10" stipple-width="0.8" stipple-stroke="#ffffff"/>
+            stipple="10" stipple-width="0.8" stipple-stroke="#ffffff" />
         </rule>
 
         <!-- <rule e="way" k="railway" v="rail" zoom-max="14" zoom-min="13">
-             <line stroke="#8888aa" width="0.6" cap="butt"
-             fixed="true" />
-             </rule> -->
-        <!--  <rule e="way" k="railway" v="rail" zoom-max="13" zoom-min="11">
+          <line stroke="#8888aa" width="0.6" cap="butt"
+          fixed="true" />
+          </rule> -->
+        <!-- <rule e="way" k="railway" v="rail" zoom-max="13" zoom-min="11">
           <line stroke="#bbbbcc" width="0.8" cap="butt" fixed="true" />
-        </rule>     -->
-        <!-- whatever railway:spur means ...  -->
- 				<rule e="way" k="railway" v="disused|spur|abandoned|preserved" >
-          <line stroke="#cccccc" width="0.8" cap="butt" fixed="true" fade="12"/>
+          </rule> -->
+        <!-- whatever railway:spur means ... -->
+        <rule e="way" k="railway" v="disused|spur|abandoned|preserved">
+          <line stroke="#cccccc" width="0.8" cap="butt" fixed="true" fade="12" />
         </rule>
       </rule>
     </rule>
@@ -963,37 +997,39 @@
 
     <!-- non-physical boundaries -->
     <!-- <rule e="way" k="boundary" v="*"> <rule e="way" k="boundary" v="national_park">
-         <line stroke="#4ef94b" width="0.25" stroke-dasharray="15, 5, 5, 5"
-         /> -->
-	  <rule e="way" k="boundary" v="national_park">
-	      <area  fill="#d7e6b0"/>
-	  </rule>
+      <line stroke="#4ef94b" width="0.25" stroke-dasharray="15, 5, 5, 5"
+      /> -->
+    <rule e="way" k="boundary" v="national_park">
+      <area fill="#d7e6b0" />
+    </rule>
     <!--<rule e="way" k="boundary" v="administrative"> -->
     <rule e="way" k="admin_level" v="*">
       <!-- <rule e="way" k="admin_level" v="11"> <line stroke="#f9574b" width="0.1"
-           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
-           v="10"> <line stroke="#f9574b" width="0.1" fixed="true" cap="butt"
-           /> </rule> <rule e="way" k="admin_level" v="9"> <line stroke="#f9574b" width="0.1"
-           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
-           v="8"> <line stroke="#f9574b" width="0.3" fixed="true" cap="butt"
-           /> </rule> <rule e="way" k="admin_level" v="7"> <line stroke="#f9574b" width="0.1"
-           fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
-           v="6"> <line stroke="#f9574b" width="0.15" fixed="true" cap="butt"
-           /> </rule> <rule e="way" k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
-           fixed="true" cap="butt" /> </rule> -->
+        fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+        v="10"> <line stroke="#f9574b" width="0.1" fixed="true" cap="butt"
+        /> </rule> <rule e="way" k="admin_level" v="9"> <line stroke="#f9574b" width="0.1"
+        fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+        v="8"> <line stroke="#f9574b" width="0.3" fixed="true" cap="butt"
+        /> </rule> <rule e="way" k="admin_level" v="7"> <line stroke="#f9574b" width="0.1"
+        fixed="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+        v="6"> <line stroke="#f9574b" width="0.15" fixed="true" cap="butt"
+        /> </rule> <rule e="way" k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
+        fixed="true" cap="butt" /> </rule> -->
       <rule e="way" k="admin_level" v="4">
-        <line stroke="#afa0dd" width="1.0" fixed="true" cap="butt" />
-      </rule>
+        <line stroke="#ffffff" width="1.1" fixed="true" cap="butt"
+        stipple-width="1.05" stipple="4" stipple-stroke="#606060"/>
+
+        </rule>
       <rule e="way" k="admin_level" v="3">
-        <line stroke="#0000ff" width="0.95" fixed="true" cap="butt" />
+        <line stroke="#ffffff" width="1.1" fixed="true" cap="butt"
+            stipple-width="1.05" stipple="6" stipple-stroke="#606060"/>
       </rule>
       <rule e="way" k="admin_level" v="2">
-        <line stroke="#ccf0f0f0" width="1.2" fixed="true" cap="butt"
-            stipple-width="1.0" stipple="4" stipple-stroke="#606060"/>
+        <line stroke="#606060" width="1.2" fixed="true" cap="butt" />
       </rule>
-      <rule e="way" k="admin_level" v="1">
+      <!-- <rule e="way" k="admin_level" v="1">
         <line stroke="#ff0000" width="0.95" fixed="true" cap="butt" />
-      </rule>
+        </rule> -->
 
     </rule>
     <!-- </rule> -->
@@ -1001,29 +1037,33 @@
 
     <!-- historic -->
     <!-- <rule e="way" k="historic" v="ruins" zoom-min="17">
-      <caption k="name" font-style="bold" font-size="10" fill="#4040ff"  stroke="#ffffff" stroke-width="2.0" />
-    </rule> -->
+      <caption k="name" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff" stroke-width="2.0"
+      />
+      </rule> -->
 
     <!-- place -->
     <rule e="way" 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" font-style="bold" font-size="10" fill="#000000" stroke="#ffffff"
+        stroke-width="2.0" />
     </rule>
     <rule e="way" k="debug" v="area">
-         <line stroke="#ff0000" width="1.2" fixed="true" cap="butt" />
-        <area fill="#880000ff"/>
-        <caption k="name" font-size="15" fill="#ff0000" stroke="#444444" stroke-width="2.0"/>
+      <line stroke="#ff0000" width="1.2" fixed="true" cap="butt" />
+      <area fill="#880000ff" />
+      <caption k="name" font-size="15" fill="#ff0000" stroke="#444444"
+        stroke-width="2.0" />
     </rule>
-     <rule e="way" k="debug" v="way">
-         <line stroke="#00ffff" width="1.5" fixed="true" cap="butt" />
-        <caption k="name" font-size="15" fill="#00ffff" stroke="#444444" stroke-width="2.0"/>
+    <rule e="way" k="debug" v="way">
+      <line stroke="#00ffff" width="1.5" fixed="true" cap="butt" />
+      <caption k="name" font-size="15" fill="#00ffff" stroke="#444444"
+        stroke-width="2.0" />
     </rule>
-     <rule e="way" k="debug" v="box">
-         <line stroke="#000000" width="1.5" fixed="true" cap="butt" />
+    <rule e="way" k="debug" v="box">
+      <line stroke="#000000" width="1.5" fixed="true" cap="butt" />
     </rule>
 
     <!-- HACK!!! render building models last -->
-     <rule e="way" k="building" v="*" zoom-min="17">
-        <use-area name="building" fade="15"/>
+    <rule e="way" k="building" v="*" zoom-min="17">
+      <use-area name="building" fade="15" />
     </rule>
   </rule>
 
@@ -1033,26 +1073,26 @@
       <circle r="1.5" fill="#909090" />
     </rule>
 
-     <rule e="node" k="debug" v="*" >
-        <caption k="name" font-size="16" fill="#0000ff" />
-      </rule>
+    <rule e="node" k="debug" v="*">
+      <caption k="name" font-size="16" fill="#0000ff" />
+    </rule>
 
 
     <!-- highway -->
     <!-- <rule e="node" k="highway" v="*"> <rule e="node" k="highway" v="turning_circle">
-         <circle r="1.4" scale-radius="true" fill="#ffffff" /> </rule> </rule> -->
+      <circle r="1.4" scale-radius="true" fill="#ffffff" /> </rule> </rule> -->
 
     <!-- historic -->
     <!-- <rule e="node" k="historic" v="*"> <circle r="3" fill="#4040ff" stroke="#606060"
-         width="1.5" /> <rule e="node" k="*" v="*" zoom-min="17"> <caption
-         k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
-         width="2.0" /> </rule> </rule> -->
+      width="1.5" /> <rule e="node" k="*" v="*" zoom-min="17"> <caption
+      k="name" dy="-10" font-style="bold" font-size="10" fill="#4040ff" stroke="#ffffff"
+      width="2.0" /> </rule> </rule> -->
 
 
     <!-- house numbers -->
     <!-- <rule e="node" k="addr:housenumber" v="*" zoom-min="18"> <caption
-         k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
-         width="2.0" /> </rule> -->
+      k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
+      width="2.0" /> </rule> -->
 
 
 
@@ -1060,27 +1100,27 @@
     <rule e="node" k="place" v="*">
       <rule e="node" k="*" v="suburb" zoom-max="14">
         <caption k="name" font-style="italic" font-size="17" fill="#606060"
-                 stroke="#ffffff" stroke-width="2.0" priority="4"/>
+          stroke="#ffffff" stroke-width="2.0" priority="4" />
       </rule>
       <rule e="node" k="*" v="village" zoom-max="14">
-        <caption k="name" font-size="17" fill="#2020cc"
-                 stroke="#ffffff" stroke-width="2.0" priority="3"/>
+        <caption k="name" font-size="17" fill="#2020cc" stroke="#ffffff"
+          stroke-width="2.0" priority="3" />
       </rule>
       <rule e="node" k="*" 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" font-style="bold" font-size="20" fill="#000000" stroke="#ffffff"
+          stroke-width="2.0" priority="1" />
       </rule>
       <rule e="node" k="*" v="town">
-        <caption k="name" font-size="19" fill="#000000"
-                 stroke="#ffffff" stroke-width="2.0" priority="2"/>
+        <caption k="name" font-size="19" fill="#000000" stroke="#ffffff"
+          stroke-width="2.0" priority="2" />
       </rule>
       <rule e="node" k="*" v="city">
-        <caption k="name" font-size="20" fill="#000000"
-                 stroke="#ffffff" stroke-width="2.0" priority="1"/>
+        <caption k="name" font-size="20" fill="#000000" stroke="#ffffff"
+          stroke-width="2.0" priority="1" />
       </rule>
       <rule e="node" k="*" v="country">
-        <caption k="name" font-style="bold" font-size="20" fill="#000000"
-                 stroke="#ffffff" stroke-width="2.0" priority="0"/>
+        <caption k="name" font-style="bold" font-size="20" fill="#000000" stroke="#ffffff"
+          stroke-width="2.0" priority="0" />
       </rule>
     </rule>
 
@@ -1090,172 +1130,172 @@
       <rule e="node" k="*" 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" /> -->
+          stroke="#ffffff" stroke-width="2.0" /> -->
       </rule>
       <rule e="node" k="*" v="halt|tram_stop" zoom-min="17">
         <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" /> -->
+          stroke="#ffffff" stroke-width="2.0" /> -->
       </rule>
     </rule>
 
     <!-- aeroway -->
-		<rule e="node" k="aeroway" v="*">
-			<rule e="node" k="aeroway" v="helipad" zoom-min="17">
-				<symbol src="jar:symbols/helipad.png" />
-			</rule>
-			<rule e="node" k="aeroway" v="aerodrome|airport" zoom-max="13">
-				<symbol src="jar:symbols/airport.png" />
-			</rule>
-		</rule>
+    <rule e="node" k="aeroway" v="*">
+      <rule e="node" k="aeroway" v="helipad" zoom-min="17">
+        <symbol src="jar:symbols/helipad.png" />
+      </rule>
+      <rule e="node" k="aeroway" v="aerodrome|airport" zoom-max="13">
+        <symbol src="jar:symbols/airport.png" />
+      </rule>
+    </rule>
 
 
-		<!-- amenity
-		<rule e="node" k="amenity" v="*">
-			<rule e="node" k="amenity" v="atm" zoom-min="17">
-				<symbol src="jar:symbols/atm.png" />
-			</rule>
-			<rule e="node" k="amenity" v="bank" zoom-min="17">
-				<symbol src="jar:symbols/bank.png" />
-			</rule>
-			<rule e="node" k="amenity" v="bench" zoom-min="17">
-				<symbol src="jar:symbols/bench.png" />
-			</rule>
-			<rule e="node" k="amenity" v="bicycle_rental" zoom-min="17">
-				<symbol src="jar:symbols/bicycle_rental.png" />
-			</rule>
-			<rule e="node" k="amenity" v="bus_station" zoom-min="17">
-				<symbol src="jar:symbols/bus_sta.png" />
-			</rule>
-			<rule e="node" k="amenity" v="cafe" zoom-min="17">
-				<symbol src="jar:symbols/cafe.png" />
-			</rule>
-			<rule e="node" k="amenity" v="cinema" zoom-min="17">
-				<symbol src="jar:symbols/cinema.png" />
-			</rule>
-			<rule e="node" k="amenity" v="drinking_water" zoom-min="17">
-				<symbol src="jar:symbols/drinking_water.png" />
-			</rule>
-			<rule e="node" k="amenity" v="fast_food" zoom-min="17">
-				<symbol src="jar:symbols/fastfood.png" />
-			</rule>
-			<rule e="node" k="amenity" v="fire_station" zoom-min="17">
-				<symbol src="jar:symbols/firebrigade.png" />
-			</rule>
-			<rule e="node" k="amenity" v="fountain" zoom-min="17">
-				<symbol src="jar:symbols/fountain.png" />
-			</rule>
-			<rule e="node" k="amenity" v="fuel" zoom-min="17">
-				<symbol src="jar:symbols/petrolStation.png" />
-			</rule>
-			<rule e="node" k="amenity" v="hospital" zoom-min="15">
-				<symbol src="jar:symbols/hospital.png" />
-			</rule>
-			 <rule e="node" k="amenity" v="kindergarten" zoom-min="17">
-				<symbol src="jar:symbols/kindergarten.png" />
-			</rule>
-			<rule e="node" k="amenity" v="library" zoom-min="17">
-				<symbol src="jar:symbols/library.png" />
-			</rule>
-			<rule e="node" k="amenity" v="parking" zoom-min="17">
-				<symbol src="jar:symbols/parking.png" />
-			</rule>
-			<rule e="node" k="amenity" v="pharmacy" zoom-min="17">
-				<symbol src="jar:symbols/pharmacy.png" />
-			</rule>
-			<rule e="node" k="amenity" v="place_of_worship" zoom-min="17">
-				<rule e="node" k="denomination|religion" v="jewish">
-					<symbol src="jar:symbols/synagogue.png" />
-				</rule>
-				<rule e="node" k="denomination|religion" v="muslim|moslem">
-					<symbol src="jar:symbols/mosque.png" />
-				</rule>
-				<rule e="node" k="denomination|religion" v="christian">
-					<symbol src="jar:symbols/church.png" />
-				</rule>
-			</rule>
-			<rule e="node" k="amenity" v="post_box" zoom-min="17">
-				<symbol src="jar:symbols/postbox.png" />
-			</rule>
-			<rule e="node" k="amenity" v="post_office" zoom-min="17">
-				<symbol src="jar:symbols/postoffice.png" />
-			</rule>
-			<rule e="node" k="amenity" v="pub|bar" zoom-min="17">
-				<symbol src="jar:symbols/pub.png" />
-			</rule>
-			<rule e="node" k="amenity" v="recycling" zoom-min="17">
-				<symbol src="jar:symbols/recycling.png" />
-			</rule>
-			<rule e="node" k="amenity" v="restaurant" zoom-min="17">
-				<symbol src="jar:symbols/restaurant.png" />
-			</rule>
-			<rule e="node" k="amenity" v="school" zoom-min="17">
-				<symbol src="jar:symbols/school.png" />
-			</rule>
-			<rule e="node" k="amenity" v="shelter" zoom-min="17">
-				<symbol src="jar:symbols/shelter.png" />
-			</rule>
-			<rule e="node" k="amenity" v="telephone" zoom-min="17">
-				<symbol src="jar:symbols/telephone.png" />
-			</rule>
-			<rule e="node" k="amenity" v="theatre" zoom-min="17">
-				<symbol src="jar:symbols/theatre.png" />
-			</rule>
-			<rule e="node" k="amenity" v="toilets" zoom-min="17">
-				<symbol src="jar:symbols/toilets.png" />
-			</rule>
-			<rule e="node" k="amenity" v="university|college" zoom-min="17">
-				<symbol src="jar:symbols/university.png" />
-			</rule>
+    <!-- amenity
+      <rule e="node" k="amenity" v="*">
+      <rule e="node" k="amenity" v="atm" zoom-min="17">
+      <symbol src="jar:symbols/atm.png" />
+      </rule>
+      <rule e="node" k="amenity" v="bank" zoom-min="17">
+      <symbol src="jar:symbols/bank.png" />
+      </rule>
+      <rule e="node" k="amenity" v="bench" zoom-min="17">
+      <symbol src="jar:symbols/bench.png" />
+      </rule>
+      <rule e="node" k="amenity" v="bicycle_rental" zoom-min="17">
+      <symbol src="jar:symbols/bicycle_rental.png" />
+      </rule>
+      <rule e="node" k="amenity" v="bus_station" zoom-min="17">
+      <symbol src="jar:symbols/bus_sta.png" />
+      </rule>
+      <rule e="node" k="amenity" v="cafe" zoom-min="17">
+      <symbol src="jar:symbols/cafe.png" />
+      </rule>
+      <rule e="node" k="amenity" v="cinema" zoom-min="17">
+      <symbol src="jar:symbols/cinema.png" />
+      </rule>
+      <rule e="node" k="amenity" v="drinking_water" zoom-min="17">
+      <symbol src="jar:symbols/drinking_water.png" />
+      </rule>
+      <rule e="node" k="amenity" v="fast_food" zoom-min="17">
+      <symbol src="jar:symbols/fastfood.png" />
+      </rule>
+      <rule e="node" k="amenity" v="fire_station" zoom-min="17">
+      <symbol src="jar:symbols/firebrigade.png" />
+      </rule>
+      <rule e="node" k="amenity" v="fountain" zoom-min="17">
+      <symbol src="jar:symbols/fountain.png" />
+      </rule>
+      <rule e="node" k="amenity" v="fuel" zoom-min="17">
+      <symbol src="jar:symbols/petrolStation.png" />
+      </rule>
+      <rule e="node" k="amenity" v="hospital" zoom-min="15">
+      <symbol src="jar:symbols/hospital.png" />
+      </rule>
+      <rule e="node" k="amenity" v="kindergarten" zoom-min="17">
+      <symbol src="jar:symbols/kindergarten.png" />
+      </rule>
+      <rule e="node" k="amenity" v="library" zoom-min="17">
+      <symbol src="jar:symbols/library.png" />
+      </rule>
+      <rule e="node" k="amenity" v="parking" zoom-min="17">
+      <symbol src="jar:symbols/parking.png" />
+      </rule>
+      <rule e="node" k="amenity" v="pharmacy" zoom-min="17">
+      <symbol src="jar:symbols/pharmacy.png" />
+      </rule>
+      <rule e="node" k="amenity" v="place_of_worship" zoom-min="17">
+      <rule e="node" k="denomination|religion" v="jewish">
+      <symbol src="jar:symbols/synagogue.png" />
+      </rule>
+      <rule e="node" k="denomination|religion" v="muslim|moslem">
+      <symbol src="jar:symbols/mosque.png" />
+      </rule>
+      <rule e="node" k="denomination|religion" v="christian">
+      <symbol src="jar:symbols/church.png" />
+      </rule>
+      </rule>
+      <rule e="node" k="amenity" v="post_box" zoom-min="17">
+      <symbol src="jar:symbols/postbox.png" />
+      </rule>
+      <rule e="node" k="amenity" v="post_office" zoom-min="17">
+      <symbol src="jar:symbols/postoffice.png" />
+      </rule>
+      <rule e="node" k="amenity" v="pub|bar" zoom-min="17">
+      <symbol src="jar:symbols/pub.png" />
+      </rule>
+      <rule e="node" k="amenity" v="recycling" zoom-min="17">
+      <symbol src="jar:symbols/recycling.png" />
+      </rule>
+      <rule e="node" k="amenity" v="restaurant" zoom-min="17">
+      <symbol src="jar:symbols/restaurant.png" />
+      </rule>
+      <rule e="node" k="amenity" v="school" zoom-min="17">
+      <symbol src="jar:symbols/school.png" />
+      </rule>
+      <rule e="node" k="amenity" v="shelter" zoom-min="17">
+      <symbol src="jar:symbols/shelter.png" />
+      </rule>
+      <rule e="node" k="amenity" v="telephone" zoom-min="17">
+      <symbol src="jar:symbols/telephone.png" />
+      </rule>
+      <rule e="node" k="amenity" v="theatre" zoom-min="17">
+      <symbol src="jar:symbols/theatre.png" />
+      </rule>
+      <rule e="node" k="amenity" v="toilets" zoom-min="17">
+      <symbol src="jar:symbols/toilets.png" />
+      </rule>
+      <rule e="node" k="amenity" v="university|college" zoom-min="17">
+      <symbol src="jar:symbols/university.png" />
+      </rule>
 
-			<rule e="node" k="*" v="*" zoom-min="17">
-				<caption k="name"  font-size="15" fill="#bb4040" stroke="#ffffff" stroke-width="2.0" />
-			</rule>
-		</rule>-->
+      <rule e="node" k="*" v="*" zoom-min="17">
+      <caption k="name" font-size="15" fill="#bb4040" stroke="#ffffff" stroke-width="2.0" />
+      </rule>
+      </rule> -->
 
     <!-- shop
-		<rule e="node" k="shop" v="*">
-			<rule e="node" k="shop" v="bakery" zoom-min="17">
-				<symbol src="jar:symbols/bakery.png" />
-			</rule>
-			<rule e="node" k="shop" v="florist" zoom-min="17">
-				<symbol src="jar:symbols/florist.png" />
-			</rule>
-			<rule e="node" k="shop" v="supermarket|organic" zoom-min="17">
-				<symbol src="jar:symbols/supermarket.png" />
-			</rule>
+      <rule e="node" k="shop" v="*">
+      <rule e="node" k="shop" v="bakery" zoom-min="17">
+      <symbol src="jar:symbols/bakery.png" />
+      </rule>
+      <rule e="node" k="shop" v="florist" zoom-min="17">
+      <symbol src="jar:symbols/florist.png" />
+      </rule>
+      <rule e="node" k="shop" v="supermarket|organic" zoom-min="17">
+      <symbol src="jar:symbols/supermarket.png" />
+      </rule>
 
-			<rule e="node" k="*" v="*" zoom-min="17">
-				<caption k="name" font-size="15" fill="#2020bb" stroke="#ffffff" stroke-width="2.0" />
-			</rule>
-		</rule>-->
+      <rule e="node" k="*" v="*" zoom-min="17">
+      <caption k="name" font-size="15" fill="#2020bb" stroke="#ffffff" stroke-width="2.0" />
+      </rule>
+      </rule> -->
 
 
-		<!-- tourism
-		<rule e="node" k="tourism" v="*">
-			<rule e="node" k="tourism" v="alpine_hut" zoom-min="16">
-				<symbol src="jar:symbols/alpine_hut.png" />
-			</rule>
-			<rule e="node" k="tourism" v="camp_site" zoom-min="17">
-				<symbol src="jar:symbols/campSite.png" />
-			</rule>
-			<rule e="node" k="tourism" v="hostel" zoom-min="17">
-				<symbol src="jar:symbols/hostel.png" />
-			</rule>
-			<rule e="node" k="tourism" v="hotel" zoom-min="17">
-				<symbol src="jar:symbols/hotel.png" />
-			</rule>
-			<rule e="node" k="tourism" v="information" zoom-min="17">
-				<symbol src="jar:symbols/information.png" />
-			</rule>
-			<rule e="node" k="tourism" v="viewpoint" zoom-min="15">
-				<symbol src="jar:symbols/viewpoint.png" />
-			</rule>
+    <!-- tourism
+      <rule e="node" k="tourism" v="*">
+      <rule e="node" k="tourism" v="alpine_hut" zoom-min="16">
+      <symbol src="jar:symbols/alpine_hut.png" />
+      </rule>
+      <rule e="node" k="tourism" v="camp_site" zoom-min="17">
+      <symbol src="jar:symbols/campSite.png" />
+      </rule>
+      <rule e="node" k="tourism" v="hostel" zoom-min="17">
+      <symbol src="jar:symbols/hostel.png" />
+      </rule>
+      <rule e="node" k="tourism" v="hotel" zoom-min="17">
+      <symbol src="jar:symbols/hotel.png" />
+      </rule>
+      <rule e="node" k="tourism" v="information" zoom-min="17">
+      <symbol src="jar:symbols/information.png" />
+      </rule>
+      <rule e="node" k="tourism" v="viewpoint" zoom-min="15">
+      <symbol src="jar:symbols/viewpoint.png" />
+      </rule>
 
-			<rule e="node" k="*" v="*" zoom-min="17">
-				<caption k="name" font-size="15" fill="#20aa20" stroke="#ffffff" stroke-width="2.0" />
-			</rule>
-		</rule>-->
+      <rule e="node" k="*" v="*" zoom-min="17">
+      <caption k="name" font-size="15" fill="#20aa20" stroke="#ffffff" stroke-width="2.0" />
+      </rule>
+      </rule> -->
 
   </rule>