diff --git a/vtm-themes/resources/assets/styles/default.xml b/vtm-themes/resources/assets/styles/default.xml
index 3fe85436..32c143c9 100644
--- a/vtm-themes/resources/assets/styles/default.xml
+++ b/vtm-themes/resources/assets/styles/default.xml
@@ -564,7 +564,7 @@
     </m>
 
     <!-- turning circles -->
-    <!-- <m k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
+    <!-- <m k="highway" v="turning_circle"> <circle radius="1.5" scale-radius="true"
       fill="#707070" />
       </m> -->
 
@@ -963,35 +963,35 @@
     <m k="barrier">
       <m zoom-min="10">
         <m v="bollard">
-          <circle r="1.5" fill="#909090" />
+          <circle radius="1.5" fill="#909090" />
         </m>
         <m v="block">
-          <circle r="1.5" fill="#909090" />
+          <circle radius="1.5" fill="#909090" />
         </m>
         <m v="gate">
-          <circle r="1.5" fill="#909090" />
+          <circle radius="1.5" fill="#909090" />
         </m>
         <m v="lift_gate">
-          <circle r="1.5" fill="#909090" />
+          <circle radius="1.5" fill="#909090" />
         </m>
       </m>
     </m>
 
     <m k="highway">
       <m v="traffic_signals">
-        <circle r="1.5" fill="#ff0000" />
+        <circle radius="1.5" fill="#ff0000" />
       </m>
       <m v="bus_stop">
-        <circle r="1.5" fill="#ff0000" />
+        <circle radius="1.5" fill="#ff0000" />
       </m>
       <m v="turning_circle">
-        <circle r="1.4" scale-radius="true" fill="#ffffff" />
+        <circle radius="1.4" scale-radius="true" fill="#ffffff" />
       </m>
     </m>
 
     <!-- historic -->
-    <!-- <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
-      width="1.5" /> <m zoom-min="17"> <caption
+    <!-- <m k="historic"> <circle radius="3" fill="#4040ff" stroke="#606060"
+      stroke-width="1.5" /> <m zoom-min="17"> <caption
       k="name" dy="-10" style="bold" size="10" fill="#4040ff" stroke="#ffffff"
       width="2.0" /> </m> </m> -->
 
@@ -1030,16 +1030,16 @@
     <!-- railway -->
     <m k="railway">
       <m v="station" zoom-min="14">
-        <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <circle radius="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
         <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
 
       <m v="halt|tram_stop">
-        <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <circle radius="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
         <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
       <m v="level_crossing">
-        <circle r="1.5" fill="#ff0000" />
+        <circle radius="1.5" fill="#ff0000" />
       </m>
     </m>
 
@@ -1228,7 +1228,7 @@
         <text use="poi" />
         </m>
         <m>
-        <circle r="1.5" fill="#ff0000" />
+        <circle radius="1.5" fill="#ff0000" />
         </m>
         </m>
         </m>
@@ -1243,7 +1243,7 @@
     </m>
 
     <m k="natural" v="tree" zoom-min="15">
-      <circle r="10" />
+      <circle radius="10" />
     </m>
   </m>
 
diff --git a/vtm-themes/resources/assets/styles/newtron.xml b/vtm-themes/resources/assets/styles/newtron.xml
index d7d3956d..5a94b645 100644
--- a/vtm-themes/resources/assets/styles/newtron.xml
+++ b/vtm-themes/resources/assets/styles/newtron.xml
@@ -2,68 +2,7 @@
 <rendertheme xmlns="http://opensciencemap.org/rendertheme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd" version="1" map-background="#000000">
 
