diff --git a/src/org/oscim/theme/styles/carto.xml b/src/org/oscim/theme/styles/carto.xml
index 8dc64e1c..81d5816f 100644
--- a/src/org/oscim/theme/styles/carto.xml
+++ b/src/org/oscim/theme/styles/carto.xml
@@ -46,7 +46,7 @@
   <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" cap="butt" fixed="true" stipple="4"
+  <style-line name="footway" cap="butt" fix="true" stipple="4"
     stipple-stroke="#d35c48" stipple-width="0.6" stroke="#aaffffff" width="1.8" />
   <style-line name="highway:cycleway" from="footway" stipple-stroke="#4040ee"
     width="0.1" />
@@ -60,24 +60,24 @@
   <!-- de: ein Weg der für Reiter vorgeshen ist.. -->
   <style-line name="bridleway" cap="butt" from="footway" stipple-stroke="#837b58"
     stroke="#d3cb98" width="0.1" />
-  <style-line name="steps" cap="butt" fixed="true" stipple="2" stipple-stroke="#be6253"
+  <style-line name="steps" cap="butt" fix="true" stipple="2" stipple-stroke="#be6253"
     stipple-width="1.0" stroke="#aaffffff" width="4.2" />
-  <style-line name="water:outline" cap="butt" fixed="true" stroke="#a4bbcc"
+  <style-line name="water:outline" cap="butt" fix="true" stroke="#a4bbcc"
     width="1.0" />
   <style-line name="water" cap="butt" stroke="#afc5e3" width="1.0" />
   <!-- <style-area name="water" fill="#97b7e5" /> -->
   <style-area name="water" fill="#afc5e3" />
   <!-- no-go area boundary -->
-  <style-line name="fence" cap="butt" fixed="true" stroke="#444444" width="1.2" />
+  <style-line name="fence" cap="butt" fix="true" stroke="#444444" width="1.2" />
   <style-line name="aeroway:runway" cap="butt" stroke="#c8ccbe" width="1.8" />
-  <!-- <style-line name="building" stroke="#c9c3c1" width="1.0" fixed="true"
+  <!-- <style-line name="building" stroke="#c9c3c1" width="1.0" fix="true"
     cap="butt" fade="15"/> -->
   <!--
-    <style-line name="building" stroke="#d0cec8" width="1.0" fixed="true"
+    <style-line name="building" stroke="#d0cec8" width="1.0" fix="true"
     cap="butt" fade="15"/>
     <style-area name="building" fill="#e9e6e3" fade="15"/>
   -->
-  <style-line name="building" cap="butt" fade="15" fixed="true" stroke="#b7b6b3"
+  <style-line name="building" cap="butt" fade="15" fix="true" stroke="#b7b6b3"
     width="1.0" />
   <!-- <style-area name="building" fill="#eae8e6" fade="15"/> -->
   <style-area name="building" fade="15" fill="#f2f0eb" />
@@ -93,7 +93,7 @@
       <rule e="way" k="*" v="school">
         <!-- <area fill="#cdabde" /> -->
         <area fade="15" fill="#cdbbca" />
-        <line cap="butt" fade="15" fixed="true" stroke="#9aabae" width="1.0" />
+        <line cap="butt" fade="15" fix="true" stroke="#9aabae" width="1.0" />
       </rule>
 
       <rule e="way" k="*" v="hospital">
@@ -123,7 +123,7 @@
 
       <rule e="way" k="*" v="pitch">
         <area fill="#f4f4de" />
-        <line cap="butt" fixed="true" stroke="#d9d9a3" width="1.0" />
+        <line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" />
       </rule>
       <rule e="way" k="*" v="swimming_pool">
         <area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" />
@@ -139,20 +139,20 @@
     <!-- waterways -->
     <rule e="way" k="waterway" v="*">
       <rule e="way" k="type" v="ditch|drain">
-        <use-line name="water" fixed="true" width="0.1" />
+        <use-line name="water" fix="true" width="0.1" />
       </rule>
       <rule e="way" k="type" v="canal">
         <use-line name="water" width="-0.2" />
       </rule>
       <rule e="way" k="type" v="stream">
-        <use-line name="water" fixed="true" width="0.2" />
+        <use-line name="water" fix="true" width="0.2" />
       </rule>
       <rule e="way" k="type" v="river">
         <rule e="way" k="*" v="*" zoom-min="12">
           <use-line name="water" width="0.3" />
         </rule>
         <rule e="way" k="*" v="*" zoom-max="11">
-          <use-line name="water" fade="7" fixed="true" width="0.3" />
+          <use-line name="water" fade="7" fix="true" width="0.3" />
         </rule>
       </rule>
     </rule>
@@ -253,11 +253,11 @@
       <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"/>
+          <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
           </rule>
         -->
         <rule e="way" k="railway" v="rail">
-          <line cap="butt" fixed="true" stroke="#aa888888" width="0.9" />
+          <line cap="butt" fix="true" stroke="#aa888888" width="0.9" />
         </rule>
       </rule>
     </rule> <!-- end tunnel -->
@@ -294,7 +294,7 @@
         <use-area name="building" fade="14" />
         <use-line name="building" fade="14" />
         <!--
-          <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" fade="15"/>
+          <line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/>
           <area fill="#e9e6e3" fade="15" />
         -->
       </rule>
@@ -315,16 +315,16 @@
     <rule e="way" k="*" v="*" zoom-max="10">
 
       <rule e="way" k="*" v="main">
-        <!-- <line cap="butt" fade="5" fixed="true" stroke="#e2cf5d" width="1.5" /> -->
-        <line cap="butt" fade="8" fixed="true" stroke="#c6c5a2" width="1.3" />
+        <!-- <line cap="butt" fade="5" fix="true" stroke="#e2cf5d" width="1.5" /> -->
+        <line cap="butt" fade="8" fix="true" stroke="#c6c5a2" width="1.3" />
       </rule>
 
       <rule e="way" k="*" v="motorway">
-        <line cap="butt" fade="6" fixed="true" stroke="#deb683" width="1.5" />
+        <line cap="butt" fade="6" fix="true" stroke="#deb683" width="1.5" />
       </rule>
 
       <!-- <rule e="way" k="class" v="-main|motorway">
-        <line cap="butt" fixed="true" stroke="#00ff00" width="1.8" />
+        <line cap="butt" fix="true" stroke="#00ff00" width="1.8" />
         </rule>
       -->
 
@@ -503,7 +503,7 @@
         stroke="#909090" width="0.1" cap="butt" /> </rule>
       -->
       <rule e="way" k="*" v="retaining_wall" zoom-min="15">
-        <line cap="butt" fixed="true" stroke="#888888" width="1.1" />
+        <line cap="butt" fix="true" stroke="#888888" width="1.1" />
       </rule>
     </rule>
     <!-- non-physical routes -->
@@ -533,44 +533,44 @@
       <rule e="way" k="*" v="*" zoom-min="14">
         <rule e="way" k="bridge" v="yes|true">
           <rule e="way" k="railway" v="tram">
-            <line cap="butt" fixed="true" stroke="#777777" width="0.9" />
+            <line cap="butt" fix="true" stroke="#777777" width="0.9" />
           </rule>
           <rule e="way" k="railway" v="subway|light_rail|narrow_gauge">
-            <line cap="butt" fixed="true" stroke="#777777" width="0.9" />
+            <line cap="butt" fix="true" stroke="#777777" width="0.9" />
           </rule>
           <rule e="way" k="railway" v="rail">
-            <line cap="butt" fixed="true" stroke="#777777" width="0.9" />
+            <line cap="butt" fix="true" stroke="#777777" width="0.9" />
           </rule>
         </rule>
       </rule>
       <!-- railway casings and cores -->
       <rule e="way" k="railway" v="tram" zoom-min="15">
-        <line fixed="true" stroke="#887766" width="1.0" />
+        <line fix="true" stroke="#887766" width="1.0" />
       </rule>
       <rule e="way" k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
-        <line cap="butt" fixed="true" stroke="#a0a0a0" width="0.9" />
+        <line cap="butt" fix="true" stroke="#a0a0a0" width="0.9" />
       </rule>
       <rule e="way" k="class" v="major_rail" zoom-max="13">
-        <line cap="butt" fade="12" fixed="true" stroke="#ddaa9988" width="1.0" />
+        <line cap="butt" fade="12" fix="true" stroke="#ddaa9988" width="1.0" />
       </rule>
       <rule e="way" k="class" v="major_rail" zoom-min="14">
-        <line cap="butt" fade="12" fixed="true" stipple="10" stipple-stroke="#ffffff"
+        <line cap="butt" fade="12" fix="true" stipple="10" stipple-stroke="#ffffff"
           stipple-width="0.8" stroke="#aaa6a4" width="2.0" />
       </rule>
       <!--
         <rule e="way" k="railway" v="rail" zoom-max="14" zoom-min="13">
         <line stroke="#8888aa" width="0.6" cap="butt"
