diff --git a/src/org/oscim/theme/styles/default.xml b/src/org/oscim/theme/styles/default.xml
index cc390837..7bf250a3 100644
--- a/src/org/oscim/theme/styles/default.xml
+++ b/src/org/oscim/theme/styles/default.xml
@@ -6,10 +6,10 @@
 
   <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="railway|industrial"  fill="#e6e3e5" fade="10"/>
   <!-- "#f0fae7" mint green  -->
   <!-- <style-area name="farmland"            fill="#fff8bf" fade="11" />-->
@@ -17,129 +17,129 @@
    <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="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" />
- 	  
+
  	<!-- 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" />
- 	
+
  	<!-- de:Steinbruch, Schotter-, Kies-, Sand- und Tongrube -->
   <style-area name="quarry"              fill="#ddddcc" 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"/>
- 	
+
  	<!-- 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="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="highway-service"     from="residential" width="-0.6" />
-    
+
   <!-- track|footway|path|cycleway -->
-  <style-line name="footway"             stroke="#aaffffff" width="1.8" cap="butt" fixed="true" 
+  <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"/>
-  
+
   <!-- 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="steps"               stroke="#aaffffff" width="4.2" cap="butt" fixed="true" 
+      									 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="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-line name="water"               stroke="#afc5e3" 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="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-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-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 -->      
+
+
+    <!-- landuse base -->
     <rule e="way" k="landuse" v="*">
      <rule e="way" k="*" v="urban">
-        <area fill="#efeeea" />
+        <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>
-     
+
       <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 e="way" k="*" v="industrial|railway"> 
+
+      <rule e="way" k="*" v="industrial|railway">
          <use-area name ="railway|industrial"/>
       </rule>
 
      <!--   <rule e="way" k="*" v="military">
 				 <use-area name="military"/>
       </rule> -->
-      
-      <!--<rule e="way" k="landuse" v="construction|greenfield"> <area fill="#a47c41" 
+
+      <!--<rule e="way" k="landuse" v="construction|greenfield"> <area fill="#a47c41"
          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">
@@ -148,97 +148,97 @@
 		       <line stroke="#abe29c" width="1.0" fixed="true" cap="butt" />
 	      </rule>
 	    </rule>
-	
-		    
-	    <!-- tourism areas 
+
+
+	    <!-- 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> -->
-           
+
         <rule e="way" k="tourism" v="zoo|picnic_site|caravan_site|camp_site">
           <area fill="#c0d69a" />
         </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>
-	           
+
 	    </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="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>
-	      
+
 	    <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>
-	  
-     
-			<!-- keep grass above forest:wood and leisure:park! --> 
+
+
+			<!-- 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="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"> 
+	      <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"/> 
+	       <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="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> -->
-	
+
 	    <!-- natural -->
 	    <rule e="way" k="natural" v="*" zoom-min="10">
-	
+
 	      <rule e="way" k="*" v="glacier">
 	        <area fill="#fafaff" />
 	      </rule>
@@ -248,75 +248,75 @@
 	      <rule e="way" k="*" v="beach">
 	        <area fill="#f7f5c8" />
 	      </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">
-	
+
 	      <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>
-	      
+
 	      <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="swimming_pool">
 	        <area fill="#b4cbdc" 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 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 
+
+
+	     <!-- 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="*" 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="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>
     </rule> <!-- end landuse|natural|leisure||amenity|tourism -->
- 
-    
+
+
     <!-- waterways -->
     <rule e="way" k="waterway" v="*">
 
@@ -327,11 +327,11 @@
       <rule e="way" k="waterway" v="canal">
         <use-line name="water" width="-0.2"/>
       </rule>
-      
+
       <rule e="way" k="waterway" v="stream" zoom-min="14">
          <use-line name="water" width="-0.7"/>
       </rule>
-      
+
       <rule e="way" k="waterway" v="river">
         <rule e="way" k="*" v="*" zoom-min="12">
           <use-line name="water" width="0.3"/>
@@ -340,31 +340,31 @@
            <use-line name="water" width="0.3" fixed="true" fade="7"/>
         </rule>
       </rule>
-      
+
       <rule e="way" k="waterway" v="riverbank|dock">
         <use-area name="water"/>
         <use-line name="water:outline"/>
       </rule>
-      
+
       <rule e="way" k="waterway" v="weir">
         <line stroke="#000044" width="0.375" cap="butt" />
       </rule>
-      
+
       <rule e="way" k="waterway" v="dam" zoom-min="12">
         <!-- sehr seltsam was in deutschland so als Damm gekenzeichnet wird.. -->
         <line stroke="#ababab" width="1.2" cap="butt" fixed="true" />
       </rule>