-    <atlas img="styles/osmarender.png">
-    <rect id="airport" pos="226 38 24 24" />
-    <rect id="alpine_hut" pos="198 41 26 21" />
-    <rect id="atm" pos="279 2 14 16" />
-    <rect id="bakery" pos="305 46 22 16" />
-    <rect id="bank" pos="395 43 19 19" />
-    <rect id="bench" pos="213 29 8 10" />
-    <rect id="bicycle_rental" pos="295 2 13 16" />
-    <rect id="bus" pos="130 32 23 9" />
-    <rect id="bus_sta" pos="36 30 31 32" />
-    <rect id="cable_car" pos="2 2 29 26" />
-    <rect id="cafe" pos="216 2 14 14" />
-    <rect id="campSite" pos="329 42 20 20" />
-    <rect id="cave_entrance" pos="297 23 16 10" />
-    <rect id="chair_lift" pos="130 2 13 28" />
-    <rect id="church" pos="61 9 9 19" />
-    <rect id="cinema" pos="145 8 16 22" />
-    <rect id="drinking_water" pos="416 43 19 19" />
-    <rect id="fastfood" pos="351 42 20 20" />
-    <rect id="firebrigade" pos="130 43 36 19" />
-    <rect id="florist" pos="342 24 12 16" />
-    <rect id="fountain" pos="500 46 10 16" />
-    <rect id="gondola" pos="252 38 21 24" />
-    <rect id="helipad" pos="69 31 31 31" />
-    <rect id="hospital" pos="437 43 19 19" />
-    <rect id="hostel" pos="168 44 28 18" />
-    <rect id="hotel" pos="93 11 18 17" />
-    <rect id="information" pos="458 43 19 19" />
-    <rect id="kindergarten" pos="184 2 14 19" />
-    <rect id="library" pos="372 22 9 18" />
-    <rect id="mosque" pos="248 2 17 15" />
-    <rect id="oneway" pos="275 38 25 7" />
-    <rect id="parking" pos="373 42 20 20" />
-    <rect id="peak" pos="267 9 9 8" />
-    <rect id="petrolStation" pos="263 19 14 17" />
-    <rect id="pharmacy" pos="479 43 19 19" />
-    <rect id="playground" pos="223 18 18 18" />
-    <rect id="postbox" pos="232 2 14 14" />
-    <rect id="postoffice" pos="172 23 19 19" />
-    <rect id="pub" pos="326 26 14 14" />
-    <rect id="railway-crossing" pos="275 47 28 15" />
-    <rect id="railway-crossing-small" pos="155 32 15 9" />
-    <rect id="recycling" pos="72 11 19 18" />
-    <rect id="restaurant" pos="356 28 14 12" />
-    <rect id="school" pos="200 2 14 19" />
-    <rect id="shelter" pos="33 4 26 24" />
-    <rect id="soccer-borderless" pos="102 30 26 32" />
-    <rect id="supermarket" pos="193 23 18 16" />
-    <rect id="synagogue" pos="113 11 15 17" />
-    <rect id="telephone" pos="383 21 7 19" />
-    <rect id="tennis" pos="2 30 32 32" />
-    <rect id="theatre" pos="243 19 18 17" />
-    <rect id="toilets" pos="163 2 19 19" />
-    <rect id="traffic_signal" pos="392 21 7 19" />
-    <rect id="tree" pos="145 2 4 4" />
-    <rect id="university" pos="302 35 19 9" />
-    <rect id="viewpoint" pos="279 20 16 16" />
-    <rect id="vulcan" pos="315 25 9 8" />
-    <rect id="windmill" pos="310 2 13 19" />
-  </atlas>
-  
-   <style-text id="caption-small-blue" caption="true" dy="12" k="name" style="italic" size="14" fill="#ee000000"
+  <style-text id="caption-small-blue" caption="true" dy="12" k="name" style="italic" size="14" fill="#ee000000"
     stroke="#9930cfee" stroke-width="3.0" />
     
   <style-text id="road" k="name" style="bold" size="18" stroke="#606050" fill="#eeffee" stroke-width="2.5" />
@@ -137,7 +76,67 @@
   <style-line id="building" stroke="#303030" width="1.0" fix="true" cap="butt"/>
   <style-area id="building" fill="#ee202020" fade="15" />
 