-        fixed="true" />
+        fix="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" />
+        <line stroke="#bbbbcc" width="0.8" cap="butt" fix="true" />
         </rule>
       -->
       <!-- whatever railway:spur means ... -->
       <rule e="way" k="railway" v="disused|spur|abandoned|preserved">
-        <line cap="butt" fade="12" fixed="true" stroke="#cccccc" width="0.8" />
+        <line cap="butt" fade="12" fix="true" stroke="#cccccc" width="0.8" />
       </rule>
     </rule>
     <!-- non-physical boundaries -->
@@ -587,13 +587,13 @@
       <rule e="way" k="admin_level" v="*">
 
         <rule e="way" k="admin_level" v="4">
-          <line cap="butt" fixed="true" stroke="#afa0dd" width="1.0" />
+          <line cap="butt" fix="true" stroke="#afa0dd" width="1.0" />
         </rule>
         <rule e="way" k="admin_level" v="3">
-          <line cap="butt" fixed="true" stroke="#0000ff" width="0.95" />
+          <line cap="butt" fix="true" stroke="#0000ff" width="0.95" />
         </rule>
         <rule e="way" k="admin_level" v="2">
-          <line cap="butt" fixed="true" stroke="#808080" width="1.0" />
+          <line cap="butt" fix="true" stroke="#808080" width="1.0" />
           <!-- stipple-width="1.0" stipple="4" stipple-stroke="#606060"/> -->
         </rule>
       </rule>
@@ -601,18 +601,18 @@
 
 
     <rule e="way" k="debug" v="area">
-      <line cap="butt" fixed="true" stroke="#ff0000" width="1.2" />
+      <line cap="butt" fix="true" stroke="#ff0000" width="1.2" />
       <area fill="#880000ff" />
       <caption fill="#ff0000" font-size="15" k="name" stroke="#444444"
         stroke-width="2.0" />
     </rule>
     <rule e="way" k="debug" v="way">
-      <line cap="butt" fixed="true" stroke="#00ffff" width="1.5" />
+      <line cap="butt" fix="true" stroke="#00ffff" width="1.5" />
       <caption fill="#00ffff" font-size="15" k="name" stroke="#444444"
         stroke-width="2.0" />
     </rule>
     <rule e="way" k="debug" v="box">
-      <line cap="butt" fixed="true" stroke="#000000" width="1.5" />
+      <line cap="butt" fix="true" stroke="#000000" width="1.5" />
     </rule>
 
 
diff --git a/src/org/oscim/theme/styles/default.xml b/src/org/oscim/theme/styles/default.xml
index e5bd1abf..960a43f8 100644
--- a/src/org/oscim/theme/styles/default.xml
+++ b/src/org/oscim/theme/styles/default.xml
@@ -60,7 +60,7 @@
   <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" fix="true"
     stipple="4" stipple-width="0.6" stipple-stroke="#d35c48" />
   <style-line name="highway:cycleway" from="footway" width="0.1"
     stipple-stroke="#4040ee" />
@@ -76,10 +76,10 @@
   <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"
+  <style-line name="steps" stroke="#aaffffff" width="4.2" cap="butt" fix="true"
     stipple="2" stipple-width="1.0" stipple-stroke="#be6253" />
 
-  <style-line name="water:outline" stroke="#a4bbcc" width="1.0" fixed="true"
+  <style-line name="water:outline" stroke="#a4bbcc" width="1.0" fix="true"
     cap="butt" />
 
   <style-line name="water" stroke="#a4bbcc" width="1.0" cap="butt" />
@@ -88,73 +88,72 @@
   <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" fix="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="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/> -->
+  <!-- <style-line name="building" stroke="#d0cec8" width="1.0" fix="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"
+  <style-line name="building" stroke="#b7b6b3" width="1.0" fix="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="*">
-
-
+  <rule e="way">
 
     <!-- landuse base -->
-    <rule e="way" k="landuse" v="*">
-      <rule e="way" k="*" v="urban">
+    <rule k="landuse">
+      <rule v="urban">
         <area fill="#f4f3f0" />
       </rule>
-      <rule e="way" k="*" v="residential">
+      <rule v="residential">
         <use-area name="residential" />
       </rule>
     </rule>
 
-    <rule e="way" k="natural" v="grassland|scrub" zoom-min="10">
+    <rule 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"
+    <rule k="landuse">
+      <rule zoom-min="10"
         v="farmland|farm|orchard|vineyard|greenhouse_horticulture|plant_nursery">
         <use-area name="farmland" />
       </rule>
 
-      <rule e="way" k="*" v="quarry">
+      <rule v="quarry">
         <use-area name="quarry" />
       </rule>
 
 
 
-      <!-- <rule e="way" k="*" v="farmyard|retail|commercial|industrial;retail">
+      <!-- <rule v="farmyard|retail|commercial|industrial;retail">
         <use-area name="residential" />
         </rule> -->
 
-      <rule e="way" k="*" v="industrial|railway">
+      <rule v="industrial|railway">
         <use-area name="railway|industrial" />
       </rule>
 
-      <!-- <rule e="way" k="*" v="military">
+      <!-- <rule v="military">
         <use-area name="military"/>
         </rule> -->
 
-      <!--<rule e="way" k="landuse" v="construction|greenfield"> <area fill="#a47c41"
+      <!--<rule 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 k="landuse" v="garages"> <area fill="#d6d6e4" /> </rule> -->
     </rule>
 
 
 
-    <rule e="way" k="landuse|natural|leisure||amenity|tourism" v="*">
+    <rule k="landuse|natural|leisure||amenity|tourism" v="*">
       <!-- kind of more like landuse imho -->
-      <rule e="way" k="leisure|landuse" v="nature_reserve">
+      <rule 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 zoom-min="14">
+          <line stroke="#abe29c" width="1.0" fix="true" cap="butt" />
         </rule>
       </rule>
 
@@ -162,158 +161,158 @@
       <!-- 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 k="tourism" v="*">
+        <!-- <rule k="tourism" v="attraction"> <area fill="#f2caea" /> </rule> -->
 
-        <rule e="way" k="tourism" v="zoo|picnic_site|caravan_site|camp_site">
+        <rule k="tourism" v="zoo|picnic_site|caravan_site|camp_site">
           <area fill="#c0d69a" />
         </rule>
       </rule>
 
       <!-- amenity -->
-      <rule e="way" k="amenity" v="*">
-        <rule e="way" k="*" v="kindergarten|school|college|university" zoom-min="15">
+      <rule k="amenity" v="*">
+        <rule 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" fix="true" cap="butt" fade="15" />
         </rule>
 
-        <rule e="way" k="*" v="hospital" zoom-min="14">
+        <rule v="hospital" zoom-min="14">
           <area fill="#e6e4c5" />
         </rule>
 
-        <!-- <rule e="way" k="*" v="parking" zoom-min="15">
+        <!-- <rule v="parking" zoom-min="15">
           <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
           </rule>
 
-          <rule e="way" k="*" v="fountain" closed="yes">
+          <rule 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">
+      <rule k="landuse" zoom-min="11">
         <!-- how about 'leisure' for this one? -->
-        <rule e="way" k="*" v="cemetery">
+        <rule v="cemetery">
           <use-area name="park" />
         </rule>
 
       </rule>
 
-      <rule e="way" k="landuse" v="village_green|recreation_ground">
+      <rule k="landuse" v="village_green|recreation_ground">
         <use-area name="greens" />
       </rule>
 
-      <rule e="way" k="landuse" v="allotments" zoom-min="12">
+      <rule 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">
+      <rule 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">
+      <rule zoom-min="11" v="heath|sand">
         <area fill="#fffad1" fade="11" />
       </rule>
 
-      <rule e="way" k="landuse" v="forest">
+      <rule k="landuse" v="forest">
         <use-area name="forest|wood" />
       </rule>
 
-      <rule e="way" k="natural" v="wood">
+      <rule k="natural" v="wood">
         <use-area name="forest|wood" />
-        <!-- <line stroke="#abcfab" width="1.5" fixed="true" cap="butt"/> -->
+        <!-- <line stroke="#abcfab" width="1.5" fix="true" cap="butt"/> -->
       </rule>
 
 
       <!-- keep grass above forest:wood and leisure:park! -->
       <!-- http://wiki.openstreetmap.org/wiki/Proposed_features/conservation,
         often serves as background for leisure=nature_reserve -->
-      <rule e="way" k="landuse" v="grass|meadow|conservation">
+      <rule k="landuse" v="grass|meadow|conservation">
         <use-area name="greens" />
       </rule>
 
