diff --git a/vtm-themes/resources/assets/vtm/default.xml b/vtm-themes/resources/assets/vtm/default.xml
index 36a1196d..0fe0f0c2 100644
--- a/vtm-themes/resources/assets/vtm/default.xml
+++ b/vtm-themes/resources/assets/vtm/default.xml
@@ -74,8 +74,7 @@
     <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
 
     <!--farmland-->
-    <style-area fade="12" fill="#e4dab5" id="farmland" stroke="#d1dbc7" stroke-width="1.0"
-        use="tex1" />
+    <style-area fade="12" fill="#e4dab5" id="farmland" use="tex1" />
 
     <!-- marsh|wetland|mud|nature_reserve -->
     <style-area fade="12" fill="#deecb9" id="greens2" />
@@ -88,7 +87,7 @@
     <!-- fade out at z=7, blend over to 'blend-fill' in z=11 -->
     <!-- src="assets:textures/wood.png" -->
     <!-- <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" /> -->
-    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
+    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" /> -->
     <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
     <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
 
@@ -101,7 +100,7 @@
     <!--military-->
     <style-area fade="10" fill="#eeedea" id="military" />
     <!--building-->
-    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+    <style-area fade="15" fill="#f2f0eb" id="building" />
 
     <!--water-->
     <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
@@ -248,10 +247,10 @@
                     <area fill="#f2d9b1" />
                 </m>
                 <!-- <m v="parking" zoom-min="15">
-                  <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
+                  <area fill="#f4f4f4" />
                   </m>
                   <m v="fountain" closed="yes">
-                  <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+                  <area fill="#b4cbdc" />
                   </m> -->
             </m>
 
@@ -285,12 +284,9 @@
             </m>
 
             <m k="landuse|natural" v="forest|wood">
-                <m zoom-max="13" zoom-min="8">
+                <m zoom-min="8">
                     <area use="wood" />
                 </m>
-                <m zoom-min="14">
-                    <area stroke="#91bf63" stroke-width="1.0" use="wood" />
-                </m>
             </m>
 
             <!-- keep grass above forest:wood and leisure:park! -->
@@ -316,10 +312,10 @@
                   </m>
                 -->
                 <m v="parking" zoom-min="15">
-                    <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
+                    <area fill="#f4f4f4" />
                 </m>
                 <m closed="yes" v="fountain">
-                    <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+                    <area fill="#b4cbdc" />
                 </m>
 
             </m>
@@ -365,7 +361,7 @@
                     <line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" />
                 </m>
                 <m v="swimming_pool">
-                    <area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" />
+                    <area fill="#d4ebfc" />
                 </m>
 
                 <!-- <m v="track"> <m k="area" v="yes|true">
@@ -617,6 +613,7 @@
             <!-- Airport passenger building -->
             <m v="terminal|hangar">
                 <area use="building" />
+                <line use="building" />
             </m>
         </m>
 
@@ -631,6 +628,7 @@
                 <m zoom-min="14">
                     <m closed="yes">
                         <area fade="14" use="building" />
+                        <line fade="14" use="building" />
                     </m>
                     <m closed="no">
                         <line fade="14" use="building" />
@@ -641,6 +639,7 @@
                 <m zoom-min="16">
                     <m closed="yes">
                         <area fade="16" use="building" />
+                        <line fade="16" use="building" />
                     </m>
                     <m closed="no">
                         <line fade="16" use="building" />
@@ -963,7 +962,7 @@
                 <line cap="butt" stroke="#e4e4e4" width="0.3" />
             </m>
             <m closed="yes">
-                <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="1.05" />
+                <area fill="#e4e4e4" />
             </m>
         </m>
 
@@ -982,7 +981,7 @@
             <m k="tunnel" v="~|false|no">
 
                 <m v="station">
-                    <area fill="#dbdbc9" stroke="#707070" stroke-width="0.3" />
+                    <area fill="#dbdbc9" />
                 </m>
 
                 <!-- railway bridge casings -->
diff --git a/vtm-themes/resources/assets/vtm/mapzen.xml b/vtm-themes/resources/assets/vtm/mapzen.xml
index dba5cfe1..fca5b581 100644
--- a/vtm-themes/resources/assets/vtm/mapzen.xml
+++ b/vtm-themes/resources/assets/vtm/mapzen.xml
@@ -54,8 +54,7 @@
     <!-- grassland|scrub -->
     <style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
 
-    <style-area fade="12" fill="#e4dab5" id="farmland" stroke="#d1dbc7" stroke-width="1.0"
-        use="tex1" />
+    <style-area fade="12" fill="#e4dab5" id="farmland" use="tex1" />
 
     <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
 
@@ -64,7 +63,7 @@
 
     <!-- park|common|green|cemetery|golf_course|dog_park -->
     <style-area fade="11" fill="#9ac56e" id="park" use="tex1" />
-    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
+    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" /> -->
 
     <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
     <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