-  
+  <atlas img="styles/osmarender.png">
+    <rect id="airport" pos="226 38 24 24" />
+    <rect id="alpine_hut" pos="198 41 26 21" />
+    <rect id="atm" pos="279 2 14 16" />
+    <rect id="bakery" pos="305 46 22 16" />
+    <rect id="bank" pos="395 43 19 19" />
+    <rect id="bench" pos="213 29 8 10" />
+    <rect id="bicycle_rental" pos="295 2 13 16" />
+    <rect id="bus" pos="130 32 23 9" />
+    <rect id="bus_sta" pos="36 30 31 32" />
+    <rect id="cable_car" pos="2 2 29 26" />
+    <rect id="cafe" pos="216 2 14 14" />
+    <rect id="campSite" pos="329 42 20 20" />
+    <rect id="cave_entrance" pos="297 23 16 10" />
+    <rect id="chair_lift" pos="130 2 13 28" />
+    <rect id="church" pos="61 9 9 19" />
+    <rect id="cinema" pos="145 8 16 22" />
+    <rect id="drinking_water" pos="416 43 19 19" />
+    <rect id="fastfood" pos="351 42 20 20" />
+    <rect id="firebrigade" pos="130 43 36 19" />
+    <rect id="florist" pos="342 24 12 16" />
+    <rect id="fountain" pos="500 46 10 16" />
+    <rect id="gondola" pos="252 38 21 24" />
+    <rect id="helipad" pos="69 31 31 31" />
+    <rect id="hospital" pos="437 43 19 19" />
+    <rect id="hostel" pos="168 44 28 18" />
+    <rect id="hotel" pos="93 11 18 17" />
+    <rect id="information" pos="458 43 19 19" />
+    <rect id="kindergarten" pos="184 2 14 19" />
+    <rect id="library" pos="372 22 9 18" />
+    <rect id="mosque" pos="248 2 17 15" />
+    <rect id="oneway" pos="275 38 25 7" />
+    <rect id="parking" pos="373 42 20 20" />
+    <rect id="peak" pos="267 9 9 8" />
+    <rect id="petrolStation" pos="263 19 14 17" />
+    <rect id="pharmacy" pos="479 43 19 19" />
+    <rect id="playground" pos="223 18 18 18" />
+    <rect id="postbox" pos="232 2 14 14" />
+    <rect id="postoffice" pos="172 23 19 19" />
+    <rect id="pub" pos="326 26 14 14" />
+    <rect id="railway-crossing" pos="275 47 28 15" />
+    <rect id="railway-crossing-small" pos="155 32 15 9" />
+    <rect id="recycling" pos="72 11 19 18" />
+    <rect id="restaurant" pos="356 28 14 12" />
+    <rect id="school" pos="200 2 14 19" />
+    <rect id="shelter" pos="33 4 26 24" />
+    <rect id="soccer-borderless" pos="102 30 26 32" />
+    <rect id="supermarket" pos="193 23 18 16" />
+    <rect id="synagogue" pos="113 11 15 17" />
+    <rect id="telephone" pos="383 21 7 19" />
+    <rect id="tennis" pos="2 30 32 32" />
+    <rect id="theatre" pos="243 19 18 17" />
+    <rect id="toilets" pos="163 2 19 19" />
+    <rect id="traffic_signal" pos="392 21 7 19" />
+    <rect id="tree" pos="145 2 4 4" />
+    <rect id="university" pos="302 35 19 9" />
+    <rect id="viewpoint" pos="279 20 16 16" />
+    <rect id="vulcan" pos="315 25 9 8" />
+    <rect id="windmill" pos="310 2 13 19" />
+  </atlas>
+
   <!-- ways -->
   <m e="way">
 
@@ -539,7 +538,7 @@
     </m>
 
     <!-- turning circles -->
-    <!-- <m k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
+    <!-- <m k="highway" v="turning_circle"> <circle radius="1.5" scale-radius="true"
       fill="#707070" />
       </m> -->
 
@@ -1023,7 +1022,7 @@
   <!-- <m e="node">
     barrier
     <m k="barrier" v="bollard">