-      <rule e="way" k="leisure" v="garden">
+      <rule 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 k="leisure" v="track">
+        <line stroke="#c1bcb6" width="1.3" cap="butt" fix="true" />
       </rule>
 
       <!-- amenity -->
-      <rule e="way" k="amenity" v="*">
-        <!--<rule e="way" k="*" v="kindergarten|school|college|university" zoom-min="15">
+      <rule k="amenity" v="*">
+        <!--<rule 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"/>
+          <line stroke="#9aabae" width="1.0" fix="true" cap="butt" fade="15"/>
           </rule>
 
-          <rule e="way" k="*" v="hospital" zoom-min="14">
+          <rule v="hospital" zoom-min="14">
           <area fill="#e6e4c5" />
           </rule>
         -->
-        <rule e="way" k="*" v="parking" zoom-min="15">
+        <rule v="parking" zoom-min="15">
           <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
         </rule>
 
-        <rule e="way" k="*" v="fountain" closed="yes">
+        <rule 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 k="natural" v="coastline">
+        <line stroke="#a4bbcc" width="1.2" fix="true" />
         </rule> -->
 
       <!-- natural -->
-      <rule e="way" k="natural" v="*" zoom-min="10">
+      <rule k="natural" zoom-min="10">
 
-        <rule e="way" k="*" v="glacier">
+        <rule v="glacier">
           <area fill="#fafaff" />
         </rule>
-        <rule e="way" k="*" v="land">
+        <rule v="land">
           <area fill="#f8f8f8" />
         </rule>
-        <rule e="way" k="*" v="beach">
+        <rule v="beach">
           <area fill="#f7f5c8" />
         </rule>
 
-        <rule e="way" k="*" v="marsh|wetland|mud">
+        <rule v="marsh|wetland|mud">
           <use-area name="greens2" />
         </rule>
       </rule>
 
 
       <!-- leisure -->
-      <rule e="way" k="leisure" v="*" zoom-min="13">
+      <rule k="leisure" zoom-min="13">
 
-        <rule e="way" k="*" v="stadium">
-          <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" />
+        <rule v="stadium">
+          <line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" />
           <area fill="#e9e6e3" />
         </rule>
 
         <!--should be under playing field -->
-        <rule e="way" k="*" zoom-min="14" v="sports_centre|water_park">
+        <rule 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">
+        <rule zoom-min="15" v="playground|miniature_golf">
           <area fill="#f4f4de" />
-          <line stroke="#d9d9a3" width="1.0" fixed="true" cap="butt" />
+          <line stroke="#d9d9a3" width="1.0" fix="true" cap="butt" />
         </rule>
 
-        <rule e="way" k="*" v="playing_fields|pitch">
+        <rule v="playing_fields|pitch">
           <area fill="#f4f4de" />
-          <line stroke="#d9d9a3" width="1.0" fixed="true" cap="butt" />
+          <line stroke="#d9d9a3" width="1.0" fix="true" cap="butt" />
         </rule>
 
-        <rule e="way" k="*" v="swimming_pool">
+        <rule 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">
+        <!-- <rule v="track"> <rule 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> -->
@@ -323,13 +322,13 @@
       <!-- 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 k="leisure|landuse" zoom-min="14">
 
-        <rule e="way" k="*" v="nature_reserve">
-          <line stroke="#abe29c" width="1.0" fixed="true" cap="butt" />
+        <rule v="nature_reserve">
+          <line stroke="#abe29c" width="1.0" fix="true" cap="butt" />
         </rule>
 
-        <rule e="way" k="*" v="military">
+        <rule v="military">
           <use-line name="fence" />
         </rule>
       </rule>
@@ -337,89 +336,89 @@
 
 
 
-      <rule e="way" k="natural" v="water">
+      <rule k="natural" v="water">
         <use-area name="water" />
         <use-line name="water:outline" />
       </rule>
 
-      <rule e="way" k="landuse" v="reservoir|basin">
+      <rule k="landuse" v="reservoir|basin">
         <use-area name="water" />
       </rule>
     </rule> <!-- end landuse|natural|leisure||amenity|tourism -->
 
 
     <!-- waterways -->
-    <rule e="way" k="waterway" v="*">
+    <rule k="waterway" v="*">
 
-      <rule e="way" k="waterway" v="ditch|drain" zoom-min="14">
-        <use-line name="water" width="0.1" fixed="true" />
+      <rule k="waterway" v="ditch|drain" zoom-min="14">
+        <use-line name="water" width="0.1" fix="true" />
       </rule>
 
-      <rule e="way" k="waterway" v="canal">
+      <rule 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.2" fixed="true" />
+      <rule k="waterway" v="stream" zoom-min="14">
+        <use-line name="water" width="0.2" fix="true" />
       </rule>
 
-      <rule e="way" k="waterway" v="river">
-        <rule e="way" k="*" v="*" zoom-min="12">
+      <rule k="waterway" v="river">
+        <rule zoom-min="12">
           <use-line name="water" width="0.3" />
         </rule>
-        <rule e="way" k="*" v="*" zoom-max="11">
-          <rule e="way" k="width" v="0|1|2">
-            <use-line name="water" width="0.3" fixed="true" fade="2" />
+        <rule zoom-max="11">
+          <rule k="width" v="0|1|2">
+            <use-line name="water" width="0.3" fix="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 k="width" v="3" zoom-min="3">
+            <use-line name="water" width="0.3" fix="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 k="width" v="4" zoom-min="4">
+            <use-line name="water" width="0.3" fix="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 k="width" v="5" zoom-min="5">
+            <use-line name="water" width="0.3" fix="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 k="width" v="6" zoom-min="6">
+            <use-line name="water" width="0.2" fix="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 k="width" v="7" zoom-min="7">
+            <use-line name="water" width="0.2" fix="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 k="width" v="8" zoom-min="8">
+            <use-line name="water" width="0.1" fix="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 k="width" v="9" zoom-min="9">
+            <use-line name="water" width="0.1" fix="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 k="width" v="-1" zoom-min="9">
+            <use-line name="water" width="0.2" fix="true" fade="9" />
           </rule>
         </rule>
       </rule>
 
-      <rule e="way" k="waterway" v="riverbank|dock">
+      <rule k="waterway" v="riverbank|dock">
         <use-area name="water" />
         <use-line name="water:outline" />
       </rule>
 
-      <rule e="way" k="waterway" v="weir">
-        <line stroke="#000088" width="1.0" fixed="true" cap="butt" />
+      <rule k="waterway" v="weir">
+        <line stroke="#000088" width="1.0" fix="true" cap="butt" />
       </rule>
 
-      <rule e="way" k="waterway" v="dam" zoom-min="12">
+      <rule 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" />
+        <line stroke="#ababab" width="1.2" cap="butt" fix="true" />
       </rule>
 
-      <rule e="way" k="lock" v="yes|true">
+      <rule 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">
+    <!-- <rule k="sport" v="*"> <rule k="sport" v="soccer"
+      zoom-min="17"> <rule 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> -->
@@ -432,100 +431,100 @@
     <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">
+    <rule k="tunnel" v="yes" 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">
+      <rule k="highway" v="*">
+        <rule zoom-min="16">
+          <rule v="steps">
             <use-line name="steps" />
             <!-- <use-outline name="0"/> -->
           </rule>
-          <!-- <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="16">
+          <!-- <rule 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">
+        <rule zoom-min="14">
+          <rule v="footway">
             <use-line name="footway" />
           </rule>
 
-          <rule e="way" k="*" v="cycleway">
+          <rule v="cycleway">
             <use-line name="highway:cycleway" />
           </rule>
 
-          <rule e="way" k="*" v="track">
+          <rule v="track">
             <use-line name="highway:track" />
           </rule>
 
-          <rule e="way" k="*" v="path">
+          <rule v="path">
             <use-line name="highway:path" />
           </rule>
 
-          <rule e="way" k="*" v="bridleway">
+          <rule v="bridleway">
             <use-line name="bridleway" />
           </rule>
 
-          <rule e="way" k="*" v="construction">
+          <rule v="construction">
             <use-line name="construction" />
             <use-outline name="0" />
           </rule>
 
-          <rule e="way" k="*" v="service">
-            <rule e="way" k="service" v="~|parking_aisle">
+          <rule v="service">
+            <rule 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">
+        <rule 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">
+        <rule zoom-min="13">
+          <rule 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 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">
+        <rule 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">
+        <rule 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">
+        <rule v="primary">
           <use-line name="primary:z11" />
           <use-outline name="0" />
           <use-text name="major-road" />
         </rule>
 
-        <rule e="way" k="*" v="trunk">
+        <rule 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">
+        <rule v="motorway">
           <use-line name="highway:z11" blur="0.3" />
           <use-outline name="0" />
           <!-- <use-outline name="glow"/> -->