@@ -127,7 +126,7 @@
       <style-area id="building" fill="#e9e6e3" fade="15"/> -->
 
     <style-line fade="15" id="building" stroke="#eeb7b6b3" use="fix" />
-    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+    <style-area fade="15" fill="#f2f0eb" id="building" />
 
     <m closed="yes" e="way" k="layer" v="water">
         <area mesh="true" use="water" />
@@ -208,10 +207,10 @@
                     <area fill="#f2d9b1" />
                 </m>
                 <!-- <m v="parking" zoom-min="15">
-                  <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
+                  <area fill="#f4f4f4" />
                   </m>
                   <m v="fountain" closed="yes">
-                  <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+                  <area fill="#b4cbdc" />
                   </m> -->
             </m>
 
@@ -245,12 +244,9 @@
             </m>
 
             <m v="forest|wood">
-                <m zoom-max="13" zoom-min="8">
+                <m zoom-min="8">
                     <area use="wood" />
                 </m>
-                <m zoom-min="14">
-                    <area stroke="#91bf63" stroke-width="1.0" use="wood" />
-                </m>
             </m>
 
             <!-- keep grass above forest:wood and leisure:park! -->
@@ -275,13 +271,13 @@
               </m>
             -->
             <m v="parking" zoom-min="15">
-                <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
+                <area fill="#f4f4f4" />
                 <m zoom-min="17">
                     <symbol src="assets:symbols/transport/parking.svg" />
                 </m>
             </m>
             <m closed="yes" v="fountain">
-                <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+                <area fill="#b4cbdc" />
             </m>
 
 
@@ -326,7 +322,7 @@
                     <line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" />
                 </m>
                 <m v="swimming_pool">
-                    <area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" />
+                    <area fill="#d4ebfc" />
                 </m>
 
                 <!-- <m v="track"> <m k="area" v="yes|true">
@@ -580,6 +576,7 @@
             <!-- Airport passenger building -->
             <m v="terminal|hangar">
                 <area use="building" />
+                <line use="building" />
             </m>
         </m>
 
@@ -594,6 +591,7 @@
                 <m zoom-min="14">
                     <m closed="yes">
                         <area fade="14" use="building" />
+                        <line fade="14" use="building" />
                     </m>
                     <m closed="no">
                         <line fade="14" use="building" />
@@ -604,6 +602,7 @@
                 <m zoom-min="16">
                     <m closed="yes">
                         <area fade="16" use="building" />
+                        <line fade="16" use="building" />
                     </m>
                     <m closed="no">
                         <line fade="16" use="building" />
@@ -923,7 +922,7 @@
                 <line cap="butt" stroke="#e4e4e4" width="0.3" />
             </m>
             <m closed="yes">
-                <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="1.05" />
+                <area fill="#e4e4e4" />
             </m>
         </m>
 
@@ -942,7 +941,7 @@
             <m k="is_tunnel" v="~|false|no">
 
                 <m v="station">
-                    <area fill="#dbdbc9" stroke="#707070" stroke-width="0.3" />
+                    <area fill="#dbdbc9" />
                 </m>
 
                 <!-- railway bridge casings -->
diff --git a/vtm-themes/resources/assets/vtm/newtron.xml b/vtm-themes/resources/assets/vtm/newtron.xml
index cdf877c2..d9a1e99c 100644
--- a/vtm-themes/resources/assets/vtm/newtron.xml
+++ b/vtm-themes/resources/assets/vtm/newtron.xml
@@ -229,17 +229,17 @@
             <!-- amenity -->
             <m k="amenity">
                 <m v="kindergarten|school|college|university" zoom-min="14">
-                    <area fill="#323439" stroke="#b094bf" stroke-width="2.0" />
+                    <area fill="#323439" />
                 </m>
                 <m v="hospital">
                     <area fill="#716553" />
                 </m>
                 <m v="parking" zoom-min="14">
-                    <area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
+                    <area fill="#444434" />
                 </m>
 
                 <m closed="yes" v="fountain">
-                    <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+                    <area fill="#b4cbdc" />
                 </m>
             </m>
 
@@ -292,7 +292,7 @@
                   </m>
                 -->
                 <m v="swimming_pool">
-                    <area fill="#b4cbdc" stroke="#6060ff" stroke-width="0.2" />
+                    <area fill="#b4cbdc" />
                 </m>
 
                 <!-- <m v="track"> <m k="area" v="yes|true">
@@ -932,7 +932,7 @@
           <line stroke="#e4e4e4" width="0.3" cap="butt" />
           </m>
           <m closed="yes">
-          <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
+          <area fill="#e4e4e4" />
           </m>
           </m> -->
 