-    <circle r="1.5" fill="#909090" />
+    <circle radius="1.5" fill="#909090" />
     </m>
 
     <m k="debug">
@@ -1032,11 +1031,11 @@
 
     highway
     <m k="highway"> <m k="highway" v="turning_circle">
-    <circle r="1.4" scale-radius="true" fill="#ffffff" /> </m> </m>
+    <circle radius="1.4" scale-radius="true" fill="#ffffff" /> </m> </m>
 
     historic
-    <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
-    width="1.5" /> <m zoom-min="17"> <caption
+    <m k="historic"> <circle radius="3" fill="#4040ff" stroke="#606060"
+    stroke-width="1.5" /> <m zoom-min="17"> <caption
     k="name" dy="-10" style="bold" size="10" fill="#4040ff" stroke="#ffffff"
     width="2.0" /> </m> </m>
 
@@ -1069,19 +1068,19 @@
     railway
     <m k="railway">
     <m v="station" zoom-min="14">
-    <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+    <circle radius="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
     <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d"
     stroke="#ffffff" stroke-width="2.0" />
     </m>
     <m v="halt|tram_stop" zoom-min="17">
-    <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+    <circle radius="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
     <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d"
     stroke="#ffffff" stroke-width="2.0" />
     </m>
     </m>
 
     <m k="natural" v="tree" zoom-min="15">
-    <circle r="10"/>
+    <circle radius="10"/>
     </m>
 
     </m> -->
@@ -1220,7 +1219,7 @@
 
 
     <m k="historic">
-      <circle radius="3" fill="#4040ff" stroke="#606060" width="1.5" />
+      <circle radius="3" fill="#4040ff" stroke="#606060" stroke-width="1.5" />
 
       <m zoom-min="17">
         <text use="caption-small-blue" />
@@ -1265,7 +1264,7 @@
     </m>-->
 
 
-    <m k="place" firt="true">
+    <m k="place" select="first">
       <m v="hamlet" zoom-min="13">
         <caption k="name" style="bold" size="13" fill="#000000" stroke="#ffffff" stroke-width="2.0" />
       </m>
@@ -1293,11 +1292,11 @@
         <symbol src="railway-crossing" />
       </m>
       <m k="railway" v="station" zoom-min="14">
-        <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <circle radius="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
         <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
       <m k="railway" v="halt|tram_stop" zoom-min="15">
-        <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <circle radius="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
         <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
     </m>
diff --git a/vtm-themes/resources/assets/styles/osmarender.xml b/vtm-themes/resources/assets/styles/osmarender.xml
index 134761a0..98854835 100644
--- a/vtm-themes/resources/assets/styles/osmarender.xml
+++ b/vtm-themes/resources/assets/styles/osmarender.xml
@@ -5,6 +5,18 @@
     version="1" 
     map-background="#fffcfa">
 
+  <style-line id="trunk" stroke="#7fc97f" width="1.5" />
+  <style-line id="motorway" stroke="#809bc0" width="1.7" />
+  <style-line id="primary" stroke="#e46d71" width="1.5" />
+  <style-line id="secondary" stroke="#fdbf6f" width="1.4" />
+  <style-line id="tertiary" stroke="#ffff90" width="1.15" />
+
+  <style-text id="caption-small-blue" caption="true" dy="12" k="name" style="bold" size="14" fill="#4040ff"
+    stroke="#ffffff" stroke-width="2.0" />
+  
+  <style-text id="highway-road" k="name" style="bold" size="16" stroke="#d0d0d0" stroke-width="2.0" /> 
+  <style-text id="highway-track" k="name" style="bold" size="16" stroke="#fff2de" stroke-width="2.0" />
+
   <atlas img="styles/osmarender.png">
     <rect id="airport" pos="226 38 24 24" />
     <rect id="alpine_hut" pos="198 41 26 21" />
@@ -66,18 +78,6 @@
     <rect id="windmill" pos="310 2 13 19" />
   </atlas>
 