@@ -534,63 +533,63 @@
       </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 k="railway">
+        <!-- <rule k="railway" v="tram|subway|light_rail|narrow_gauge">
+          <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
           </rule> -->
-        <rule e="way" k="railway" v="rail">
-          <line stroke="#aa888888" width="0.9" cap="butt" fixed="true" />
+        <rule k="railway" v="rail">
+          <line stroke="#aa888888" width="0.9" cap="butt" fix="true" />
         </rule>
       </rule>
     </rule>   <!-- end tunnel -->
 
 
     <!-- platform cores -->
-    <rule e="way" k="highway|railway|public_transport" v="platform">
-      <rule e="way" k="*" v="*" closed="yes">
+    <rule k="highway|railway|public_transport" v="platform">
+      <rule closed="yes">
         <area fill="#dbdbc9" />
       </rule>
 
-      <rule e="way" k="*" v="*" closed="no">
+      <rule closed="no">
         <line stroke="#dbdbc9" width="0.3" />
       </rule>
     </rule>
 
 
     <!-- runways areas -->
-    <rule e="way" k="aeroway" v="*">
-      <rule e="way" k="*" v="aerodrome" closed="yes">
+    <rule k="aeroway" v="*">
+      <rule v="aerodrome" closed="yes">
         <area fill="#e8ecde" />
       </rule>
       <!-- A place where planes are parked -->
-      <rule e="way" k="*" v="apron">
+      <rule v="apron">
         <area fill="#f0f0f0" />
       </rule>
       <!-- Airport passenger building -->
-      <rule e="way" k="*" v="terminal|hangar">
+      <rule v="terminal|hangar">
         <use-line name="building" />
         <use-area name="building" />
       </rule>
     </rule>
 
     <!-- turning circles -->
-    <!-- <rule e="node" k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
+    <!-- <rule k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
       fill="#707070" />
       </rule> -->
 
     <!-- building -->
-    <rule e="way" k="building" v="*">
+    <rule k="building" v="*">
 
-      <rule e="way" k="*" v="*" zoom-min="14" zoom-max="16">
-          <rule e="way" k="*" v="*" closed="yes">
-        <use-area name="building" fade="14" />
+      <rule zoom-min="14" zoom-max="16">
+        <rule closed="yes">
+          <use-area name="building" fade="14" />
         </rule>
         <use-line name="building" fade="14" />
-        <!-- <line stroke="#c9c3c1" width="1.0" fixed="true" cap="butt" fade="15"/>
+        <!-- <line stroke="#c9c3c1" width="1.0" fix="true" cap="butt" fade="15"/>
           <area fill="#e9e6e3" fade="15" /> -->
       </rule>
 
-      <rule e="way" k="*" v="*" zoom-min="17">
+      <rule 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"
@@ -607,171 +606,176 @@
 
 
     <!-- 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">
-            <line stroke="#f2df6d" width="1.3" cap="butt" fixed="true" fade="9"/>
+    <rule k="highway" v="*">
+      <rule zoom-min="3" zoom-max="5">
+        <rule k="area" v="~|no|false">
+          <!-- <rule v="secondary|primary_link" zoom-min="9">
+            <line stroke="#f2df6d" width="1.3" cap="butt" fix="true" fade="9"/>
             </rule> -->
 
-          <rule e="way" k="*" v="route_primary" zoom-min="3">
-            <line stroke="#c6c5a2" width="1.4" cap="butt" fixed="true" fade="3" />
+          <rule v="route_primary" zoom-min="3">
+            <line stroke="#c6c5a2" width="1.4" cap="butt" fix="true" fade="3" />
           </rule>
 
-          <rule e="way" k="*" v="route_trunk" zoom-min="3">
-            <line stroke="#c6c5a2" width="1.4" cap="butt" fixed="true" fade="3" />
+          <rule v="route_trunk" zoom-min="3">
+            <line stroke="#c6c5a2" width="1.4" cap="butt" fix="true" fade="3" />
           </rule>
 
-          <rule e="way" k="*" v="route_motorway">
-            <line stroke="#deb683" width="1.5" cap="butt" fixed="true" fade="3" />
+          <rule v="route_motorway">
+            <line stroke="#deb683" width="1.5" cap="butt" fix="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="*" v="secondary|primary_link" zoom-min="9">
-            <line stroke="#e2cf5d" width="1.3" cap="butt" fixed="true" fade="9" />
+      <rule zoom-min="5" zoom-max="10">
+        <rule k="area" v="~|no|false">
+          <rule v="secondary|primary_link" zoom-min="9">
+            <line stroke="#e2cf5d" width="1.3" cap="butt" fix="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" />
+          <rule v="trunk_link|motorway_link" zoom-min="8">
+            <line stroke="#eec693" width="1.4" cap="butt" fix="true" fade="8" />
           </rule>
 
-          <rule e="way" k="*" v="primary" zoom-min="5">
-            <line stroke="#c6c5a2" width="1.5" cap="butt" fixed="true" fade="5" />
+          <rule v="primary" zoom-min="5">
+            <line stroke="#c6c5a2" width="1.5" cap="butt" fix="true" fade="5" />
           </rule>
 
-          <rule e="way" k="*" v="trunk" zoom-min="5">
-            <line stroke="#c6c5a2" width="1.5" cap="butt" fixed="true" fade="5" />
+          <rule v="trunk" zoom-min="5">
+            <line stroke="#c6c5a2" width="1.5" cap="butt" fix="true" fade="5" />
           </rule>
 
-          <rule e="way" k="*" v="motorway">
-            <line stroke="#deb683" width="1.6" cap="butt" fixed="true" fade="3" />
+          <rule v="motorway">
+            <line stroke="#deb683" width="1.6" cap="butt" fix="true" fade="3" />
           </rule>
         </rule>
       </rule>
 
-      <rule e="way" k="*" v="*" zoom-min="11">
-        <rule e="way" k="tunnel|bridge" v="~|no|false">
+      <rule zoom-min="11">
+        <!-- when tunnel|bridge is present it must be 'no' -->
+        <rule k="tunnel|bridge" v="~|no">
+
           <!-- 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">
+          <rule k="area" v="yes|true">
+            <rule k="tunnel|bridge" v="~|no">
+              <rule v="footway" zoom-min="15">
                 <area fill="#fefefe" />
-                <line stroke="#c0c0c0" width="1.0" fixed="true" cap="butt" />
+                <line stroke="#c0c0c0" width="1.0" fix="true" cap="butt" />
               </rule>
 
-              <rule e="way" k="*" zoom-min="13"
+              <rule zoom-min="13"
                 v="pedestrian|service|unclassified|residential|road|living_street">
+
                 <area fill="#ffffff" />
-                <line stroke="#d0d0d0" width="1.0" fixed="true" cap="butt" />
+                <line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
               </rule>
 
-              <!-- <rule e="way" k="*" v="path" zoom-min="14">
+              <!-- <rule 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">
+          <rule k="area" v="~|no|false">
+            <rule zoom-min="16">
+              <rule 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">
+              <!-- <rule 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">
+              <rule 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">
+            <rule zoom-min="14">
+              <rule v="footway">
                 <use-line name="footway" />
               </rule>
 
-              <rule e="way" k="*" v="cycleway">
+              <rule v="cycleway">
                 <use-line name="highway:cycleway" />
               </rule>
 
-              <rule e="way" k="*" v="track">
+              <rule v="track">
                 <use-line name="highway:track" />
               </rule>
 
-              <rule e="way" k="*" v="path">
+              <rule v="path">
                 <use-line name="highway:path" />
               </rule>
 
-              <rule e="way" k="*" v="bridleway">
+              <rule v="bridleway">
                 <use-line name="bridleway" />
               </rule>
 
-              <rule e="way" k="*" v="construction">
+              <rule 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">
+              <rule v="service">
+                <!-- matches every service but parking_isle -->
+                <rule 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">
+
+                <rule k="service" v="parking_aisle" zoom-min="16">
                   <use-line name="highway-service" width="-0.4" />
                   <use-outline name="1" />
                 </rule>
               </rule>
             </rule>
 
-            <rule e="way" k="*" v="trunk_link|motorway_link">
+            <rule 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">
+            <rule zoom-min="13">
+              <rule 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 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">
+            <rule 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">
+            <rule 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">
+            <rule v="primary">
               <use-line name="primary:z11" />
               <use-outline name="primary" />
               <use-text name="major-road" />
             </rule>
 
-            <rule e="way" k="*" v="trunk">
+            <rule v="trunk">
               <use-line name="trunk" />
               <use-outline name="motorway" />
               <use-text name="major-road" />
             </rule>
 
-            <rule e="way" k="*" v="motorway">
+            <rule v="motorway">
               <use-line name="highway:z11" />
               <use-outline name="motorway" />
               <use-text name="major-road" />