diff --git a/vtm-themes/resources/assets/vtm/openmaptiles.xml b/vtm-themes/resources/assets/vtm/openmaptiles.xml
index d600caa8..ae623cdd 100644
--- a/vtm-themes/resources/assets/vtm/openmaptiles.xml
+++ b/vtm-themes/resources/assets/vtm/openmaptiles.xml
@@ -71,8 +71,7 @@
     <style-area fade="10" fill="#c2cba5" id="darkgreen" use="tex1" />
 
     <!--farmland-->
-    <style-area fade="12" fill="#e4dab5" id="farmland" stroke="#d1dbc7" stroke-width="1.0"
-        use="tex1" />
+    <style-area fade="12" fill="#e4dab5" id="farmland" use="tex1" />
 
     <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
 
@@ -81,7 +80,7 @@
 
     <!-- park|common|green|cemetery|golf_course|dog_park -->
     <style-area fade="11" fill="#9ac56e" id="park" use="tex1" />
-    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
+    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" /> -->
 
     <!--wood-->
     <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
@@ -96,7 +95,7 @@
     <!--military-->
     <style-area fade="10" fill="#eeedea" id="military" />
     <!--building-->
-    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+    <style-area fade="15" fill="#f2f0eb" id="building" />
     <!--<style-area id="building" fill="#e9e6e3" fade="15"/>-->
 
     <!--water-->
@@ -389,6 +388,7 @@
             <m zoom-min="14">
                 <m closed="yes">
                     <area fade="14" use="building" />
+                    <line fade="14" use="building" />
                 </m>
                 <m closed="no">
                     <line fade="14" use="building" />
@@ -399,6 +399,7 @@
             <m zoom-min="16">
                 <m closed="yes">
                     <area fade="16" use="building" />
+                    <line fade="16" use="building" />
                 </m>
                 <m closed="no">
                     <line fade="16" use="building" />
diff --git a/vtm-themes/resources/assets/vtm/osmagray.xml b/vtm-themes/resources/assets/vtm/osmagray.xml
index 5a04eadb..6c0fa0ec 100644
--- a/vtm-themes/resources/assets/vtm/osmagray.xml
+++ b/vtm-themes/resources/assets/vtm/osmagray.xml
@@ -69,38 +69,38 @@
         <m k="landuse">
             <m select="first">
                 <m v="military">
-                    <area src="assets:patterns/military.png" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area src="assets:patterns/military.png" />
                 </m>
                 <m v="residential|farmyard">
                     <area fill="#e4e4e4" />
                 </m>
                 <m v="retail">
-                    <area fill="#efefef" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area fill="#efefef" />
                 </m>
                 <m v="industrial|brownfield|railway">
-                    <area fill="#dedede" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area fill="#dedede" />
                 </m>
                 <m v="commercial">
-                    <area fill="#fafafa" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area fill="#fafafa" />
                 </m>
                 <m v="construction|greenfield">
-                    <area fill="#808080" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area fill="#808080" />
                 </m>
                 <m v="garages">
                     <area fill="#d6d6d6" />
                 </m>
 
                 <m v="landfill|quarry">
-                    <area fill="#d8d8d8" stroke="#626262" stroke-width="0.2" />
+                    <area fill="#d8d8d8" />
                 </m>
                 <m v="cemetery">
-                    <area src="assets:patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area src="assets:patterns/cemetery.png" />
                 </m>
                 <m v="field|farm|farmland|meadow|grass">
-                    <area fill="#f9f9f9" stroke="#cecece" stroke-width="0.1" />
+                    <area fill="#f9f9f9" />
                 </m>
                 <m v="allotments|village_green|recreation_ground">
-                    <area fill="#d9d9d9" stroke="#a6a6a6" stroke-width="0.2" />
+                    <area fill="#d9d9d9" />
                 </m>
                 <m v="reservoir|basin">
                     <area fill="#d0d0d0" />
@@ -113,7 +113,7 @@
 
 
         <m k="natural" v="grassland|scrub">
-            <area fill="#acacac" stroke="#acacac" stroke-width="0.2" />
+            <area fill="#acacac" />
         </m>
 
         <m k="natural|landuse" v="forest|wood">
@@ -129,7 +129,7 @@
                 </m>
             </m>
             <m k="wood" v="~">
-                <area fill="#acacac" stroke="#acacac" stroke-width="0.2" />
+                <area fill="#acacac" />
             </m>
 
             <m zoom-min="16">
@@ -142,19 +142,19 @@
         <m k="amenity">
             <m select="first">
                 <m v="kindergarten|school|college|university">
-                    <area fill="#b5b5b5" stroke="#d8d8d8" stroke-width="0.2" />
+                    <area fill="#b5b5b5" />
                 </m>
                 <m v="grave_yard">
-                    <area src="assets:patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area src="assets:patterns/cemetery.png" />
                 </m>
                 <m v="parking">
-                    <area fill="#fafafa" stroke="#d8d8d8" stroke-width="0.2" />
+                    <area fill="#fafafa" />
                     <m k="access" v="private" zoom-min="15">
                         <area src="assets:patterns/access-private.png" />
                     </m>
                 </m>
                 <m closed="yes" v="fountain">