-      
+
       <rule e="way" k="lock" v="yes|true">
         <line stroke="#f8f8f8" width="1.5" cap="butt" />
       </rule>
     </rule>
 
     <!-- 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 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> -->
 
 
@@ -396,15 +396,15 @@
           <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>
@@ -413,7 +413,7 @@
              <use-line name="construction"/>
              <use-outline name="0"/>
            </rule>
-           
+
            <rule e="way" k="*" v="service">
                <rule e="way" k="service" v="~|parking_aisle">
            	 <use-line name="highway-service"/>
@@ -425,18 +425,18 @@
          <rule e="way" k="*" v="trunk_link|motorway_link">
            <use-line name="trunk_link"/>
            <use-outline name="0"/>
-            <use-text name="major-road"/> 
+            <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">	              
+
+
+           <rule e="way" k="*" v="residential|road|unclassified|living_street">
             	<use-line name="residential"/>
             	<use-outline name="0"/>
             	<use-text name="road"/>
@@ -446,47 +446,47 @@
          <rule e="way" k="*" v="tertiary|secondary_link">
            <use-line name="tertiary"/>
            <use-outline name="0"/>
-  			    <use-text name="road"/>    
+  			    <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"/>    
+           <use-text name="major-road"/>
          </rule>
 
          <rule e="way" k="*" v="primary">
-           <use-line name="primary:z11"/>       
+           <use-line name="primary:z11"/>
         	 <use-outline name="0"/>
-        	 <use-text name="major-road"/>    
+        	 <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="0"/>
            <!--  <use-outline name="glow"/> -->
-            <use-text name="major-road"/>   
+            <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="0"/>
          <!--   <use-outline name="glow"/> -->
-           <use-text name="major-road"/>   
+           <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 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>
       </rule>
     </rule>   <!-- end tunnel -->
-		
+
 
     <!-- platform cores -->
     <rule e="way" k="highway|railway|public_transport" v="platform">
@@ -512,40 +512,40 @@
       <rule e="way" k="*" v="terminal|hangar">
         <use-line name="building" />
         <use-area name="building" />
-      </rule> 
+      </rule>
     </rule>
 
     <!-- turning circles -->
-    <!-- <rule e="node" k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true" 
-         fill="#707070" /> 
+    <!-- <rule e="node" k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
+         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"/> 
+      <!--   <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"
           stroke="#ffffff" stroke-width="2.0" />
-          <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" 
+          <caption k="addr:housenumber" font-style="bold" font-size="10" fill="#606060"
           stroke="#ffffff" stroke-width="2.0" />
           </rule>
     </rule>
 
     <!-- outline 1 - 4 -->
-     <style-outline name="1" stroke="#aa807040" 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">
@@ -590,7 +590,7 @@
           </rule>
         </rule>
       </rule>
-      
+
       <rule e="way" k="*" v="*" zoom-min="11">
          <rule e="way" k="tunnel|bridge" v="~|no|false">
                <!-- highway area -->
@@ -600,18 +600,18 @@
 					        <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="*" 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">
@@ -626,16 +626,16 @@
 	              <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="cycleway">
             		<use-line name="highway:cycleway"/>
           		</rule>
-          
+
 	 	        <rule e="way" k="*" v="track">
             	  <use-line name="highway:track"/>
            		</rule>
@@ -643,16 +643,16 @@
 	 	        <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"/>
@@ -664,66 +664,66 @@
                 </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"/> 
+	         	  <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>
-	            
-	            <rule e="way" k="*" v="residential|road|unclassified|living_street">	              
+
+	            <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 e="way" k="*" v="tertiary|secondary_link">
 	            <use-line name="tertiary"/>
 	            <use-outline name="1"/>
-	   			    <use-text name="road"/>    
+	   			    <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"/>    
+	            <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="primary">
-	            <use-line name="primary:z11"/>        
+	            <use-line name="primary:z11"/>
 	         		<use-outline name="primary"/>
-	         	  <use-text name="major-road"/>    
+	         	  <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"/>   
+	             <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"/>   
+	            <use-text name="major-road"/>
 	          </rule>
-	        </rule> <!-- end area=~|no|false --> 
+	        </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="area" v="~|no|false">
-				 
+
 	          <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"/>
@@ -734,7 +734,7 @@
 	              <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"/>
@@ -751,80 +751,80 @@
 	            <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>
 	          </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>
 	            <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>
-	
+
 	          <rule e="way" k="*" v="tertiary|secondary_link">
 	            <use-line name="tertiary" cap="square"/>
 	            <use-outline name="bridge"/>
-	   			    <use-text name="road"/>    
+	   			    <use-text name="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"/> 
+	         	  <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"/>    
+	            <use-text name="major-road"/>
 	          </rule>
-	
+
 	          <rule e="way" k="*" v="primary">