@@ -780,95 +784,96 @@
         </rule> <!-- end tunnel|bridge=~|no|false -->
 
 
-        <rule e="way" k="bridge" v="yes|true|viaduct|suspension">
-          <rule e="way" k="area" v="~|no|false">
+        <rule k="bridge" v="yes|true|viaduct|suspension">
+        <!--<rule k="bridge" v="\|no|false">-->
+          <rule 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">
+            <rule zoom-min="16">
+              <rule v="steps">
                 <use-line name="steps" />
                 <!-- <use-outline name="bridge"/> -->
               </rule>
             </rule>
-            <rule e="way" k="*" v="track|footway|path|cycleway" zoom-min="15">
+            <rule 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">
+            <rule zoom-min="14">
+              <rule v="footway">
                 <use-line name="footway" />
               </rule>
-              <rule e="way" k="*" v="cycleway">
+              <rule v="cycleway">
                 <use-line name="highway:cycleway" />
               </rule>
-              <rule e="way" k="*" v="track">
+              <rule v="track">
                 <use-line name="highway:track" />
               </rule>
-              <rule e="way" k="*" v="path">
+              <rule v="path">
                 <use-line name="highway:path" />
               </rule>
-              <rule e="way" k="*" v="bridleway">
+              <rule v="bridleway">
                 <use-line name="bridleway" />
               </rule>
 
-              <rule e="way" k="*" v="construction">
+              <rule v="construction">
                 <use-line name="construction" cap="square" />
                 <use-outline name="bridge" />
               </rule>
 
-              <rule e="way" k="*" v="service">
+              <rule 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">
+            <rule zoom-min="13">
+              <rule 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">
+              <rule 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="tertiary|secondary_link">
+            <rule 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_link|motorway_link">
+            <rule 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="secondary|primary_link">
+            <rule 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">
+            <rule 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">
+            <rule v="trunk">
               <use-line name="trunk" cap="square" />
               <use-outline name="bridge" />
               <use-text name="major-road" />
             </rule>
 
-            <rule e="way" k="*" v="motorway">
+            <rule v="motorway">
               <use-line name="highway:z11" cap="square" />
               <use-outline name="bridge" />
               <use-text name="major-road" />
@@ -876,19 +881,19 @@
           </rule> <!-- end area=~|no|false -->
 
           <!-- highway area -->
-          <rule e="way" k="area" v="yes|true">
-            <rule e="way" k="*" v="footway" zoom-min="15">
+          <rule k="area" v="yes|true">
+            <rule v="footway" zoom-min="15">
               <area fill="#fefefe" />
               <line stroke="#c0c0c0" width="0.15" cap="butt" />
             </rule>
 
-            <rule e="way" k="*" zoom-min="13"
+            <rule zoom-min="13"
               v="pedestrian|service|unclassified|residential|road|living_street">
               <area fill="#ffffff" />
-              <line stroke="#d0d0d0" width="1.0" fixed="true" cap="butt" />
+              <line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
             </rule>
 
-            <!-- <rule e="way" k="*" v="path" zoom-min="14">
+            <!-- <rule v="path" zoom-min="14">
               <area fill="#d0d0d0" />
               </rule> -->
           </rule>  <!-- end area=yes|true -->
@@ -898,145 +903,145 @@
 
 
     <!-- runways cores -->
-    <rule e="way" k="aeroway" v="*">
-      <rule e="way" k="*" v="runway">
+    <rule k="aeroway" v="*">
+      <rule v="runway">
         <use-line name="aeroway:runway" />
       </rule>
-      <rule e="way" k="*" v="taxiway">
+      <rule v="taxiway">
         <use-line name="aeroway:runway" width="-0.8" />
       </rule>
     </rule>
 
 
     <!-- man_made features -->
-    <!-- <rule e="way" k="man_made" v="pier">
-      <rule e="way" k="*" v="*" closed="no">
+    <!-- <rule k="man_made" v="pier">
+      <rule closed="no">
       <line stroke="#d0d0d0" width="0.4" cap="butt" />
       <line stroke="#e4e4e4" width="0.3" cap="butt" />
       </rule>
-      <rule e="way" k="*" v="*" closed="yes">
+      <rule closed="yes">
       <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
       </rule>
       </rule> -->
 
 
     <!-- barriers -->
-    <rule e="way" k="barrier" v="*">
-      <!-- <rule e="way" k="*" v="fence|wall|city_wall" zoom-min="15"> <line
+    <rule k="barrier" v="*">
+      <!-- <rule 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="1.1" fixed="true" cap="butt" />
+      <rule v="retaining_wall" zoom-min="15">
+        <line stroke="#888888" width="1.1" fix="true" cap="butt" />
       </rule>
     </rule>
 
 
     <!-- non-physical routes -->
-    <!-- <rule e="way" k="route" v="ferry"> <line stroke="#707070" width="0.3"
+    <!-- <rule 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
+    <!-- <rule k="aerialway" v="*"> <line stroke="#202020" width="0.4"
+      cap="butt" /> <rule 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"
+      /> </rule> <rule k="aerialway" v="chair_lift"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/chair_lift_2.png"
+      /> </rule> <rule k="aerialway" v="gondola"> <lineSymbol src="jar:/org/mapsforge/android/maps/rendertheme/osmarender/symbols/gondola.png"
+      /> </rule> <rule zoom-min="14"> <text k="name" font-style="bold"
       font-size="10" fill="#606060" stroke="#ffffff" width="2.0" /> </rule>
       </rule> -->
 
 
     <!-- railway (no tunnel) -->
-    <rule e="way" k="railway" v="*" zoom-min="12">
-      <rule e="way" k="tunnel" v="~|false|no">
+    <rule k="railway" zoom-min="12">
+      <rule k="tunnel" v="~|false|no">
 
-        <rule e="way" k="railway" v="station">
+        <rule k="railway" v="station">
           <area fill="#dbdbc9" stroke="#707070" stroke-width="0.3" />
         </rule>
 
         <!-- railway bridge casings -->
-        <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" />
+        <rule zoom-min="14">
+          <rule k="bridge" v="yes|true">
+            <rule k="railway" v="tram">
+              <line stroke="#777777" width="0.9" cap="butt" fix="true" />
             </rule>
-            <rule e="way" k="railway" v="subway|light_rail|narrow_gauge">
-              <line stroke="#777777" width="0.9" cap="butt" fixed="true" />
+            <rule k="railway" v="subway|light_rail|narrow_gauge">
+              <line stroke="#777777" width="0.9" cap="butt" fix="true" />
             </rule>
-            <rule e="way" k="railway" v="rail">
-              <line stroke="#777777" width="0.9" cap="butt" fixed="true" />
+            <rule k="railway" v="rail">
+              <line stroke="#777777" width="0.9" cap="butt" fix="true" />
             </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" />
+        <rule k="railway" v="tram" zoom-min="15">
+          <line stroke="#887766" width="1.0" fix="true" />
         </rule>
 
-        <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 k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
+          <line stroke="#a0a0a0" width="0.9" cap="butt" fix="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 k="railway" v="rail|turntable" zoom-max="14">
+          <line stroke="#ddaa9988" width="1.0" cap="butt" fix="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"
+        <rule k="railway" v="rail|turntable" zoom-min="15">
+          <line stroke="#aaa6a4" width="2.0" cap="butt" fix="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">
+        <!-- <rule k="railway" v="rail" zoom-max="14" zoom-min="13">
           <line stroke="#8888aa" width="0.6" cap="butt"
-          fixed="true" />
+          fix="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 k="railway" v="rail" zoom-max="13" zoom-min="11">
+          <line stroke="#bbbbcc" width="0.8" cap="butt" fix="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 k="railway" v="disused|spur|abandoned|preserved">
+          <line stroke="#cccccc" width="0.8" cap="butt" fix="true" fade="12" />
         </rule>
       </rule>
     </rule>
 
 
     <!-- non-physical boundaries -->
-    <!-- <rule e="way" k="boundary" v="*"> <rule e="way" k="boundary" v="national_park">
+    <!-- <rule k="boundary" v="*"> <rule 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">
+    <rule 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> -->
-      <rule e="way" k="admin_level" v="4">
-        <line stroke="#ffffff" width="1.1" fixed="true" cap="butt" stipple-width="1.05"
+    <!--<rule k="boundary" v="administrative"> -->
+    <rule k="admin_level" v="*">
+      <!-- <rule k="admin_level" v="11"> <line stroke="#f9574b" width="0.1"
+        fix="true" cap="butt" /> </rule> <rule k="admin_level"
+        v="10"> <line stroke="#f9574b" width="0.1" fix="true" cap="butt"
+        /> </rule> <rule k="admin_level" v="9"> <line stroke="#f9574b" width="0.1"
+        fix="true" cap="butt" /> </rule> <rule k="admin_level"
+        v="8"> <line stroke="#f9574b" width="0.3" fix="true" cap="butt"
+        /> </rule> <rule k="admin_level" v="7"> <line stroke="#f9574b" width="0.1"
+        fix="true" cap="butt" /> </rule> <rule k="admin_level"
+        v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt"
+        /> </rule> <rule k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
+        fix="true" cap="butt" /> </rule> -->
+      <rule k="admin_level" v="4">
+        <line stroke="#ffffff" width="1.1" fix="true" cap="butt" stipple-width="1.05"
           stipple="4" stipple-stroke="#606060" />
 
       </rule>