-                    <area fill="#d0d0d0" stroke="#080808" stroke-width="0.15" />
+                    <area fill="#d0d0d0" />
                 </m>
             </m>
         </m>
@@ -168,20 +168,20 @@
                     <line stroke="#708599" fix="true" cap="butt" width="2.0" />
                     </m> &ndash;&gt;
                   <m closed="yes">
-                    <area fill="#d0d0d0" stroke="#d0d0d0" stroke-width="0.4" />
+                    <area fill="#d0d0d0" />
                   </m>
                 </m>-->
                 <m v="glacier">
-                    <area fill="#fafafa" stroke="#cfcfcf" stroke-width="0.8" />
+                    <area fill="#fafafa" />
                 </m>
                 <m v="land">
-                    <area fill="#f8f8f8" stroke="#e0e0e0" stroke-width="0.1" />
+                    <area fill="#f8f8f8" />
                 </m>
                 <m v="beach">
                     <area fill="#cacaca" />
                 </m>
                 <m v="heath">
-                    <area fill="#fafafa" stroke="#f7f7f7" stroke-width="0.2" />
+                    <area fill="#fafafa" />
                 </m>
                 <m v="marsh|wetland">
                     <area src="assets:patterns/marsh.png" />
@@ -197,10 +197,10 @@
         <m k="leisure">
             <m select="first">
                 <m v="park|garden|golf_course|common|green">
-                    <area fill="#e2e2e2" stroke="#acacac" stroke-width="0.2" />
+                    <area fill="#e2e2e2" />
                 </m>
                 <m v="playground|playing_fields|pitch|dog_park">
-                    <area fill="#e2e2e2" stroke="#acacac" stroke-width="0.2" />
+                    <area fill="#e2e2e2" />
                     <m v="playground" zoom-min="17">
                         <symbol src="assets:symbols/amenity/playground.svg" />
                     </m>
@@ -210,11 +210,11 @@
                 </m>
 
                 <m v="stadium|sports_centre|water_park">
-                    <area fill="#d9d9d9" stroke="#acacac" stroke-width="0.2" />
+                    <area fill="#d9d9d9" />
                 </m>
                 <m v="track">
                     <m k="area" v="yes|true">
-                        <area fill="#d9d9d9" stroke="#acacac" stroke-width="0.025" />
+                        <area fill="#d9d9d9" />
                     </m>
                     <m k="area" v="~|no|false">
                         <line stroke="#acacac" width="0.75" />
@@ -222,7 +222,7 @@
                     </m>
                 </m>
                 <m v="swimming_pool">
-                    <area fill="#d0d0d0" stroke="#6b6b6b" stroke-width="0.2" />
+                    <area fill="#d0d0d0" />
                 </m>
             </m>
             <m k="name" zoom-min="16">
@@ -280,7 +280,7 @@
 
         <!-- military -->
         <m k="military">
-            <area src="assets:patterns/military.png" stroke="#e4e4e4" stroke-width="0.2" />
+            <area src="assets:patterns/military.png" />
         </m>
 
 
@@ -290,10 +290,10 @@
                 <symbol src="assets:symbols/sport/soccer.svg" />
             </m>
             <m v="swimming|canoe|diving|scuba_diving">
-                <area fill="#d0d0d0" stroke="#6b6b6b" stroke-width="0.2" />
+                <area fill="#d0d0d0" />
             </m>
             <m v="tennis">
-                <area fill="#969696" stroke="#787878" stroke-width="0.2" />
+                <area fill="#969696" />
                 <m zoom-min="17">
                     <symbol src="assets:symbols/sport/tennis.svg" />
                 </m>
@@ -307,7 +307,7 @@
                 <area fill="#d4d4d4" />
             </m>
             <m v="zoo|picnic_site|caravan_site|camp_site">
-                <area fill="#e2e2e2" stroke="#acacac" stroke-width="0.2" />
+                <area fill="#e2e2e2" />
             </m>
         </m>
 
@@ -392,28 +392,28 @@
         <m k="area" v="yes|true">
             <m k="highway">
                 <m v="footway|footpath">
-                    <area fill="#dedede" stroke="#707070" stroke-width="1.15" />
+                    <area fill="#dedede" />
                 </m>
                 <m v="pedestrian">
-                    <area fill="#dedede" stroke="#707070" stroke-width="1.15" />
+                    <area fill="#dedede" />
                 </m>
                 <m v="path">
-                    <area fill="#d0d0d0" stroke="#d0d0d0" stroke-width="1.15" />
+                    <area fill="#d0d0d0" />
                 </m>
                 <m v="service">
-                    <area fill="#ffffff" stroke="#707070" stroke-width="1.15" />
+                    <area fill="#ffffff" />
                 </m>
                 <m v="unclassified">