-	            <use-line name="primary:z11" cap="square"/>        
+	            <use-line name="primary:z11" cap="square"/>
 	         		<use-outline name="bridge"/>
-	         	  <use-text name="major-road"/>    
+	         	  <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"/>   
+	             <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> 
+	            <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="*" 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>-->
@@ -832,7 +832,7 @@
         </rule>  <!-- end bridge=yes -->
       </rule> <!-- end zoom-min=11 -->
     </rule> <!-- end highway -->
-     
+
 
     <!-- runways cores -->
     <rule e="way" k="aeroway" v="*">
@@ -859,7 +859,7 @@
 
     <!-- barriers -->
     <rule e="way" k="barrier" v="*">
-      <!-- <rule e="way" k="*" v="fence|wall|city_wall" zoom-min="15"> <line 
+      <!-- <rule e="way" k="*" v="fence|wall|city_wall" zoom-min="15"> <line
            stroke="#909090" width="0.1" cap="butt" /> </rule> -->
       <rule e="way" k="*" v="retaining_wall" zoom-min="15">
         <line stroke="#888888" width="0.1" cap="butt" />
@@ -868,17 +868,17 @@
 
 
     <!-- non-physical routes -->
-    <!-- <rule e="way" k="route" v="ferry"> <line stroke="#707070" width="0.3" 
+    <!-- <rule e="way" k="route" v="ferry"> <line stroke="#707070" width="0.3"
          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 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> -->
 
 
@@ -907,7 +907,7 @@
             </rule>
           </rule>
         </rule>
- 
+
         <!-- railway casings and cores -->
         <rule e="way" k="railway" v="tram" zoom-min="15">
           <line stroke="#887766" width="1.0" fixed="true" />
@@ -916,16 +916,16 @@
         <rule e="way" k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
           <line stroke="#a0a0a0" width="0.9" cap="butt" fixed="true" />
         </rule>
-        
+
         <rule e="way" k="railway" v="rail|turntable" zoom-max="14">
           <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" 
+          <line stroke="#aaa6a4" width="2.0" cap="butt" fixed="true" fade="12"
                 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" />
@@ -942,24 +942,24 @@
 
 
     <!-- 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="*"> <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>
     <!--<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" 
+      <!-- <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> -->
       <rule e="way" k="admin_level" v="4">
         <line stroke="#afa0dd" width="1.0" fixed="true" cap="butt" />
@@ -968,7 +968,7 @@
         <line stroke="#0000ff" width="0.95" fixed="true" cap="butt" />
       </rule>
       <rule e="way" k="admin_level" v="2">
-        <line stroke="#ccf0f0f0" width="1.2" fixed="true" cap="butt" 
+        <line stroke="#ccf0f0f0" width="1.2" fixed="true" cap="butt"
             stipple-width="1.0" stipple="4" stipple-stroke="#606060"/>
       </rule>
       <rule e="way" k="admin_level" v="1">
@@ -1000,7 +1000,7 @@
      <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"/>
@@ -1016,22 +1016,22 @@
      <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"> 
+    <!-- <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> -->
 
     <!-- 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" 
+    <!-- <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> -->
 
 
     <!-- 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" 
+    <!-- <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> -->
 
 
@@ -1069,16 +1069,16 @@
     <rule e="node" k="railway" v="*">
       <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" 
+        <!-- <caption k="name" dy="-10" font-style="bold" font-size="13" fill="#ec2d2d"
              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" 
+        <!-- <caption k="name" dy="-15" font-style="bold" font-size="11" fill="#ec2d2d"
              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">
@@ -1177,7 +1177,7 @@
 			</rule>
 			<rule e="node" k="amenity" v="telephone" zoom-min="17">
 				<symbol src="jar:symbols/telephone.png" />
-			</rule> 
+			</rule>
 			<rule e="node" k="amenity" v="theatre" zoom-min="17">
 				<symbol src="jar:symbols/theatre.png" />
 			</rule>
@@ -1192,8 +1192,8 @@
 				<caption k="name"  font-size="15" fill="#bb4040" stroke="#ffffff" stroke-width="2.0" />
 			</rule>
 		</rule>-->
-    
-    <!-- shop 
+
+    <!-- shop
 		<rule e="node" k="shop" v="*">
 			<rule e="node" k="shop" v="bakery" zoom-min="17">
 				<symbol src="jar:symbols/bakery.png" />
@@ -1211,7 +1211,7 @@
 		</rule>-->
 
 
-		<!-- tourism 
+		<!-- 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" />
@@ -1236,7 +1236,7 @@
 				<caption k="name" font-size="15" fill="#20aa20" stroke="#ffffff" stroke-width="2.0" />
 			</rule>
 		</rule>-->
-    
+
   </rule>
 
 </rendertheme>
\ No newline at end of file