-      <rule e="way" k="admin_level" v="3">
-        <line stroke="#ffffff" width="1.1" fixed="true" cap="butt" stipple-width="1.05"
+      <rule k="admin_level" v="3">
+        <line stroke="#ffffff" width="1.1" fix="true" cap="butt" stipple-width="1.05"
           stipple="6" stipple-stroke="#606060" />
       </rule>
-      <rule e="way" k="admin_level" v="2">
-        <line stroke="#606060" width="1.2" fixed="true" cap="butt" />
+      <rule k="admin_level" v="2">
+        <line stroke="#606060" width="1.2" fix="true" cap="butt" />
       </rule>
-      <!-- <rule e="way" k="admin_level" v="1">
-        <line stroke="#ff0000" width="0.95" fixed="true" cap="butt" />
+      <!-- <rule k="admin_level" v="1">
+        <line stroke="#ff0000" width="0.95" fix="true" cap="butt" />
         </rule> -->
 
     </rule>
@@ -1044,90 +1049,90 @@
 
 
     <!-- historic -->
-    <!-- <rule e="way" k="historic" v="ruins" zoom-min="17">
+    <!-- <rule 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> -->
 
     <!-- place -->
-    <rule e="way" k="place" v="locality" zoom-min="17">
+    <rule k="place" v="locality" zoom-min="17">
       <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" />
+    <rule k="debug" v="area">
+      <line stroke="#ff0000" width="1.2" fix="true" cap="butt" />
       <area fill="#880000ff" />
       <caption k="name" font-size="15" fill="#ff0000" stroke="#444444"
         stroke-width="2.0" />
     </rule>
-    <rule e="way" k="debug" v="way">
-      <line stroke="#00ffff" width="1.5" fixed="true" cap="butt" />
+    <rule k="debug" v="way">
+      <line stroke="#00ffff" width="1.5" fix="true" cap="butt" />
       <caption k="name" font-size="15" fill="#00ffff" stroke="#444444"
         stroke-width="2.0" />
     </rule>
-    <rule e="way" k="debug" v="box">
-      <line stroke="#000000" width="1.5" fixed="true" cap="butt" />
+    <rule k="debug" v="box">
+      <line stroke="#000000" width="1.5" fix="true" cap="butt" />
     </rule>
 
     <!-- HACK!!! render building models last -->
-    <rule e="way" k="building" v="*" zoom-min="17">
+    <rule k="building" zoom-min="17">
       <use-area name="building" fade="15" />
     </rule>
-  </rule>
+  </rule> <!-- end e="way" -->
 
-  <rule e="node" k="*" v="*">
+  <rule e="node">
     <!-- barrier -->
-    <rule e="node" k="barrier" v="bollard">
+    <rule k="barrier" v="bollard">
       <circle r="1.5" fill="#909090" />
     </rule>
 
-    <rule e="node" k="debug" v="*">
+    <rule 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 k="highway" v="*"> <rule 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
+    <!-- <rule k="historic" v="*"> <circle r="3" fill="#4040ff" stroke="#606060"
+      width="1.5" /> <rule 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
+    <!-- <rule k="addr:housenumber" zoom-min="18"> <caption
       k="addr:housenumber" font-style="bold" font-size="10" fill="#606060" stroke="#ffffff"
       width="2.0" /> </rule> -->
 
 
 
     <!-- place -->
-    <rule e="node" k="place" v="*">
-      <rule e="node" k="*" v="suburb" zoom-max="14">
+    <rule k="place">
+      <rule v="suburb" zoom-max="14">
         <caption k="name" font-style="italic" font-size="17" fill="#606060"
           stroke="#ffffff" stroke-width="2.0" priority="4" />
       </rule>
-      <rule e="node" k="*" v="village" zoom-max="14">
+      <rule v="village" zoom-max="14">
         <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">
+      <rule v="island" zoom-min="10">
         <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">
+      <rule v="town">
         <caption k="name" font-size="19" fill="#000000" stroke="#ffffff"
           stroke-width="2.0" priority="2" />
       </rule>
 
-      <rule e="node" k="*" v="city">
+      <rule v="city">
         <caption k="name" font-style="bold" font-size="19" fill="#000000" stroke="#ffffff"
           stroke-width="2.0" priority="1" />
       </rule>
-      <rule e="node" k="*" v="country">
+      <rule v="country">
         <caption k="name" font-style="bold" font-size="20" fill="#000000" stroke="#ffffff"
           stroke-width="2.0" priority="0" />
       </rule>
@@ -1135,13 +1140,13 @@
 
 
     <!-- railway -->
-    <rule e="node" k="railway" v="*">
-      <rule e="node" k="*" v="station" zoom-min="14">
+    <rule k="railway" v="*">
+      <rule 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" /> -->
       </rule>
-      <rule e="node" k="*" v="halt|tram_stop" zoom-min="17">
+      <rule 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" /> -->
@@ -1149,159 +1154,159 @@
     </rule>
 
     <!-- aeroway -->
-    <rule e="node" k="aeroway" v="*">
-      <rule e="node" k="aeroway" v="helipad" zoom-min="17">
+    <rule k="aeroway" v="*">
+      <rule 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">
+      <rule 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">
+      <rule k="amenity" v="*">
+      <rule k="amenity" v="atm" zoom-min="17">
       <symbol src="jar:symbols/atm.png" />
       </rule>
-      <rule e="node" k="amenity" v="bank" zoom-min="17">
+      <rule k="amenity" v="bank" zoom-min="17">
       <symbol src="jar:symbols/bank.png" />
       </rule>
-      <rule e="node" k="amenity" v="bench" zoom-min="17">
+      <rule 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">
+      <rule 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">
+      <rule 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">
+      <rule k="amenity" v="cafe" zoom-min="17">
       <symbol src="jar:symbols/cafe.png" />
       </rule>
-      <rule e="node" k="amenity" v="cinema" zoom-min="17">
+      <rule 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">
+      <rule 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">
+      <rule 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">
+      <rule 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">
+      <rule k="amenity" v="fountain" zoom-min="17">
       <symbol src="jar:symbols/fountain.png" />
       </rule>
-      <rule e="node" k="amenity" v="fuel" zoom-min="17">
+      <rule k="amenity" v="fuel" zoom-min="17">
       <symbol src="jar:symbols/petrolStation.png" />
       </rule>
-      <rule e="node" k="amenity" v="hospital" zoom-min="15">
+      <rule k="amenity" v="hospital" zoom-min="15">
       <symbol src="jar:symbols/hospital.png" />
       </rule>
-      <rule e="node" k="amenity" v="kindergarten" zoom-min="17">
+      <rule k="amenity" v="kindergarten" zoom-min="17">
       <symbol src="jar:symbols/kindergarten.png" />
       </rule>
-      <rule e="node" k="amenity" v="library" zoom-min="17">
+      <rule k="amenity" v="library" zoom-min="17">
       <symbol src="jar:symbols/library.png" />
       </rule>
-      <rule e="node" k="amenity" v="parking" zoom-min="17">
+      <rule k="amenity" v="parking" zoom-min="17">
       <symbol src="jar:symbols/parking.png" />
       </rule>
-      <rule e="node" k="amenity" v="pharmacy" zoom-min="17">
+      <rule 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">
+      <rule k="amenity" v="place_of_worship" zoom-min="17">
+      <rule k="denomination|religion" v="jewish">
       <symbol src="jar:symbols/synagogue.png" />
       </rule>
-      <rule e="node" k="denomination|religion" v="muslim|moslem">
+      <rule k="denomination|religion" v="muslim|moslem">
       <symbol src="jar:symbols/mosque.png" />
       </rule>
-      <rule e="node" k="denomination|religion" v="christian">
+      <rule k="denomination|religion" v="christian">
       <symbol src="jar:symbols/church.png" />
       </rule>
       </rule>
-      <rule e="node" k="amenity" v="post_box" zoom-min="17">
+      <rule 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">
+      <rule 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">
+      <rule 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">
+      <rule k="amenity" v="recycling" zoom-min="17">
       <symbol src="jar:symbols/recycling.png" />
       </rule>