-                    <area fill="#ffffff" stroke="#707070" stroke-width="1.3" />
+                    <area fill="#ffffff" />
                 </m>
                 <m v="residential">
-                    <area fill="#ffffff" stroke="#707070" stroke-width="1.15" />
+                    <area fill="#ffffff" />
                 </m>
                 <m v="road">
                     <area fill="#d0d0d0" />
                 </m>
                 <m v="living_street">
-                    <area fill="#ffffff" stroke="#ffffff" stroke-width="1.15" />
+                    <area fill="#ffffff" />
                 </m>
             </m>
         </m>
@@ -434,7 +434,7 @@
         <m k="aeroway">
             <m closed="yes" v="aerodrome">
                 <m zoom-min="12">
-                    <area fill="#dadada" stroke="#aeaeae" stroke-width="0.8" />
+                    <area fill="#dadada" />
                 </m>
                 <m zoom-max="11">
                     <caption dy="18" fill="#000000" k="ref" priority="5" size="19" stroke="#ffffff"
@@ -449,7 +449,8 @@
                 <area fill="#f0f0f0" />
             </m>
             <m v="terminal">
-                <area fill="#d9d9d9" stroke="#616161" stroke-width="0.2" />
+                <area fill="#d9d9d9" />
+                <line cap="butt" fix="true" stroke="#616161" width="1.0" />
             </m>
 
             <!-- <m v="runway">
@@ -552,9 +553,10 @@
         <m k="building|building:part">
             <m select="first">
                 <m closed="yes">
-                    <area fill="#d9d9d9" stroke="#616161" stroke-width="1.0" />
+                    <area fill="#d9d9d9" />
+                    <line cap="butt" fix="true" stroke="#616161" width="1.0" />
                 </m>
-                <m zoom-max="16">
+                <m closed="no">
                     <line cap="butt" fix="true" stroke="#616161" width="1.0" />
                 </m>
             </m>
@@ -951,7 +953,7 @@
                 <line cap="butt" stroke="#e4e4e4" width="0.3" />
             </m>
             <m closed="yes">
-                <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
+                <area fill="#e4e4e4" />
             </m>
         </m>
 
@@ -1012,7 +1014,7 @@
             <m k="tunnel" v="~|false|no">
 
                 <m v="station">
-                    <area fill="#909090" stroke="#707070" stroke-width="0.3" />
+                    <area fill="#909090" />
                 </m>
 
                 <m k="bridge" v="yes|true">
diff --git a/vtm-themes/resources/assets/vtm/osmarender.xml b/vtm-themes/resources/assets/vtm/osmarender.xml
index cdb7c022..c8f686a8 100644
--- a/vtm-themes/resources/assets/vtm/osmarender.xml
+++ b/vtm-themes/resources/assets/vtm/osmarender.xml
@@ -69,38 +69,38 @@
         <m k="landuse">
             <m select="first">
                 <m v="military">
-                    <area src="assets:patterns/military.png" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area src="assets:patterns/military.png" />
                 </m>
                 <m v="residential|farmyard">
                     <area fill="#e4e4e4" />
                 </m>
                 <m v="retail">
-                    <area fill="#ffebeb" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area fill="#ffebeb" />
                 </m>
                 <m v="industrial|brownfield|railway">
-                    <area fill="#ecd8ff" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area fill="#ecd8ff" />
                 </m>
                 <m v="commercial">
-                    <area fill="#ffffc0" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area fill="#ffffc0" />
                 </m>
                 <m v="construction|greenfield">
-                    <area fill="#a47c41" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area fill="#a47c41" />
                 </m>
                 <m v="garages">
                     <area fill="#d6d6e4" />
                 </m>
 
                 <m v="landfill|quarry">
-                    <area fill="#e9dd72" stroke="#556b2f" stroke-width="0.2" />
+                    <area fill="#e9dd72" />
                 </m>
                 <m v="cemetery">
-                    <area src="assets:patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area src="assets:patterns/cemetery.png" />
                 </m>
                 <m v="field|farm|farmland|meadow|grass">
-                    <area fill="#ebfff2" stroke="#9ee673" stroke-width="0.1" />
+                    <area fill="#ebfff2" />
                 </m>
                 <m v="allotments|village_green|recreation_ground">
-                    <area fill="#bde3cb" stroke="#6fc13d" stroke-width="0.2" />
+                    <area fill="#bde3cb" />
                 </m>
                 <m v="reservoir|basin">
                     <area fill="#b5d6f1" />
@@ -113,7 +113,7 @@
 
 
         <m k="natural" v="grassland|scrub">
-            <area fill="#6fc18e" stroke="#6fc18e" stroke-width="0.2" />
+            <area fill="#6fc18e" />
         </m>
 
         <m k="natural|landuse" v="forest|wood">
@@ -129,7 +129,7 @@
                 </m>
             </m>
             <m k="wood" v="~">