-  <style-line id="trunk" stroke="#7fc97f" width="1.5" />
-  <style-line id="motorway" stroke="#809bc0" width="1.7" />
-  <style-line id="primary" stroke="#e46d71" width="1.5" />
-  <style-line id="secondary" stroke="#fdbf6f" width="1.4" />
-  <style-line id="tertiary" stroke="#ffff90" width="1.15" />
-
-  <style-text id="caption-small-blue" caption="true" dy="12" k="name" style="bold" size="14" fill="#4040ff"
-    stroke="#ffffff" stroke-width="2.0" />
-  
-  <style-text id="highway-road" k="name" style="bold" size="16" stroke="#d0d0d0" stroke-width="2.0" /> 
-  <style-text id="highway-track" k="name" style="bold" size="16" stroke="#fff2de" stroke-width="2.0" />
-  
   <!-- ways -->
   <m e="way">
     <!-- landuse -->
@@ -1277,11 +1277,11 @@
         <symbol src="railway-crossing" />
       </m>
       <m k="railway" v="station" zoom-min="14">
-        <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <circle radius="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
         <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
       <m k="railway" v="halt|tram_stop" zoom-min="15">
-        <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <circle radius="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
         <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
     </m>
diff --git a/vtm-themes/resources/assets/styles/tronrender.xml b/vtm-themes/resources/assets/styles/tronrender.xml
index dce74a84..28386d8c 100644
--- a/vtm-themes/resources/assets/styles/tronrender.xml
+++ b/vtm-themes/resources/assets/styles/tronrender.xml
@@ -2,67 +2,6 @@
 <rendertheme xmlns="http://opensciencemap.org/rendertheme" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://opensciencemap.org/rendertheme https://raw.githubusercontent.com/mapsforge/vtm/master/resources/rendertheme.xsd" version="1" map-background="#050508">
 
-  <atlas img="styles/osmarender.png">
-    <rect id="airport" pos="226 38 24 24" />
-    <rect id="alpine_hut" pos="198 41 26 21" />
-    <rect id="atm" pos="279 2 14 16" />
-    <rect id="bakery" pos="305 46 22 16" />
-    <rect id="bank" pos="395 43 19 19" />
-    <rect id="bench" pos="213 29 8 10" />
-    <rect id="bicycle_rental" pos="295 2 13 16" />
-    <rect id="bus" pos="130 32 23 9" />
-    <rect id="bus_sta" pos="36 30 31 32" />
-    <rect id="cable_car" pos="2 2 29 26" />
-    <rect id="cafe" pos="216 2 14 14" />
-    <rect id="campSite" pos="329 42 20 20" />
-    <rect id="cave_entrance" pos="297 23 16 10" />
-    <rect id="chair_lift" pos="130 2 13 28" />
-    <rect id="church" pos="61 9 9 19" />
-    <rect id="cinema" pos="145 8 16 22" />
-    <rect id="drinking_water" pos="416 43 19 19" />
-    <rect id="fastfood" pos="351 42 20 20" />
-    <rect id="firebrigade" pos="130 43 36 19" />
-    <rect id="florist" pos="342 24 12 16" />
-    <rect id="fountain" pos="500 46 10 16" />
-    <rect id="gondola" pos="252 38 21 24" />
-    <rect id="helipad" pos="69 31 31 31" />
-    <rect id="hospital" pos="437 43 19 19" />
-    <rect id="hostel" pos="168 44 28 18" />
-    <rect id="hotel" pos="93 11 18 17" />
-    <rect id="information" pos="458 43 19 19" />
-    <rect id="kindergarten" pos="184 2 14 19" />
-    <rect id="library" pos="372 22 9 18" />
-    <rect id="mosque" pos="248 2 17 15" />
-    <rect id="oneway" pos="275 38 25 7" />
-    <rect id="parking" pos="373 42 20 20" />
-    <rect id="peak" pos="267 9 9 8" />
-    <rect id="petrolStation" pos="263 19 14 17" />
-    <rect id="pharmacy" pos="479 43 19 19" />
-    <rect id="playground" pos="223 18 18 18" />
-    <rect id="postbox" pos="232 2 14 14" />
-    <rect id="postoffice" pos="172 23 19 19" />
-    <rect id="pub" pos="326 26 14 14" />
-    <rect id="railway-crossing" pos="275 47 28 15" />
-    <rect id="railway-crossing-small" pos="155 32 15 9" />
-    <rect id="recycling" pos="72 11 19 18" />
-    <rect id="restaurant" pos="356 28 14 12" />
-    <rect id="school" pos="200 2 14 19" />
-    <rect id="shelter" pos="33 4 26 24" />
-    <rect id="soccer-borderless" pos="102 30 26 32" />
-    <rect id="supermarket" pos="193 23 18 16" />
-    <rect id="synagogue" pos="113 11 15 17" />
-    <rect id="telephone" pos="383 21 7 19" />
-    <rect id="tennis" pos="2 30 32 32" />
-    <rect id="theatre" pos="243 19 18 17" />
-    <rect id="toilets" pos="163 2 19 19" />
-    <rect id="traffic_signal" pos="392 21 7 19" />
-    <rect id="tree" pos="145 2 4 4" />
-    <rect id="university" pos="302 35 19 9" />
-    <rect id="viewpoint" pos="279 20 16 16" />
-    <rect id="vulcan" pos="315 25 9 8" />
-    <rect id="windmill" pos="310 2 13 19" />
-  </atlas>
-
   <style-text id="caption-small-blue" caption="true" dy="12" k="name" style="bold" size="16" fill="#4040ff"
     stroke="#ffffff" stroke-width="2.0" />
 