-      <rule e="node" k="amenity" v="restaurant" zoom-min="17">
+      <rule k="amenity" v="restaurant" zoom-min="17">
       <symbol src="jar:symbols/restaurant.png" />
       </rule>
-      <rule e="node" k="amenity" v="school" zoom-min="17">
+      <rule k="amenity" v="school" zoom-min="17">
       <symbol src="jar:symbols/school.png" />
       </rule>
-      <rule e="node" k="amenity" v="shelter" zoom-min="17">
+      <rule k="amenity" v="shelter" zoom-min="17">
       <symbol src="jar:symbols/shelter.png" />
       </rule>
-      <rule e="node" k="amenity" v="telephone" zoom-min="17">
+      <rule k="amenity" v="telephone" zoom-min="17">
       <symbol src="jar:symbols/telephone.png" />
       </rule>
-      <rule e="node" k="amenity" v="theatre" zoom-min="17">
+      <rule k="amenity" v="theatre" zoom-min="17">
       <symbol src="jar:symbols/theatre.png" />
       </rule>
-      <rule e="node" k="amenity" v="toilets" zoom-min="17">
+      <rule 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">
+      <rule k="amenity" v="university|college" zoom-min="17">
       <symbol src="jar:symbols/university.png" />
       </rule>
 
-      <rule e="node" k="*" v="*" zoom-min="17">
+      <rule 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">
+      <rule k="shop" v="*">
+      <rule k="shop" v="bakery" zoom-min="17">
       <symbol src="jar:symbols/bakery.png" />
       </rule>
-      <rule e="node" k="shop" v="florist" zoom-min="17">
+      <rule 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">
+      <rule k="shop" v="supermarket|organic" zoom-min="17">
       <symbol src="jar:symbols/supermarket.png" />
       </rule>
 
-      <rule e="node" k="*" v="*" zoom-min="17">
+      <rule 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">
+      <rule k="tourism" v="*">
+      <rule 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">
+      <rule 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">
+      <rule k="tourism" v="hostel" zoom-min="17">
       <symbol src="jar:symbols/hostel.png" />
       </rule>
-      <rule e="node" k="tourism" v="hotel" zoom-min="17">
+      <rule k="tourism" v="hotel" zoom-min="17">
       <symbol src="jar:symbols/hotel.png" />
       </rule>
-      <rule e="node" k="tourism" v="information" zoom-min="17">
+      <rule k="tourism" v="information" zoom-min="17">
       <symbol src="jar:symbols/information.png" />
       </rule>
-      <rule e="node" k="tourism" v="viewpoint" zoom-min="15">
+      <rule k="tourism" v="viewpoint" zoom-min="15">
       <symbol src="jar:symbols/viewpoint.png" />
       </rule>
 
-      <rule e="node" k="*" v="*" zoom-min="17">
+      <rule zoom-min="17">
       <caption k="name" font-size="15" fill="#20aa20" stroke="#ffffff" stroke-width="2.0" />
       </rule>
       </rule> -->
diff --git a/src/org/oscim/theme/styles/tronrender.xml b/src/org/oscim/theme/styles/tronrender.xml
index 4e2e7ce1..e5832bba 100644
--- a/src/org/oscim/theme/styles/tronrender.xml
+++ b/src/org/oscim/theme/styles/tronrender.xml
@@ -55,7 +55,7 @@
   <style-line name="highway-service"     from="residential" width="-0.6" />
 
   <!-- track|footway|path|cycleway -->
-  <style-line name="footway"             stroke="#c1bcb6" width="1.2" cap="butt" fixed="true"/>
+  <style-line name="footway"             stroke="#c1bcb6" width="1.2" cap="butt" fix="true"/>
   <style-line name="footway:z16"         from="footway" width="-1.0" fixed="false" fade="-1"/>
   <style-line name="footway:z17"         stroke="#faf8f5" width="0.3"/>
 
@@ -68,11 +68,11 @@
 	<style-line name="water"               stroke="#cca4bbcc" width="0.6" cap="butt" />
   <style-area name="water"               fill="#001223" />
   <!-- 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" fix="true" cap="butt"/>
 
   <style-line name="aeroway:runway"      stroke="#008888" width="1.8" cap="butt" blur="0.7" />
 
-  <style-line name="building"            stroke="#dd888888" width="1.5" fixed="true" cap="butt"/>
+  <style-line name="building"            stroke="#dd888888" width="1.5" fix="true" cap="butt"/>
   <style-area name="building"            fill="#ee202020" fade="15"/>
 
   <!-- ways -->
@@ -117,7 +117,7 @@
 		  <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" />
+		       <line stroke="#abe29c" width="1.0" fix="true" cap="butt" />
 	      </rule>
 	    </rule>
 
@@ -156,7 +156,7 @@
 
 	    <rule e="way" k="natural" v="wood">
 	          <use-area name="forest|wood"/>
-	        <!--  <line stroke="#abcfab" width="1.5" fixed="true" cap="butt"/> -->
+	        <!--  <line stroke="#abcfab" width="1.5" fix="true" cap="butt"/> -->
 	    </rule>
 
 			<!-- keep grass above forest:wood and leisure:park! -->
@@ -170,7 +170,7 @@
 
 
 	    <rule e="way" k="leisure" v="track">
-	       <line stroke="#c1bcb6" width="1.3" cap="butt"  fixed="true" />
+	       <line stroke="#c1bcb6" width="1.3" cap="butt"  fix="true" />
 	    </rule>
 
 	    <!-- amenity -->
@@ -188,7 +188,7 @@
 	    </rule>
 
 	    <!-- <rule e="way" k="natural" v="coastline">
-	      <line stroke="#a4bbcc" width="1.2" fixed="true" />
+	      <line stroke="#a4bbcc" width="1.2" fix="true" />
 	    </rule> -->
 
 	    <!-- natural -->
@@ -203,7 +203,7 @@
 
 	     <!--  <rule e="way" k="*" v="beach">
 	          <area fill="#aaedd400"/>
-	        <line stroke="#fce94f" fixed="true" width="2.8" />
+	        <line stroke="#fce94f" fix="true" width="2.8" />
 	      </rule>-->
 
 	      <rule e="way" k="*" v="marsh|wetland|mud">
@@ -217,7 +217,7 @@
 
 	      <rule e="way" k="*" v="stadium" >
 	        <area fill="#404040"  />
-	          	        <line stroke="#cccccc" width="1.0" fixed="true" cap="butt" />
+	          	        <line stroke="#cccccc" width="1.0" fix="true" cap="butt" />
 	      </rule>
 
 	      <!--should be under playing field -->
@@ -227,12 +227,12 @@
 
 	      <rule e="way" k="*" zoom-min="15" v="playground|miniature_golf">
 	        <area fill="#f4f4de" />
-	        <line stroke="#fbdbc8" width="0.6" fixed="true" cap="butt" />
+	        <line stroke="#fbdbc8" width="0.6" fix="true" cap="butt" />
 	      </rule>
 
 	      <rule e="way" k="*" v="playing_fields|pitch">
 	        <area fill="#f4f4de" />
-	        <line stroke="#dbdbc8" width="0.6" fixed="true" cap="butt" />
+	        <line stroke="#dbdbc8" width="0.6" fix="true" cap="butt" />
 	      </rule>
 	-->
 	      <rule e="way" k="*" v="swimming_pool">
@@ -252,7 +252,7 @@
 	    <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" />
+		       <line stroke="#abe29c" width="1.0" fix="true" cap="butt" />
 	      </rule>
 
 		    <rule e="way" k="*" v="military">
@@ -268,7 +268,7 @@
     <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" fix="true"/>
       </rule>
 
       <rule e="way" k="waterway" v="canal">
@@ -287,19 +287,19 @@
           <use-outline name="river"/>
          </rule>
         <rule e="way" k="*" v="*" zoom-max="12">
-           <use-line name="water" width="1.0" fixed="true" fade="9"/>
+           <use-line name="water" width="1.0" fix="true" fade="9"/>
         </rule>
       </rule>
 
 
       <rule e="way" k="waterway" v="riverbank|dock">
         <use-area name="water"/>
-        <use-line name="water" width="1.0" fixed="true"/>
+        <use-line name="water" width="1.0" fix="true"/>
 	    </rule>
 
         <rule e="way" k="waterway" v="river" closed="yes">
         <use-area name="water"/>
-        <use-line name="water" width="1.0" fixed="true"/>
+        <use-line name="water" width="1.0" fix="true"/>
 	    </rule>
 
 
@@ -309,7 +309,7 @@
 
       <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" />
+        <line stroke="#ababab" width="1.2" cap="butt" fix="true" />
       </rule>
 
       <rule e="way" k="lock" v="yes|true">
@@ -319,7 +319,7 @@
 
     <rule e="way" k="natural" v="water">
 	      <use-area name="water"/>