-                <area fill="#6fc18e" stroke="#6fc18e" stroke-width="0.2" />
+                <area fill="#6fc18e" />
             </m>
 
             <m zoom-min="16">
@@ -142,19 +142,19 @@
         <m k="amenity">
             <m select="first">
                 <m v="kindergarten|school|college|university">
-                    <area fill="#cdabde" stroke="#e9dd72" stroke-width="0.2" />
+                    <area fill="#cdabde" />
                 </m>
                 <m v="grave_yard">
-                    <area src="assets:patterns/cemetery.png" stroke="#e4e4e4" stroke-width="0.2" />
+                    <area src="assets:patterns/cemetery.png" />
                 </m>
                 <m v="parking">
-                    <area fill="#ffffc0" stroke="#e9dd72" stroke-width="0.2" />
+                    <area fill="#ffffc0" />
                     <m k="access" v="private" zoom-min="15">
                         <area src="assets:patterns/access-private.png" />
                     </m>
                 </m>
                 <m closed="yes" v="fountain">
-                    <area fill="#b5d6f1" stroke="#000080" stroke-width="0.15" />
+                    <area fill="#b5d6f1" />
                 </m>
             </m>
         </m>
@@ -168,20 +168,20 @@
                     <line stroke="#708599" fix="true" cap="butt" width="2.0" />
                     </m> &ndash;&gt;
                   <m closed="yes">
-                    <area fill="#b5d6f1" stroke="#b5d6f1" stroke-width="0.4" />
+                    <area fill="#b5d6f1" />
                   </m>
                 </m>-->
                 <m v="glacier">
-                    <area fill="#fafaff" stroke="#add8e6" stroke-width="0.8" />
+                    <area fill="#fafaff" />
                 </m>
                 <m v="land">
-                    <area fill="#f8f8f8" stroke="#e0e0e0" stroke-width="0.1" />
+                    <area fill="#f8f8f8" />
                 </m>
                 <m v="beach">
                     <area fill="#eecc55" />
                 </m>
                 <m v="heath">
-                    <area fill="#ffffc0" stroke="#ffff90" stroke-width="0.2" />
+                    <area fill="#ffffc0" />
                 </m>
                 <m v="marsh|wetland">
                     <area src="assets:patterns/marsh.png" />
@@ -197,10 +197,10 @@
         <m k="leisure">
             <m select="first">
                 <m v="park|garden|golf_course|common|green">
-                    <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
+                    <area fill="#c7f1a3" />
                 </m>
                 <m v="playground|playing_fields|pitch|dog_park">
-                    <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
+                    <area fill="#c7f1a3" />
                     <m v="playground" zoom-min="17">
                         <symbol src="assets:symbols/amenity/playground.svg" />
                     </m>
@@ -210,11 +210,11 @@
                 </m>
 
                 <m v="stadium|sports_centre|water_park">
-                    <area fill="#bde3cb" stroke="#6fc18e" stroke-width="0.2" />
+                    <area fill="#bde3cb" />
                 </m>
                 <m v="track">
                     <m k="area" v="yes|true">
-                        <area fill="#bde3cb" stroke="#6fc18e" stroke-width="0.025" />
+                        <area fill="#bde3cb" />
                     </m>
                     <m k="area" v="~|no|false">
                         <line stroke="#6fc18e" width="0.75" />
@@ -222,7 +222,7 @@
                     </m>
                 </m>
                 <m v="swimming_pool">
-                    <area fill="#b5d6f1" stroke="#6060ff" stroke-width="0.2" />
+                    <area fill="#b5d6f1" />
                 </m>
             </m>
             <m k="name" zoom-min="16">
@@ -280,7 +280,7 @@
 
         <!-- military -->
         <m k="military">
-            <area src="assets:patterns/military.png" stroke="#e4e4e4" stroke-width="0.2" />
+            <area src="assets:patterns/military.png" />
         </m>
 
 
@@ -290,10 +290,10 @@
                 <symbol src="assets:symbols/sport/soccer.svg" />
             </m>
             <m v="swimming|canoe|diving|scuba_diving">
-                <area fill="#b5d6f1" stroke="#6060ff" stroke-width="0.2" />
+                <area fill="#b5d6f1" />
             </m>
             <m v="tennis">
-                <area fill="#d18a6a" stroke="#b36c4c" stroke-width="0.2" />
+                <area fill="#d18a6a" />
                 <m zoom-min="17">
                     <symbol src="assets:symbols/sport/tennis.svg" />
                 </m>
@@ -307,7 +307,7 @@
                 <area fill="#f2caea" />
             </m>
             <m v="zoo|picnic_site|caravan_site|camp_site">
-                <area fill="#c7f1a3" stroke="#6fc18e" stroke-width="0.2" />
+                <area fill="#c7f1a3" />
             </m>
         </m>
 
@@ -392,28 +392,28 @@
         <m k="area" v="yes|true">
             <m k="highway">
                 <m v="footway|footpath">