@@ -137,7 +76,67 @@
   <style-line id="building" stroke="#dd888888" width="1.5" fix="true" cap="butt" />
   <style-area id="building" fill="#ee202020" fade="15" />
 
-  
+  <atlas img="styles/osmarender.png">
+    <rect id="airport" pos="226 38 24 24" />
+    <rect id="alpine_hut" pos="198 41 26 21" />
+    <rect id="atm" pos="279 2 14 16" />
+    <rect id="bakery" pos="305 46 22 16" />
+    <rect id="bank" pos="395 43 19 19" />
+    <rect id="bench" pos="213 29 8 10" />
+    <rect id="bicycle_rental" pos="295 2 13 16" />
+    <rect id="bus" pos="130 32 23 9" />
+    <rect id="bus_sta" pos="36 30 31 32" />
+    <rect id="cable_car" pos="2 2 29 26" />
+    <rect id="cafe" pos="216 2 14 14" />
+    <rect id="campSite" pos="329 42 20 20" />
+    <rect id="cave_entrance" pos="297 23 16 10" />
+    <rect id="chair_lift" pos="130 2 13 28" />
+    <rect id="church" pos="61 9 9 19" />
+    <rect id="cinema" pos="145 8 16 22" />
+    <rect id="drinking_water" pos="416 43 19 19" />
+    <rect id="fastfood" pos="351 42 20 20" />
+    <rect id="firebrigade" pos="130 43 36 19" />
+    <rect id="florist" pos="342 24 12 16" />
+    <rect id="fountain" pos="500 46 10 16" />
+    <rect id="gondola" pos="252 38 21 24" />
+    <rect id="helipad" pos="69 31 31 31" />
+    <rect id="hospital" pos="437 43 19 19" />
+    <rect id="hostel" pos="168 44 28 18" />
+    <rect id="hotel" pos="93 11 18 17" />
+    <rect id="information" pos="458 43 19 19" />
+    <rect id="kindergarten" pos="184 2 14 19" />
+    <rect id="library" pos="372 22 9 18" />
+    <rect id="mosque" pos="248 2 17 15" />
+    <rect id="oneway" pos="275 38 25 7" />
+    <rect id="parking" pos="373 42 20 20" />
+    <rect id="peak" pos="267 9 9 8" />
+    <rect id="petrolStation" pos="263 19 14 17" />
+    <rect id="pharmacy" pos="479 43 19 19" />
+    <rect id="playground" pos="223 18 18 18" />
+    <rect id="postbox" pos="232 2 14 14" />
+    <rect id="postoffice" pos="172 23 19 19" />
+    <rect id="pub" pos="326 26 14 14" />
+    <rect id="railway-crossing" pos="275 47 28 15" />
+    <rect id="railway-crossing-small" pos="155 32 15 9" />
+    <rect id="recycling" pos="72 11 19 18" />
+    <rect id="restaurant" pos="356 28 14 12" />
+    <rect id="school" pos="200 2 14 19" />
+    <rect id="shelter" pos="33 4 26 24" />
+    <rect id="soccer-borderless" pos="102 30 26 32" />
+    <rect id="supermarket" pos="193 23 18 16" />
+    <rect id="synagogue" pos="113 11 15 17" />
+    <rect id="telephone" pos="383 21 7 19" />
+    <rect id="tennis" pos="2 30 32 32" />
+    <rect id="theatre" pos="243 19 18 17" />
+    <rect id="toilets" pos="163 2 19 19" />
+    <rect id="traffic_signal" pos="392 21 7 19" />
+    <rect id="tree" pos="145 2 4 4" />
+    <rect id="university" pos="302 35 19 9" />
+    <rect id="viewpoint" pos="279 20 16 16" />
+    <rect id="vulcan" pos="315 25 9 8" />
+    <rect id="windmill" pos="310 2 13 19" />
+  </atlas>
+
   <!-- ways -->
   <m e="way">
 