-	    	 <use-line name="water:outline" width="0.5" fixed="true"/>
+	    	 <use-line name="water:outline" width="0.5" fix="true"/>
 	   </rule>
 
 
@@ -437,10 +437,10 @@
        <!-- 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"/>
+             <line stroke="#a0a0a0" width="0.8" cap="butt" fix="true"/>
              </rule> -->
         <rule e="way" k="railway" v="rail">
-          <line stroke="#aaaaaa" width="0.9" cap="butt" fixed="true" />
+          <line stroke="#aaaaaa" width="0.9" cap="butt" fix="true" />
         </rule>
       </rule>
     </rule>   <!-- end tunnel -->
@@ -483,7 +483,7 @@
       <rule e="way" k="*" v="*" zoom-min="15">
         <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" fix="true" cap="butt" fade="15"/>
         <area fill="#e9e6e3" fade="15" /> -->
       </rule>
 
@@ -511,42 +511,42 @@
        <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">
-            <line stroke="#f2df6d" width="1.3" cap="butt" fixed="true" fade="9"/>
+            <line stroke="#f2df6d" width="1.3" cap="butt" fix="true" fade="9"/>
           </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="#f2df6d" width="1.4" cap="butt" fix="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="#fed6a3" width="1.4" cap="butt" fix="true" fade="3"/>
           </rule>
  -->
           <rule e="way" k="*" v="route_motorway|route_trunk">
-            <line stroke="#eec693" width="1.5" cap="butt" fixed="true" fade="3"/>
+            <line stroke="#eec693" width="1.5" cap="butt" fix="true" fade="3"/>
           </rule>
         </rule>
       </rule>
       <rule e="way" k="*" v="*" zoom-min="6" zoom-max="10">
  			  <rule e="way" k="area" v="~|no|false">
           <rule e="way" k="*" v="secondary|primary_link" zoom-min="9">
-            <line stroke="#ddf2df6d" width="1.8" cap="butt" fixed="true" fade="9"/>
+            <line stroke="#ddf2df6d" width="1.8" cap="butt" fix="true" fade="9"/>
           </rule>
 
           <rule e="way" k="*" v="trunk_link|motorway_link" zoom-min="8">
-            <line stroke="#ddfed6a3" width="1.8" cap="butt" fixed="true" fade="8"/>
+            <line stroke="#ddfed6a3" width="1.8" cap="butt" fix="true" fade="8"/>
           </rule>
 
           <rule e="way" k="*" v="primary" zoom-min="5">
-            <line stroke="#ddf2df6d" cap="butt" fixed="true" width="1.8" fade="5"/> <!--  stroke="#f2df6d" width="1.8" cap="butt" fixed="true" fade="5"/>-->
+            <line stroke="#ddf2df6d" cap="butt" fix="true" width="1.8" fade="5"/> <!--  stroke="#f2df6d" width="1.8" cap="butt" fix="true" fade="5"/>-->
           </rule>
 
           <rule e="way" k="*" v="trunk" zoom-min="5">
-            <line stroke="#ddfed6a3" width="1.8" cap="butt" fixed="true" fade="5"/>
+            <line stroke="#ddfed6a3" width="1.8" cap="butt" fix="true" fade="5"/>
           </rule>
 
           <rule e="way" k="*" v="motorway">
-            <line stroke="#ddeec693" width="1.7" cap="butt" fixed="true" fade="5"/>
+            <line stroke="#ddeec693" width="1.7" cap="butt" fix="true" fade="5"/>
           </rule>
         </rule>
       </rule>
@@ -563,7 +563,7 @@
 
 					      <rule e="way" k="*" zoom-min="13" v="pedestrian|unclassified|residential|road|living_street">
 					        <area fill="#44ffffff" />
-					        <line stroke="#888888" width="1.0" fixed="true" cap="butt" />
+					        <line stroke="#888888" width="1.0" fix="true" cap="butt" />
 					      </rule>
 
 					    <!--  <rule e="way" k="*" v="path" zoom-min="14">
@@ -771,7 +771,7 @@
 
 			      <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" />
+			        <line stroke="#d0d0d0" width="1.0" fix="true" cap="butt" />
 			      </rule>
 
 			    	<!--  <rule e="way" k="*" v="path" zoom-min="14">
@@ -837,7 +837,7 @@
 
         <rule e="way" k="railway" v="station">
           <area fill="#aa000000" />
-          <line stroke="#cccccc" width="1.0" fixed="true"/>
+          <line stroke="#cccccc" width="1.0" fix="true"/>
         </rule>
 
         <!-- railway bridge casings -->
@@ -845,47 +845,47 @@
           <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" />
+                    fix="true" />
             </rule>
             <rule e="way" k="railway" v="subway|light_rail|narrow_gauge">
               <line stroke="#777777" width="0.9" cap="butt"
-                    fixed="true" />
+                    fix="true" />
             </rule>
             <rule e="way" k="railway" v="rail">
               <line stroke="#777777" width="0.9" cap="butt"
-                    fixed="true" />
+                    fix="true" />
             </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" />
+          <line stroke="#887766" width="1.0" fix="true" />
         </rule>
 
         <rule e="way" k="railway" v="light_rail|subway|narrow_gauge" zoom-min="14">
-          <line stroke="#a0a0a0" width="0.9" cap="butt" fixed="true" />
+          <line stroke="#a0a0a0" width="0.9" cap="butt" fix="true" />
 
         </rule>
 
        <rule e="way" k="railway" v="rail|turntable" zoom-max="15">
-          <line stroke="#ddaa9988" width="1.0" cap="butt" fixed="true" fade="12"/>
+          <line stroke="#ddaa9988" width="1.0" cap="butt" fix="true" fade="12"/>
         </rule>
 
         <rule e="way" k="railway" v="rail|turntable" zoom-min="16">
-          <line stroke="#ddaa9988" width="1.0" cap="butt" fixed="true" fade="12" stipple="1"/>
+          <line stroke="#ddaa9988" width="1.0" cap="butt" fix="true" fade="12" stipple="1"/>
         </rule>
 
         <!-- <rule e="way" k="railway" v="rail" zoom-max="14" zoom-min="13">
              <line stroke="#8888aa" width="0.6" cap="butt"
-             fixed="true" />
+             fix="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" />
+          <line stroke="#bbbbcc" width="0.8" cap="butt" fix="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"/>
+          <line stroke="#cccccc" width="0.8" cap="butt" fix="true" fade="12"/>
         </rule>
       </rule>
     </rule>
@@ -899,27 +899,27 @@
     <!--<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"
+           fix="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+           v="10"> <line stroke="#f9574b" width="0.1" fix="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"
+           fix="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+           v="8"> <line stroke="#f9574b" width="0.3" fix="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"
+           fix="true" cap="butt" /> </rule> <rule e="way" k="admin_level"
+           v="6"> <line stroke="#f9574b" width="0.15" fix="true" cap="butt"
            /> </rule> <rule e="way" k="admin_level" v="5"> <line stroke="#f9574b" width="0.15"
-           fixed="true" cap="butt" /> </rule> -->
+           fix="true" cap="butt" /> </rule> -->
       <rule e="way" k="admin_level" v="4">
-        <line stroke="#8f80dd" width="1.2" fixed="true" cap="butt" />
+        <line stroke="#8f80dd" width="1.2" fix="true" cap="butt" />
       </rule>
       <rule e="way" k="admin_level" v="3">
-        <line stroke="#0000ff" width="1.0" fixed="true" cap="butt" />
+        <line stroke="#0000ff" width="1.0" fix="true" cap="butt" />
       </rule>
       <rule e="way" k="admin_level" v="2">
-        <line stroke="#dddddd" width="1.0" fixed="true" cap="butt" blur="0.3"/>
+        <line stroke="#dddddd" width="1.0" fix="true" cap="butt" blur="0.3"/>
       </rule>
       <rule e="way" k="admin_level" v="1">
-        <line stroke="#ff0000" width="0.95" fixed="true" cap="butt" />
+        <line stroke="#ff0000" width="0.95" fix="true" cap="butt" />
       </rule>
 
     </rule>
@@ -936,16 +936,16 @@
       <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" />
+         <line stroke="#ff0000" width="1.2" fix="true" cap="butt" />
         <area fill="#880000ff"/>
         <caption k="name" font-size="15" fill="#ff0000" stroke="#444444" stroke-width="2.0"/>
     </rule>
      <rule e="way" k="debug" v="way">
-         <line stroke="#00ffff" width="1.5" fixed="true" cap="butt" />
+         <line stroke="#00ffff" width="1.5" fix="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="#dedeae" width="1.5" fixed="true" cap="butt" />
+         <line stroke="#dedeae" width="1.5" fix="true" cap="butt" />
     </rule>
   </rule>