-                    <area fill="#e5e0c2" stroke="#707070" stroke-width="1.15" />
+                    <area fill="#e5e0c2" />
                 </m>
                 <m v="pedestrian">
-                    <area fill="#e5e0c2" stroke="#707070" stroke-width="1.15" />
+                    <area fill="#e5e0c2" />
                 </m>
                 <m v="path">
-                    <area fill="#d0d0d0" stroke="#d0d0d0" stroke-width="1.15" />
+                    <area fill="#d0d0d0" />
                 </m>
                 <m v="service">
-                    <area fill="#ffffff" stroke="#707070" stroke-width="1.15" />
+                    <area fill="#ffffff" />
                 </m>
                 <m v="unclassified">
-                    <area fill="#ffffff" stroke="#707070" stroke-width="1.3" />
+                    <area fill="#ffffff" />
                 </m>
                 <m v="residential">
-                    <area fill="#ffffff" stroke="#707070" stroke-width="1.15" />
+                    <area fill="#ffffff" />
                 </m>
                 <m v="road">
                     <area fill="#d0d0d0" />
                 </m>
                 <m v="living_street">
-                    <area fill="#ffffff" stroke="#ffffff" stroke-width="1.15" />
+                    <area fill="#ffffff" />
                 </m>
             </m>
         </m>
@@ -434,7 +434,7 @@
         <m k="aeroway">
             <m closed="yes" v="aerodrome">
                 <m zoom-min="12">
-                    <area fill="#d8dcce" stroke="#b8acae" stroke-width="0.8" />
+                    <area fill="#d8dcce" />
                 </m>
                 <m zoom-max="11">
                     <caption dy="18" fill="#000000" k="ref" priority="5" size="19" stroke="#ffffff"
@@ -449,7 +449,8 @@
                 <area fill="#f0f0f0" />
             </m>
             <m v="terminal">
-                <area fill="#f3d6b6" stroke="#6a5a8e" stroke-width="0.2" />
+                <area fill="#f3d6b6" />
+                <line cap="butt" fix="true" stroke="#6a5a8e" width="1.0" />
             </m>
 
             <!-- <m v="runway">
@@ -552,9 +553,10 @@
         <m k="building|building:part">
             <m select="first">
                 <m closed="yes">
-                    <area fill="#f3d6b6" stroke="#6a5a8e" stroke-width="1.0" />
+                    <area fill="#f3d6b6" />
+                    <line cap="butt" fix="true" stroke="#6a5a8e" width="1.0" />
                 </m>
-                <m zoom-max="16">
+                <m closed="no">
                     <line cap="butt" fix="true" stroke="#6a5a8e" width="1.0" />
                 </m>
             </m>
@@ -951,7 +953,7 @@
                 <line cap="butt" stroke="#e4e4e4" width="0.3" />
             </m>
             <m closed="yes">
-                <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
+                <area fill="#e4e4e4" />
             </m>
         </m>
 
@@ -1012,7 +1014,7 @@
             <m k="tunnel" v="~|false|no">
 
                 <m v="station">
-                    <area fill="#9b9b79" stroke="#707070" stroke-width="0.3" />
+                    <area fill="#9b9b79" />
                 </m>
 
                 <m k="bridge" v="yes|true">
diff --git a/vtm-themes/resources/assets/vtm/tronrender.xml b/vtm-themes/resources/assets/vtm/tronrender.xml
index 578bb705..bd85c3e7 100644
--- a/vtm-themes/resources/assets/vtm/tronrender.xml
+++ b/vtm-themes/resources/assets/vtm/tronrender.xml
@@ -229,17 +229,17 @@
             <!-- amenity -->
             <m k="amenity">
                 <m v="kindergarten|school|college|university" zoom-min="14">
-                    <area fill="#524459" stroke="#b094bf" stroke-width="0.2" />
+                    <area fill="#524459" />
                 </m>
                 <m v="hospital">
                     <area fill="#716553" />
                 </m>
                 <m v="parking" zoom-min="14">
-                    <area fill="#444434" stroke="#d4d4d4" stroke-width="0.2" />
+                    <area fill="#444434" />
                 </m>
 
                 <m closed="yes" v="fountain">
-                    <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+                    <area fill="#b4cbdc" />
                 </m>
             </m>
 
@@ -292,7 +292,7 @@
                   </m>
                 -->
                 <m v="swimming_pool">
-                    <area fill="#b4cbdc" stroke="#6060ff" stroke-width="0.2" />
+                    <area fill="#b4cbdc" />
                 </m>
 
                 <!-- <m v="track"> <m k="area" v="yes|true">
@@ -925,7 +925,7 @@
           <line stroke="#e4e4e4" width="0.3" cap="butt" />
           </m>
           <m closed="yes">
-          <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="0.05" />
+          <area fill="#e4e4e4" />
           </m>
           </m> -->
 