@@ -539,7 +538,7 @@
     </m>
 
     <!-- turning circles -->
-    <!-- <m k="highway" v="turning_circle"> <circle r="1.5" scale-radius="true"
+    <!-- <m k="highway" v="turning_circle"> <circle radius="1.5" scale-radius="true"
       fill="#707070" />
       </m> -->
 
@@ -1015,7 +1014,7 @@
   <!-- <m e="node">
     barrier
     <m k="barrier" v="bollard">
-    <circle r="1.5" fill="#909090" />
+    <circle radius="1.5" fill="#909090" />
     </m>
 
     <m k="debug">
@@ -1024,11 +1023,11 @@
 
     highway
     <m k="highway"> <m k="highway" v="turning_circle">
-    <circle r="1.4" scale-radius="true" fill="#ffffff" /> </m> </m>
+    <circle radius="1.4" scale-radius="true" fill="#ffffff" /> </m> </m>
 
     historic
-    <m k="historic"> <circle r="3" fill="#4040ff" stroke="#606060"
-    width="1.5" /> <m zoom-min="17"> <caption
+    <m k="historic"> <circle radius="3" fill="#4040ff" stroke="#606060"
+    stroke-width="1.5" /> <m zoom-min="17"> <caption
     k="name" dy="-10" style="bold" size="10" fill="#4040ff" stroke="#ffffff"
     width="2.0" /> </m> </m>
 
@@ -1061,19 +1060,19 @@
     railway
     <m k="railway">
     <m v="station" zoom-min="14">
-    <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+    <circle radius="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
     <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d"
     stroke="#ffffff" stroke-width="2.0" />
     </m>
     <m v="halt|tram_stop" zoom-min="17">
-    <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+    <circle radius="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
     <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d"
     stroke="#ffffff" stroke-width="2.0" />
     </m>
     </m>
 
     <m k="natural" v="tree" zoom-min="15">
-    <circle r="10"/>
+    <circle radius="10"/>
     </m>
 
     </m> -->
@@ -1285,11 +1284,11 @@
         <symbol src="railway-crossing" />
       </m>
       <m k="railway" v="station" zoom-min="14">
-        <circle r="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <circle radius="6" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
         <caption k="name" dy="-10" style="bold" size="13" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
       <m k="railway" v="halt|tram_stop" zoom-min="15">
-        <circle r="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
+        <circle radius="4" fill="#ec2d2d" stroke="#606060" stroke-width="1.5" />
         <caption k="name" dy="-15" style="bold" size="11" fill="#ec2d2d" stroke="#ffffff" stroke-width="2.0" />
       </m>
     </m>