diff --git a/src/org/oscim/theme/styles/default.xml b/src/org/oscim/theme/styles/default.xml
index 8b41999a..d7c2d9c8 100644
--- a/src/org/oscim/theme/styles/default.xml
+++ b/src/org/oscim/theme/styles/default.xml
@@ -42,7 +42,7 @@
   <style-line name="residential" stroke="#ffffff" width="1.3" />
   <style-line name="residential:bridge" from="residential" cap="square" />
 
-  <!-- when inheriting another style with 'from' then 'witdth' is meant relative to the parent -->
+  <!-- when inheriting another style with 'from' then 'witdth' is relative to the parent -->
   <style-line name="pedestrian" from="residential" width="-0.4" />
   <style-line name="pedestrian:bridge" from="pedestrian" cap="square" />
 
@@ -120,32 +120,23 @@
       <m zoom-min="10" v="farmland|farm|orchard|vineyard|greenhouse_horticulture|plant_nursery">
         <use-area name="farmland" />
       </m>
-
       <m v="quarry">
         <use-area name="quarry" />
       </m>
-
-
-
       <!-- <m v="farmyard|retail|commercial|industrial;retail">
         <use-area name="residential" />
         </m> -->
-
       <m v="industrial|railway">
         <use-area name="railway|industrial" />
       </m>
-
       <!-- <m v="military">
         <use-area name="military"/>
         </m> -->
-
       <!--<m k="landuse" v="construction|greenfield"> <area fill="#a47c41"
         stroke="#e4e4e4" width="0.2" /> </m> -->
       <!-- <m k="landuse" v="garages"> <area fill="#d6d6e4" /> </m> -->
     </m>
 
-
-
     <m k="landuse|natural|leisure||amenity|tourism">
       <!-- kind of more like landuse imho -->
       <m k="leisure|landuse" v="nature_reserve">
@@ -155,7 +146,6 @@
         </m>
       </m>
 
-
       <!-- tourism areas
         Berlin Zoologischer Garten has lots of details that should be drawn above
       -->
@@ -174,15 +164,12 @@
           <area fill="#cdbbca" fade="15" />
           <line stroke="#9aabae" width="1.0" fix="true" cap="butt" fade="15" />
         </m>
-
         <m v="hospital" zoom-min="14">
           <area fill="#e6e4c5" />
         </m>
-
         <!-- <m v="parking" zoom-min="15">
           <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
           </m>
-
           <m v="fountain" closed="yes">
           <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
           </m> -->
@@ -222,7 +209,6 @@
         <!-- <line stroke="#abcfab" width="1.5" fix="true" cap="butt"/> -->
       </m>
 
-
       <!-- keep grass above forest:wood and leisure:park! -->
       <!-- http://wiki.openstreetmap.org/wiki/Proposed_features/conservation,
         often serves as background for leisure=nature_reserve -->
@@ -234,11 +220,6 @@
         <use-area name="greens" />
       </m>
 
-
-      <m k="leisure" v="track">
-        <line stroke="#c1bcb6" width="1.3" cap="butt" fix="true" />
-      </m>
-
       <!-- amenity -->
       <m k="amenity">
         <!--<m v="kindergarten|school|college|university" zoom-min="15">
@@ -257,6 +238,7 @@
         <m v="fountain" closed="yes">
           <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
         </m>
+
       </m>
 
       <!-- <m k="natural" v="coastline">
@@ -265,7 +247,6 @@
 
       <!-- natural -->
       <m k="natural" zoom-min="10">
-
         <m v="glacier">
           <area fill="#fafaff" />
         </m>
@@ -281,7 +262,6 @@
         </m>
       </m>
 
-
       <!-- leisure -->
       <m k="leisure" zoom-min="13">
 
@@ -330,36 +310,30 @@
         </m>
       </m>
 
-
-
-
-      <m k="natural" v="water">
-        <use-area name="water" />
-        <use-line name="water:outline" />
-      </m>
-
       <m k="landuse" v="reservoir|basin">
         <use-area name="water" />
       </m>
+
+      <!-- ...should rewrite tag to: highway=leisure/sport=* imho -->
+      <m k="leisure" v="track">
+        <line stroke="#c1bcb6" width="1.3" cap="butt" fix="true" />
+      </m>
+
     </m> <!-- end landuse|natural|leisure||amenity|tourism -->
 
 
     <!-- waterways -->
     <m k="waterway">
-
-      <m k="waterway" v="ditch|drain" zoom-min="14">
+      <m v="ditch|drain" zoom-min="14">
         <use-line name="water" width="0.2" fix="true" />
       </m>
-
-      <m k="waterway" v="canal">
+      <m v="canal">
         <use-line name="water" width="-0.3" />
       </m>
-
-      <m k="waterway" v="stream" zoom-min="14">
+      <m v="stream" zoom-min="14">
         <use-line name="water" width="0.5" fix="true" />
       </m>
-
-      <m k="waterway" v="river">
+      <m v="river">
         <m zoom-min="12">
           <use-line name="water" width="0.3" />
         </m>
@@ -393,26 +367,29 @@
           </m>
         </m>
       </m>
-
-      <m k="waterway" v="riverbank|dock">
+      <m v="riverbank|dock">
         <use-area name="water" />
         <use-line name="water:outline" />
       </m>
-
-      <m k="waterway" v="weir">
+      <m v="weir">
         <line stroke="#000088" width="1.0" fix="true" cap="butt" />
       </m>
-
-      <m k="waterway" v="dam" zoom-min="12">
-        <!-- sehr seltsam was in deutschland so als Damm gekenzeichnet wird.. -->
+      <m v="dam" zoom-min="12">
+        <!-- sehr seltsam was in deutschland so als Damm gekenzeichnet wird..
+          siehe Muenster -->
         <line stroke="#ababab" width="1.2" cap="butt" fix="true" />
       </m>
-
       <m k="lock" v="yes|true">
         <line stroke="#f8f8f8" width="1.5" cap="butt" />
       </m>
     </m>
 
+    <m k="natural" v="water">
+      <use-area name="water" />
+      <use-line name="water:outline" />
+    </m>
+
+
     <!-- sport -->
     <!-- <m k="sport"> <m k="sport" v="soccer"
       zoom-min="17"> <m k="sport" v="swimming|canoe|diving|scuba_diving">
@@ -420,10 +397,6 @@
       e="way" k="sport" v="tennis"> <area fill="#d18a6a" stroke="#b36c4c" width="0.2"
       /> </m> </m> -->
 
-
-
-
-
     <!-- outline 0 -->
     <style-outline name="glow" stroke="#000000" width="0.2" blur="1.0" />
     <style-outline name="0" stroke="#44000000" width="0.1" />
@@ -1280,7 +1253,6 @@
       </m>
       </m> -->
 
-
     <!-- tourism
       <m k="tourism">
       <m k="tourism" v="alpine_hut" zoom-min="16">
@@ -1306,7 +1278,6 @@
       <caption k="name" font-size="15" fill="#20aa20" stroke="#ffffff" stroke-width="2.0" />
       </m>
       </m> -->
-
   </m>
 
 </rendertheme>
\ No newline at end of file