diff --git a/vtm-web-app/resources/assets/vtm/default_atlas.xml b/vtm-web-app/resources/assets/vtm/default_atlas.xml
index 09e6118f..f0796dcc 100644
--- a/vtm-web-app/resources/assets/vtm/default_atlas.xml
+++ b/vtm-web-app/resources/assets/vtm/default_atlas.xml
@@ -56,8 +56,7 @@
     <!-- <style-area id="greens" fill="#d2e5ce" fade="10" /> -->
 
     <!--farmland-->
-    <style-area fade="12" fill="#e4dab5" id="farmland" stroke="#d1dbc7" stroke-width="1.0"
-        use="tex1" />
+    <style-area fade="12" fill="#e4dab5" id="farmland" use="tex1" />
 
     <!-- marsh|wetland|mud|nature_reserve -->
     <style-area fade="12" fill="#deecb9" id="greens2" />
@@ -72,7 +71,7 @@
     <!-- <style-area id="wood" fill="#d1dbc7" fade="8" blend="11" blend-fill="#9ac56e" /> -->
     <style-area blend="11" blend-fill="#83aa5b" fade="8" fill="#b3d095" id="wood" use="park" />
     <!-- <style-line id="wood" fix="true" cap="butt" width="1.0" stroke="#9ac56e" /> -->
-    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" stroke="#d1dbc7" stroke-width="1.0"/> -->
+    <!-- <style-area id="wood" use="park" fill="#9ac56e" fade="8" /> -->
 
     <!-- de:Kleingartengebiet -->
     <style-area fade="12" fill="#efeae0" id="allotments" use="tex1" />
@@ -83,7 +82,7 @@
     <!--military-->
     <style-area fade="10" fill="#eeedea" id="military" />
     <!--building-->
-    <style-area fade="15" fill="#f2f0eb" id="building" stroke="#b7b6b3" stroke-width="1.0" />
+    <style-area fade="15" fill="#f2f0eb" id="building" />
     <!--<style-area id="building" fill="#e9e6e3" fade="15"/>-->
 
     <!--water-->
@@ -268,10 +267,10 @@
                     <area fill="#f2d9b1" />
                 </m>
                 <!-- <m v="parking" zoom-min="15">
-                  <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
+                  <area fill="#f4f4f4" />
                   </m>
                   <m v="fountain" closed="yes">
-                  <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+                  <area fill="#b4cbdc" />
                   </m> -->
             </m>
 
@@ -305,12 +304,9 @@
             </m>
 
             <m k="landuse|natural" v="forest|wood">
-                <m zoom-max="9" zoom-min="8">
+                <m zoom-min="8">
                     <area use="wood" />
                 </m>
-                <m zoom-min="10">
-                    <area stroke="#91bf63" stroke-width="1.0" use="wood" />
-                </m>
             </m>
 
             <!-- keep grass above forest:wood and leisure:park! -->
@@ -336,10 +332,10 @@
                   </m>
                 -->
                 <m v="parking" zoom-min="15">
-                    <area fill="#f4f4f4" stroke="#d4d4d4" stroke-width="0.2" />
+                    <area fill="#f4f4f4" />
                 </m>
                 <m closed="yes" v="fountain">
-                    <area fill="#b4cbdc" stroke="#000080" stroke-width="0.15" />
+                    <area fill="#b4cbdc" />
                 </m>
 
             </m>
@@ -385,7 +381,7 @@
                     <line cap="butt" fix="true" stroke="#d9d9a3" width="1.0" />
                 </m>
                 <m v="swimming_pool">
-                    <area fill="#d4ebfc" stroke="#6060ff" stroke-width="0.2" />
+                    <area fill="#d4ebfc" />
                 </m>
 
                 <!-- <m v="track"> <m k="area" v="yes|true">
@@ -607,6 +603,7 @@
             <!-- Airport passenger building -->
             <m v="terminal|hangar">
                 <area use="building" />
+                <line use="building" />
             </m>
         </m>
 
@@ -620,6 +617,7 @@
             <m zoom-max="16" zoom-min="14">
                 <m closed="yes">
                     <area fade="14" use="building" />
+                    <line fade="14" use="building" />
                 </m>
                 <m closed="no">
                     <line fade="14" use="building" />
@@ -905,7 +903,7 @@
                 <line cap="butt" stroke="#e4e4e4" width="0.3" />
             </m>
             <m closed="yes">
-                <area fill="#e4e4e4" stroke="#d0d0d0" stroke-width="1.05" />
+                <area fill="#e4e4e4" />
             </m>
         </m>
 
@@ -924,7 +922,7 @@
             <m k="tunnel" v="~|false|no">
 
                 <m k="railway" v="station">
-                    <area fill="#dbdbc9" stroke="#707070" stroke-width="0.3" />
+                    <area fill="#dbdbc9" />
                 </m>
 
                 <!-- railway bridge casings -->