Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 3614)
+++ /trunk/data/defaultpresets.xml	(revision 3615)
@@ -1739,6 +1739,6 @@
     </group> <!-- Aeroway -->
   </group>
-  <group name="Travel" icon="presets/bed.png">
-    <group name="Accomodation" icon="presets/bed.png">
+  <group name="Facilities" icon="presets/bed.png">
+    <group name="Accommodation" icon="presets/bed.png">
         <item name="Hotel" icon="presets/bed.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
@@ -2031,5 +2031,5 @@
         </item>
     </group> <!-- Food+Drinks -->
-    <group name="Tourism" icon="presets/State_Public.png">
+    <group name="Tourism" icon="presets/sightseeing.png">
         <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway">
             <label text="Edit Attraction" />
@@ -2038,34 +2038,4 @@
             <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
         </item>
-        <item name="Museum" icon="presets/State_Public.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-            <label text="Edit Museum" />
-            <key key="tourism" value="museum" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-        </item>
-        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-            <label text="Edit Zoo" />
-            <key key="tourism" value="zoo" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
-        </item>
-        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
-            <label text="Edit Theme Park" />
-            <key key="tourism" value="theme_park" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-            <label text="Edit Artwork" />
-            <key key="tourism" value="artwork" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <separator/>
         <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
@@ -2075,25 +2045,4 @@
 <!--<check key="man_made" value="tower" text="Look-Out Tower" default="off" delete_if_empty="true" />-->
         </item>
-        <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
-            <label text="Edit Shelter" />
-            <key key="amenity" value="shelter" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
-        </item>
-        <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
-            <label text="Edit Picnic Site" />
-            <key key="tourism" value="picnic_site" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
-        </item>
-        <item name="Public Grill" icon="presets/bbq.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
-            <label text="Edit Public Grill"/>
-            <space />            
-            <key key="amenity" value="bbq" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="covered" text="Covered" values="yes,no" default="" delete_if_empty="true" />                               
-            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" default="" delete_if_empty="true" />                               
-        </item>     	
         <separator/>
         <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway">
@@ -2141,10 +2090,7 @@
             <check key="mtb" text="Mountainbiking" default="off" delete_if_empty="true" />
             <check key="ski" text="Skiing" default="off" delete_if_empty="true" />
+            <check key="ski" text="Skiing" default="off" delete_if_empty="true" />
             <check key="horse" text="Riding" default="off" delete_if_empty="true" />
             <label text="... other transportation modes possible" />
-        </item>
-        <item name="Flagpole" icon="presets/flag.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
-            <key key="man_made" value="flagpole" />
         </item>
         <item name="Information Terminal" icon="presets/information.png" type="node">
@@ -2178,68 +2124,27 @@
         </item>
     </group> <!-- Tourism -->
-    <group name="Historic Places" icon="presets/State_Tourist.png">
-        <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-            <label text="Edit Castle" />
-            <key key="historic" value="castle" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
+    <group name="Leisure" icon="presets/theme_park.png">
+        <item name="Cinema" icon="presets/cinema.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
+            <label text="Edit Cinema" />
+            <key key="amenity" value="cinema" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Zoo" icon="presets/zoo.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
+            <label text="Edit Zoo" />
+            <key key="tourism" value="zoo" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
             <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
         </item>
-        <item name="Ruins" icon="presets/ruins.png" type="node,closedway">
-            <label text="Edit Ruins" />
-            <key key="historic" value="ruins" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-            <label text="Edit Archaeological Site" />
-            <key key="historic" value="archaeological_site" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-            <label text="Edit Battlefield" />
-            <key key="historic" value="battlefield" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-            <label text="Edit Palaeontological Site" />
-            <key key="geological" value="palaeontological_site" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <separator/>
-        <item name="Monument" icon="presets/monument.png" type="node,closedway">
-            <label text="Edit Monument" />
-            <key key="historic" value="monument" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Memorial" icon="presets/memorial.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-            <label text="Edit Memorial" />
-            <key key="historic" value="memorial" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway">
-            <label text="Edit Wayside Cross" />
-            <key key="historic" value="wayside_cross" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway">
-            <label text="Edit Wayside Shrine" />
-            <key key="historic" value="wayside_shrine" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway">
-            <label text="Edit Boundary Stone" />
-            <key key="historic" value="boundary_stone" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-    </group> <!-- Historic Places -->
-    <group name="Leisure" icon="presets/kindergarten.png">
+        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway">
+            <label text="Edit Theme Park" />
+            <key key="tourism" value="theme_park" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
         <item name="Water Park" icon="presets/swimming.png" type="node,closedway">
             <label text="Edit Water Park" />
@@ -2247,16 +2152,5 @@
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
-        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-            <label text="Edit Playground" />
-            <key key="leisure" value="playground" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Fishing" icon="presets/fishing.png" type="node,closedway">
-            <label text="Edit Fishing" />
-            <key key="leisure" value="fishing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-         <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
+        <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway">
             <label text="Edit Sauna" />
             <space />         	
@@ -2268,328 +2162,94 @@
             <text key="operator" text="Operator" de.text="Betreiber" default="" delete_if_empty="true" />            
             <combo key="opening_hours" text="Opening Hours" de.text="Öffnungszeiten" values="Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" /> 
-            <combo key="access" text="Zugang" values="yes,permissive,private,unknown" default="" delete_if_empty="true" />                                           
+            <combo key="access" text="Access" values="yes,permissive,private,unknown" default="" delete_if_empty="true" />                                           
         </item> 
+        <separator/>
+        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
+            <label text="Edit Playground" />
+            <key key="leisure" value="playground" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway">
+            <label text="Edit Picnic Site" />
+            <key key="tourism" value="picnic_site" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
+        </item>
+        <item name="Public Grill" icon="presets/bbq.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dbbq" />
+            <label text="Edit Public Grill"/>
+            <space />            
+            <key key="amenity" value="bbq" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="covered" text="Covered" values="yes,no" default="" delete_if_empty="true" />                               
+            <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" default="" delete_if_empty="true" />                               
+        </item>     	
+        <item name="Fishing" icon="presets/fishing.png" type="node,closedway">
+            <label text="Edit Fishing" />
+            <key key="leisure" value="fishing" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
     </group> <!-- Leisure -->
-  </group>
-  <group name="Sports" icon="presets/soccer.png">
-    <group name="Sport Facilities" icon="presets/stadium.png">
-        <item name="Stadium" icon="presets/stadium.png" type="node,closedway">
-            <label text="Edit Stadium" />
-            <key key="leisure" value="stadium" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <space />
-            <label text="select sport:" />
-            <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
-        </item>
-        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
-            <label text="Edit Sports Centre" />
-            <key key="leisure" value="sports_centre" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <space />
-            <label text="select sport:" />
-            <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
-        </item>
-        <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
-            <label text="Edit Pitch" />
-            <key key="leisure" value="pitch" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <space />
-            <label text="select sport:" />
-            <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
-        </item>
-        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
-            <label text="Edit Racetrack" />
-            <key key="leisure" value="track" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <space />
-            <label text="select sport:" />
-            <space />
-            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
-        </item>
-        <item name="Golf Course" icon="presets/golf.png" type="node,closedway">
-            <label text="Edit Golf Course" />
-            <key key="leisure" value="golf_course" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
-            <label text="Edit Miniature Golf" />
-            <key key="leisure" value="miniature_golf" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-    </group>
-    <group name="Sport" icon="presets/rowing.png">
-        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
-            <label text="Edit Multi" />
-            <key key="sport" value="multi" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
-            <label text="Edit 10pin" />
-            <key key="sport" value="10pin" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Athletics" icon="presets/empty.png" type="node,closedway">
-            <label text="Edit Athletics" />
-            <key key="sport" value="athletics" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
-            <label text="Edit Archery" />
-            <key key="sport" value="archery" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
-            <label text="Edit Climbing" />
-            <key key="sport" value="climbing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
-            <label text="Edit Canoeing" />
-            <key key="sport" value="canoe" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Cycling" icon="presets/cycling.png" type="node,closedway">
-            <label text="Edit Cycling" />
-            <key key="sport" value="cycling" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway">
-            <label text="Edit Dog Racing" />
-            <key key="sport" value="dog_racing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway">
-            <label text="Edit Equestrian" />
-            <key key="sport" value="equestrian" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway">
-            <label text="Edit Horse Racing" />
-            <key key="sport" value="horse_racing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway">
-            <label text="Edit Gymnastics" />
-            <key key="sport" value="gymnastics" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Skating" icon="presets/empty.png" type="node,closedway">
-            <label text="Edit Skating" />
-            <key key="sport" value="skating" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway">
-            <label text="Edit Skateboard" />
-            <key key="sport" value="skateboard" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Swimming" icon="presets/swimming.png" type="node,closedway">
-            <label text="Edit Swimming" />
-            <key key="sport" value="swimming" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-            <label text="Edit Skiing" />
-            <key key="sport" value="skiing" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="piste:type" text="Piste type" values="downhill,nordic,snow_park" default="" delete_if_empty="true" />
-            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Shooting" icon="presets/range.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-            <label text="Edit Shooting" />
-            <key key="sport" value="shooting" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-    </group>
-    <group name="Sport (Ball)" icon="presets/soccer.png">
-        <item name="Soccer" icon="presets/soccer.png" type="node,closedway">
-            <label text="Edit Soccer" />
-            <key key="sport" value="soccer" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
-            <label text="Edit Australian Football" />
-            <key key="sport" value="australian_football" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="American Football" icon="presets/football.png" type="node,closedway">
-            <label text="Edit American Football" />
-            <key key="sport" value="american_football" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
-            <label text="Edit Canadian Football" />
-            <key key="sport" value="canadian_football" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Gaelic Football" icon="presets/soccer.png" type="node,closedway">
-            <label text="Edit Gaelic Football" />
-            <key key="sport" value="gaelic_football" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Rugby League" icon="presets/football.png" type="node,closedway">
-            <label text="Edit Rugby League" />
-            <key key="sport" value="rugby_league" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
-            <label text="Edit Rugby Union" />
-            <key key="sport" value="rugby_union" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
-            <label text="Edit Baseball" />
-            <key key="sport" value="baseball" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
-            <label text="Edit Basketball" />
-            <key key="sport" value="basketball" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Golf" icon="presets/golf.png" type="node,closedway">
-            <label text="Edit Golf" />
-            <key key="sport" value="golf" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="golf_course,pitch,sports_centre,stadium,track" default="golf_course" delete_if_empty="true" />
-        </item>
-        <item name="Boule" icon="presets/boule.png" type="node,closedway">
-            <label text="Edit Boule" />
-            <key key="sport" value="boules" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Bowls" icon="presets/boule.png" type="node,closedway">
-            <label text="Edit Bowls" />
-            <key key="sport" value="bowls" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
-            <label text="Edit Cricket" />
-            <key key="sport" value="cricket" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
-            <label text="Edit Cricket Nets" />
-            <key key="sport" value="cricket_nets" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
-            <label text="Edit Croquet" />
-            <key key="sport" value="croquet" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
-            <label text="Edit Hockey" />
-            <key key="sport" value="hockey" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Pelota" icon="presets/empty.png" type="node,closedway">
-            <label text="Edit Pelota" />
-            <key key="sport" value="pelota" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
-            <label text="Edit Racquet" />
-            <key key="sport" value="racquet" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway">
-            <label text="Edit Table Tennis" />
-            <key key="sport" value="table_tennis" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Tennis" icon="presets/tennis.png" type="node,closedway">
-            <label text="Edit Tennis" />
-            <key key="sport" value="tennis" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-    </group>
-    <group name="Motorsport" icon="presets/motorbike.png">
-        <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway">
-            <label text="Edit Motorsport" />
-            <key key="sport" value="motor" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Karting" icon="presets/empty.png" type="node,closedway">
-            <label text="Edit Karting" />
-            <key key="sport" value="karting" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway">
-            <label text="Edit Motocross" />
-            <key key="sport" value="motocross" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="Safety Training" icon="presets/empty.png" type="node,closedway">
-            <label text="Edit Safety Training" />
-            <key key="sport" value="safety_training" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
-        </item>
-        <separator/>
-        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway">
-            <label text="Edit Model Aerodrome" />
-            <key key="sport" value="model_aerodrome" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
-        </item>
-        <item name="RC Car" icon="presets/car.png" type="node,closedway">
-            <label text="Edit RC Car" />
-            <key key="sport" value="rc_car" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
-        </item>
-    </group>
-  </group>
-  <group name="Man-Made" icon="presets/works.png">
-    <group name="Buildings" icon="presets/townhall.png">
-        <item name="Building" icon="presets/empty.png" type="closedway,relation">
-            <key key="building" value="yes" />
-        </item>
+    <group name="Culture" icon="presets/theater.png">
+        <item name="Museum" icon="presets/State_Public.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+            <label text="Edit Museum" />
+            <key key="tourism" value="museum" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+        </item>
+        <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
+            <label text="Edit Theatre" />
+            <key key="amenity" value="theatre" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
+            <label text="Edit Library" />
+            <key key="amenity" value="library" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
+            <label text="Edit Arts Centre" />
+            <key key="amenity" value="arts_centre" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+            <label text="Edit Artwork" />
+            <key key="tourism" value="artwork" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Place of Worship" icon="presets/church.png" type="node,closedway,relation">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
+                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
+            <label text="Edit Place of Worship" />
+            <key key="amenity" value="place_of_worship" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" default="" delete_if_empty="true" />
+            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Recording Studio" icon="presets/studio.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
+            <label text="Edit Studio" />
+            <space />            
+            <key key="amenity" value="studio" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />            
+            <combo key="type" text="Type" values="audio,video" default="" delete_if_empty="true" />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <text key="website" text="Website" default="" delete_if_empty="true" />                          
+        </item>        
+    </group> <!-- Culture -->
+    <group name="Public Building" icon="presets/townhall.png">
         <item name="Public Building" icon="styles/standard/service.png" type="node,closedway,relation">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
@@ -2646,16 +2306,6 @@
         <text key="operator" text="Operator" default="" delete_if_empty="true" />
         </item>
-        <item name="Studio" icon="presets/studio.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dstudio" />
-            <label text="Edit Studio" />
-            <space />            
-            <key key="amenity" value="studio" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />            
-            <combo key="type" text="Type" values="audio,video" default="" delete_if_empty="true" />
-            <text key="phone" text="Phone" default="" delete_if_empty="true" />
-            <text key="website" text="Website" default="" delete_if_empty="true" />                          
-        </item>        
-        <separator/>
+    </group> <!-- Public Buildings -->
+    <group name="Education" icon="presets/school.png">
         <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation">
             <label text="Edit Kindergarten" />
@@ -2690,204 +2340,72 @@
             <text key="license_classes" text="License Classes" values="A1;A;B;BE;C" default="" delete_if_empty="true" />
         </item>
-        <separator/>
-        <item name="Cinema" icon="presets/cinema.png" type="node,closedway,relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-            <label text="Edit Cinema" />
-            <key key="amenity" value="cinema" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-            <label text="Edit Library" />
-            <key key="amenity" value="library" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-            <label text="Edit Arts Centre" />
-            <key key="amenity" value="arts_centre" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-            <label text="Edit Theatre" />
-            <key key="amenity" value="theatre" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Place of Worship" icon="presets/church.png" type="node,closedway,relation">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
-                  sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-            <label text="Edit Place of Worship" />
-            <key key="amenity" value="place_of_worship" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" default="" delete_if_empty="true" />
-            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-    </group> <!-- Buildings -->
-    <group name="Man Made" icon="presets/works.png">
-        <item name="Works" icon="presets/works.png" type="node,closedway">
-            <label text="Edit Works" />
-            <key key="man_made" value="works" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Tower" icon="presets/tower.png" type="node,closedway">
-            <label text="Edit Tower" />
-            <key key="man_made" value="tower" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="tower:type" text="Tower type" values="communication,observation" />
-            <optional>
-                <text key="height" text="Height (meters)" delete_if_empty="true" />
-                <text key="operator" text="Operator" delete_if_empty="true" />
-            </optional>
-        </item>
-        <item name="Chimney" icon="presets/chimney.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
-            <label text="Edit Chimney" />
+    </group> <!-- Education -->
+    <group name="Health" icon="presets/pharmacy.png">
+        <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+            <label text="Edit Doctors" />
+            <key key="amenity" value="doctors" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
+            <label text="Edit Dentist" />
+            <key key="amenity" value="dentist" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+            <label text="Edit Pharmacy" />
+            <key key="amenity" value="pharmacy" />
+            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" delete_if_empty="true" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
+            <label text="Edit Hearing Aids" />
             <space />            
-            <key key="man_made" value="chimney" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />            
-            <text key="height" text="Height (meters)" default="" delete_if_empty="true" />            
-        </item>
-        <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
-            <label text="Edit Water Tower" />
-            <key key="man_made" value="water_tower" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway">
-            <label text="Edit Gasometer" />
-            <key key="man_made" value="gasometer" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Lighthouse" icon="presets/lighthouse.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-            <label text="Edit Lighthouse" />
-            <key key="man_made" value="lighthouse" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Windmill" icon="presets/windmill.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-            <label text="Edit Windmill" />
-            <key key="man_made" value="windmill" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
-            <label text="Edit Watermill"/>
-            <space />            
-            <key key="man_made" value="watermill" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>       
-        <item name="Pipeline" icon="presets/empty.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-            <label text="Edit Pipeline" />
-            <key key="man_made" value="pipeline" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="type" text="Type" values="water,gas,heat,oil,sewage,any substance" default="" delete_if_empty="true" />
-            <combo key="location" text="Location" values="underground,underwater,overground" default="" delete_if_empty="true" />
-        </item>
-        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-            <label text="Edit Wastewater Plant" />
-            <key key="man_made" value="wastewater_plant" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Crane" icon="presets/crane.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-            <label text="Edit Crane" />
-            <key key="man_made" value="crane" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft"
-                de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
-            <label text="Edit Mineshaft" />
-            <key key="man_made" value="mineshaft" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="mineshaft_type" text="Function" values="winding,air" default="" delete_if_empty="true" />
-            <text key="depth" text="Depth in meters" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" default="" delete_if_empty="true" />
-            <combo key="headframe" text="Visible Headframe" values="yes,no" default="" delete_if_empty="true" />  
-            <check key="disused" text="Mineshaft Disused" default="off" delete_if_empty="true" />                                                             
-        </item>
-        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-            <label text="Edit Beacon" />
-            <key key="man_made" value="beacon" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Survey Point" icon="presets/survey_point.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-            <label text="Edit Survey Point" />
-            <key key="man_made" value="survey_point" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Surveillance" icon="presets/surveillance.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-            <label text="Edit Surveillance Camera" />
-            <key key="man_made" value="surveillance" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="surveillance" text="Type" values="indoor,outdoor,public" default="" />
-        </item>
-        <separator/>
-        <item name="Power Generator" icon="presets/power.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-            <label text="Edit Power Generator" />
-            <key key="power" value="generator" />
-            <combo key="power_source" text="Type" values="wind,hydro,fossil,nuclear,coal,photovoltaic,gas" default="" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Power Station" icon="presets/power.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-            <label text="Edit Power Station" />
-            <key key="power" value="station" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference" default="" delete_if_empty="true" />
-        </item>
-        <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-            <label text="Edit Power Sub Station" />
-            <key key="power" value="sub_station" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Line reference" default="" delete_if_empty="true" />
-        </item>
-        <item name="Power Tower" icon="presets/power_tower.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-            <label text="Edit Power Tower" />
-            <combo key="power" text="Type" values="tower,pole" default="tower" delete_if_empty="true" />
-            <text key="ref" text="Tower reference" default="" delete_if_empty="true" />
-        </item>
-        <item name="Power Line" icon="presets/power.png" type="way">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-            <label text="Edit Power Line" />
-            <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Line reference" default="" delete_if_empty="true" />
-            <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-            <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" default="" delete_if_empty="true" />
-            <text key="cables" text="Amount of Cables" default="" delete_if_empty="true" />
-            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" default="" delete_if_empty="true" />
-        </item>
-    </group> <!-- Man Made -->
-    <group name="Amenities" icon="presets/telephone.png">
+            <key key="shop" value="hearing_aids" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />            
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>             
+        <item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+            <label text="Edit Hospital" />
+            <key key="amenity" value="hospital" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Baby Hatch" icon="presets/empty.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+            <label text="Edit Baby Hatch" />
+            <key key="amenity" value="baby_hatch" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
+        </item>
+        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
+            <label text="Edit Emergency Access Point" />
+            <space />
+            <key key="highway" value="emergency_access_point" />
+            <text key="ref" text="Point Number" default="" delete_if_empty="true" />
+            <text key="name" text="Point Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+            <label text="(Use international code, like +12-345-67890)" />
+            <space />
+        </item>
+        <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
+            <label text="Edit Veterinary" />
+            <key key="amenity" value="veterinary" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Health -->
+    <group name="Facilities" icon="presets/telephone.png">
         <item name="Toilets" icon="presets/toilet.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
@@ -2950,4 +2468,5 @@
             <key key="amenity" value="waste_basket" />
         </item>
+        <separator/>
         <item name="Bench" icon="presets/bench.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
@@ -2958,4 +2477,10 @@
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" default="" delete_if_empty="true" />
         </item>
+        <item name="Shelter" icon="presets/shelter.png" type="node,closedway">
+            <label text="Edit Shelter" />
+            <key key="amenity" value="shelter" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <check key="fireplace" text="Fireplace" default="off" delete_if_empty="true" />
+        </item>
         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">
             <label text="Edit Hunting Stand" />
@@ -2966,4 +2491,5 @@
             <combo key="lock" text="Lock" values="yes,no,unknown" default="" delete_if_empty="true" />
         </item>
+        <separator/>
         <item name="Fountain" icon="presets/spring.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
@@ -2986,5 +2512,556 @@
             <key key="amenity" value="fire_hydrant" />
         </item>
-    </group> <!-- Amenities -->
+    </group> <!-- Facilities -->
+  </group>  <!-- Facilities -->
+  <group name="Sports" icon="presets/soccer.png">
+    <group name="Sport Facilities" icon="presets/stadium.png">
+        <item name="Stadium" icon="presets/stadium.png" type="node,closedway">
+            <label text="Edit Stadium" />
+            <key key="leisure" value="stadium" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <space />
+            <label text="select sport:" />
+            <space />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
+        </item>
+        <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway">
+            <label text="Edit Sports Centre" />
+            <key key="leisure" value="sports_centre" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <space />
+            <label text="select sport:" />
+            <space />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
+        </item>
+        <item name="Pitch" icon="presets/pitch.png" type="node,closedway">
+            <label text="Edit Pitch" />
+            <key key="leisure" value="pitch" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <space />
+            <label text="select sport:" />
+            <space />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
+        </item>
+        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
+            <label text="Edit Racetrack" />
+            <key key="leisure" value="track" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <space />
+            <label text="select sport:" />
+            <space />
+            <combo key="sport" text="sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
+        </item>
+        <item name="Golf Course" icon="presets/golf.png" type="node,closedway">
+            <label text="Edit Golf Course" />
+            <key key="leisure" value="golf_course" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway">
+            <label text="Edit Miniature Golf" />
+            <key key="leisure" value="miniature_golf" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Sport facilities -->
+    <group name="Sport" icon="presets/rowing.png">
+        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway">
+            <label text="Edit Multi" />
+            <key key="sport" value="multi" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway">
+            <label text="Edit 10pin" />
+            <key key="sport" value="10pin" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Athletics" icon="presets/empty.png" type="node,closedway">
+            <label text="Edit Athletics" />
+            <key key="sport" value="athletics" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway">
+            <label text="Edit Archery" />
+            <key key="sport" value="archery" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,closedway">
+            <label text="Edit Climbing" />
+            <key key="sport" value="climbing" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway">
+            <label text="Edit Canoeing" />
+            <key key="sport" value="canoe" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Cycling" icon="presets/cycling.png" type="node,closedway">
+            <label text="Edit Cycling" />
+            <key key="sport" value="cycling" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway">
+            <label text="Edit Dog Racing" />
+            <key key="sport" value="dog_racing" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway">
+            <label text="Edit Equestrian" />
+            <key key="sport" value="equestrian" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway">
+            <label text="Edit Horse Racing" />
+            <key key="sport" value="horse_racing" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway">
+            <label text="Edit Gymnastics" />
+            <key key="sport" value="gymnastics" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Skating" icon="presets/empty.png" type="node,closedway">
+            <label text="Edit Skating" />
+            <key key="sport" value="skating" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway">
+            <label text="Edit Skateboard" />
+            <key key="sport" value="skateboard" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Swimming" icon="presets/swimming.png" type="node,closedway">
+            <label text="Edit Swimming" />
+            <key key="sport" value="swimming" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+            <label text="Edit Skiing" />
+            <key key="sport" value="skiing" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="piste:type" text="Piste type" values="downhill,nordic,snow_park" default="" delete_if_empty="true" />
+            <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Shooting" icon="presets/range.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
+            <label text="Edit Shooting" />
+            <key key="sport" value="shooting" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Sport -->
+    <group name="Sport (Ball)" icon="presets/soccer.png">
+        <item name="Soccer" icon="presets/soccer.png" type="node,closedway">
+            <label text="Edit Soccer" />
+            <key key="sport" value="soccer" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Australian Football" icon="presets/soccer.png" type="node,closedway">
+            <label text="Edit Australian Football" />
+            <key key="sport" value="australian_football" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="American Football" icon="presets/football.png" type="node,closedway">
+            <label text="Edit American Football" />
+            <key key="sport" value="american_football" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Canadian Football" icon="presets/football.png" type="node,closedway">
+            <label text="Edit Canadian Football" />
+            <key key="sport" value="canadian_football" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Gaelic Football" icon="presets/soccer.png" type="node,closedway">
+            <label text="Edit Gaelic Football" />
+            <key key="sport" value="gaelic_football" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Rugby League" icon="presets/football.png" type="node,closedway">
+            <label text="Edit Rugby League" />
+            <key key="sport" value="rugby_league" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Rugby Union" icon="presets/football.png" type="node,closedway">
+            <label text="Edit Rugby Union" />
+            <key key="sport" value="rugby_union" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Baseball" icon="presets/baseball.png" type="node,closedway">
+            <label text="Edit Baseball" />
+            <key key="sport" value="baseball" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Basketball" icon="presets/basketball.png" type="node,closedway">
+            <label text="Edit Basketball" />
+            <key key="sport" value="basketball" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Golf" icon="presets/golf.png" type="node,closedway">
+            <label text="Edit Golf" />
+            <key key="sport" value="golf" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="golf_course,pitch,sports_centre,stadium,track" default="golf_course" delete_if_empty="true" />
+        </item>
+        <item name="Boule" icon="presets/boule.png" type="node,closedway">
+            <label text="Edit Boule" />
+            <key key="sport" value="boules" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Bowls" icon="presets/boule.png" type="node,closedway">
+            <label text="Edit Bowls" />
+            <key key="sport" value="bowls" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Cricket" icon="presets/cricket.png" type="node,closedway">
+            <label text="Edit Cricket" />
+            <key key="sport" value="cricket" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway">
+            <label text="Edit Cricket Nets" />
+            <key key="sport" value="cricket_nets" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway">
+            <label text="Edit Croquet" />
+            <key key="sport" value="croquet" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Hockey" icon="presets/Hockey.png" type="node,closedway">
+            <label text="Edit Hockey" />
+            <key key="sport" value="hockey" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Pelota" icon="presets/empty.png" type="node,closedway">
+            <label text="Edit Pelota" />
+            <key key="sport" value="pelota" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Racquet" icon="presets/racquetball.png" type="node,closedway">
+            <label text="Edit Racquet" />
+            <key key="sport" value="racquet" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway">
+            <label text="Edit Table Tennis" />
+            <key key="sport" value="table_tennis" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Tennis" icon="presets/tennis.png" type="node,closedway">
+            <label text="Edit Tennis" />
+            <key key="sport" value="tennis" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Sport (Ball) -->
+    <group name="Motorsport" icon="presets/motorbike.png">
+        <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway">
+            <label text="Edit Motorsport" />
+            <key key="sport" value="motor" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,stadium,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Karting" icon="presets/empty.png" type="node,closedway">
+            <label text="Edit Karting" />
+            <key key="sport" value="karting" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway">
+            <label text="Edit Motocross" />
+            <key key="sport" value="motocross" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="Safety Training" icon="presets/empty.png" type="node,closedway">
+            <label text="Edit Safety Training" />
+            <key key="sport" value="safety_training" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
+        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway">
+            <label text="Edit Model Aerodrome" />
+            <key key="sport" value="model_aerodrome" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+        </item>
+        <item name="RC Car" icon="presets/car.png" type="node,closedway">
+            <label text="Edit RC Car" />
+            <key key="sport" value="rc_car" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Motorsport -->
+  </group> <!-- Sports -->
+  <group name="Man Made" icon="presets/works.png">
+    <group name="Man Made" icon="presets/works.png">
+        <item name="Building" icon="presets/empty.png" type="closedway,relation">
+            <key key="building" value="yes" />
+        </item>
+        <item name="Tower" icon="presets/tower.png" type="node,closedway">
+            <label text="Edit Tower" />
+            <key key="man_made" value="tower" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="tower:type" text="Tower type" values="communication,observation" />
+            <optional>
+                <text key="height" text="Height (meters)" delete_if_empty="true" />
+                <text key="operator" text="Operator" delete_if_empty="true" />
+            </optional>
+        </item>
+        <item name="Flagpole" icon="presets/flag.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/flagpole" />
+            <key key="man_made" value="flagpole" />
+        </item>
+        <separator/>
+        <item name="Works" icon="presets/works.png" type="node,closedway">
+            <label text="Edit Works" />
+            <key key="man_made" value="works" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Chimney" icon="presets/chimney.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
+            <label text="Edit Chimney" />
+            <space />            
+            <key key="man_made" value="chimney" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />            
+            <text key="height" text="Height (meters)" default="" delete_if_empty="true" />            
+        </item>
+        <item name="Windmill" icon="presets/windmill.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
+            <label text="Edit Windmill" />
+            <key key="man_made" value="windmill" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway">
+            <label text="Edit Gasometer" />
+            <key key="man_made" value="gasometer" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Pipeline" icon="presets/path.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
+            <label text="Edit Pipeline" />
+            <key key="man_made" value="pipeline" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="type" text="Type" values="water,gas,heat,oil,sewage,any substance" default="" delete_if_empty="true" />
+            <combo key="location" text="Location" values="underground,underwater,overground" default="" delete_if_empty="true" />
+        </item>
+        <item name="Crane" icon="presets/crane.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
+            <label text="Edit Crane" />
+            <key key="man_made" value="crane" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dmineshaft"
+                de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made%3Dmineshaft" />
+            <label text="Edit Mineshaft" />
+            <key key="man_made" value="mineshaft" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="mineshaft_type" text="Function" values="winding,air" default="" delete_if_empty="true" />
+            <text key="depth" text="Depth in meters" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="resource" text="Resource" values="aggregate,bauxite,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" default="" delete_if_empty="true" />
+            <combo key="headframe" text="Visible Headframe" values="yes,no" default="" delete_if_empty="true" />  
+            <check key="disused" text="Disused" default="off" delete_if_empty="true" />                                                             
+        </item>
+        <separator/>
+        <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway">
+            <label text="Edit Water Tower" />
+            <key key="man_made" value="water_tower" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
+            <label text="Edit Wastewater Plant" />
+            <key key="man_made" value="wastewater_plant" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dwatermill" />
+            <label text="Edit Watermill"/>
+            <space />            
+            <key key="man_made" value="watermill" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>       
+        <separator/>
+        <item name="Lighthouse" icon="presets/lighthouse.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
+            <label text="Edit Lighthouse" />
+            <key key="man_made" value="lighthouse" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
+            <label text="Edit Beacon" />
+            <key key="man_made" value="beacon" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Survey Point" icon="presets/survey_point.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
+            <label text="Edit Survey Point" />
+            <key key="man_made" value="survey_point" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Surveillance" icon="presets/surveillance.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
+            <label text="Edit Surveillance Camera" />
+            <key key="man_made" value="surveillance" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="surveillance" text="Type" values="indoor,outdoor,public" default="" />
+        </item>
+    </group> <!-- Man Made -->
+    <group name="Power" icon="presets/power.png">
+        <item name="Power Generator" icon="presets/power.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
+            <label text="Edit Power Generator" />
+            <key key="power" value="generator" />
+            <combo key="power_source" text="Type" values="wind,hydro,fossil,nuclear,coal,photovoltaic,gas" default="" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Power Station" icon="presets/power.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+            <label text="Edit Power Station" />
+            <key key="power" value="station" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="ref" text="Reference" default="" delete_if_empty="true" />
+        </item>
+        <item name="Power Sub Station" icon="presets/power.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
+            <label text="Edit Power Sub Station" />
+            <key key="power" value="sub_station" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="ref" text="Line reference" default="" delete_if_empty="true" />
+        </item>
+        <item name="Power Tower" icon="presets/power_tower.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
+                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
+            <label text="Edit Power Tower" />
+            <combo key="power" text="Type" values="tower,pole" default="tower" delete_if_empty="true" />
+            <text key="ref" text="Tower reference" default="" delete_if_empty="true" />
+        </item>
+        <item name="Power Line" icon="presets/power.png" type="way">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+            <label text="Edit Power Line" />
+            <combo key="power" text="Line type" values_context="Power Line" values="line,minor_line" default="line" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <text key="ref" text="Line reference" default="" delete_if_empty="true" />
+            <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+            <combo key="voltage" text="Voltage" values="3000,10000,15000,20000,25000,110000,220000,380000" default="" delete_if_empty="true" />
+            <text key="cables" text="Amount of Cables" default="" delete_if_empty="true" />
+            <combo key="wires" text="Number of wires (better: conductors) per power cable" values="single,double,triple,quad" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Power -->
+    <group name="Historic Places" icon="presets/State_Tourist.png">
+        <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
+            <label text="Edit Castle" />
+            <key key="historic" value="castle" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="wikipedia" text="Wikipedia" default="" delete_if_empty="true" />
+        </item>
+        <item name="Ruins" icon="presets/ruins.png" type="node,closedway">
+            <label text="Edit Ruins" />
+            <key key="historic" value="ruins" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
+            <label text="Edit Archaeological Site" />
+            <key key="historic" value="archaeological_site" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+            <label text="Edit Battlefield" />
+            <key key="historic" value="battlefield" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+            <label text="Edit Palaeontological Site" />
+            <key key="geological" value="palaeontological_site" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
+        <item name="Monument" icon="presets/monument.png" type="node,closedway">
+            <label text="Edit Monument" />
+            <key key="historic" value="monument" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Memorial" icon="presets/memorial.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
+            <label text="Edit Memorial" />
+            <key key="historic" value="memorial" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway">
+            <label text="Edit Wayside Cross" />
+            <key key="historic" value="wayside_cross" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway">
+            <label text="Edit Wayside Shrine" />
+            <key key="historic" value="wayside_shrine" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+        <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway">
+            <label text="Edit Boundary Stone" />
+            <key key="historic" value="boundary_stone" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Historic Places -->
+  </group> <!-- Structures -->
+  <group name="Shops" icon="styles/standard/shop/mall.png">
     <group name="Food" icon="styles/standard/shop/supermarket.png">
         <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway">
@@ -3008,11 +3085,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
-            <label text="Edit Confectionery" />
-            <key key="shop" value="confectionery" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
+        <separator/>
         <item name="Baker" icon="presets/baker.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
@@ -3047,4 +3118,12 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>                     
+        <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconfectionery" />
+            <label text="Edit Confectionery" />
+            <key key="shop" value="confectionery" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
         <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dmarketplace" />
@@ -3071,4 +3150,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
+        <separator/>
         <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
@@ -3085,5 +3165,158 @@
         </item>
     </group> <!-- Food -->
-    <group name="Shops" icon="styles/standard/shop/mall.png">
+    <group name="Clothes" icon="styles/standard/shop/clothes.png">
+        <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway">
+            <label text="Edit Clothes Shop" />
+            <key key="shop" value="clothes" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Boutique" icon="presets/empty.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
+            <label text="Edit Boutique" />
+            <space />            
+            <key key="shop" value="boutique" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />            
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>            
+         <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
+            <label text="Edit Shoe Shop" />
+            <key key="shop" value="shoes" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+            <label text="Edit Outdoor Shop" />
+            <key key="shop" value="outdoor" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Sports" icon="presets/rowing.png" type="node,closedway">
+            <label text="Edit Sports Shop" />
+            <key key="shop" value="sports" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
+        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+            <label text="Edit Dry Cleaning" />
+            <key key="shop" value="dry_cleaning" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+            <label text="Edit Laundry" />
+            <key key="shop" value="laundry" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
+            <label text="Edit Tailor" />
+            <key key="shop" value="tailor" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
+            <label text="Edit Fabric" />
+            <space />            
+            <key key="shop" value="fabric" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />            
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>                                                
+    </group> <!-- Clothes -->
+    <group name="Electronic" icon="styles/standard/shop/electronics.png">
+        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway">
+            <label text="Edit Computer Shop" />
+            <key key="shop" value="computer" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
+            <label text="Edit Electronics Shop" />
+            <key key="shop" value="electronics" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
+            <label text="Edit Mobile Phone" />
+            <space />            
+            <key key="shop" value="mobile_phone" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />            
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>                                     
+        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
+            <label text="Edit Vacuum Cleaner" />
+            <space />            
+            <key key="shop" value="vacuum_cleaner" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />            
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>        
+        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
+            <label text="Edit Hifi Shop" />
+            <key key="shop" value="hifi" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
+            <label text="Edit Video Shop" />
+            <key key="shop" value="video" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Electronic -->
+    <group name="Cash" icon="presets/dollar.png">
+        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+            <label text="Edit Bank" />
+            <key key="amenity" value="bank" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+            <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
+        </item>
+        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+            <label text="Edit Money Exchange" />
+            <key key="amenity" value="bureau_de_change" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+            <label text="Edit Automated Teller Machine" />
+            <key key="amenity" value="atm" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+        </item>
+    </group> <!-- Cash -->
+    <group name="Other" icon="styles/standard/shop/mall.png">
+        <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
+            <label text="Edit Department Store" />
+            <space />            
+            <key key="shop" value="department_store" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />            
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>                                  
+        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
+            <label text="Edit Mall" />
+            <space />            
+            <key key="shop" value="mall" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />            
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>                                  
+        <separator/>
         <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway">
             <label text="Edit Chemist" />
@@ -3104,13 +3337,4 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dhearing_aids"/>
-            <label text="Edit Hearing Aids" />
-            <space />            
-            <key key="shop" value="hearing_aids" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>             
         <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Djewelry"/>
@@ -3132,130 +3356,4 @@
         </item>                    
         <separator/>
-        <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store"/>
-            <label text="Edit Department Store" />
-            <space />            
-            <key key="shop" value="department_store" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>                                  
-        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmall"/>
-            <label text="Edit Mall" />
-            <space />            
-            <key key="shop" value="mall" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>                                  
-        <separator/>
-        <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway">
-            <label text="Edit Clothes Shop" />
-            <key key="shop" value="clothes" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Boutique" icon="presets/empty.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dboutique"/>
-            <label text="Edit Boutique" />
-            <space />            
-            <key key="shop" value="boutique" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>            
-         <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway">
-            <label text="Edit Shoe Shop" />
-            <key key="shop" value="shoes" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Outdoor" icon="presets/tent.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-            <label text="Edit Outdoor Shop" />
-            <key key="shop" value="outdoor" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Sports" icon="presets/rowing.png" type="node,closedway">
-            <label text="Edit Sports Shop" />
-            <key key="shop" value="sports" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-            <label text="Edit Dry Cleaning" />
-            <key key="shop" value="dry_cleaning" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Laundry" icon="presets/laundry.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-            <label text="Edit Laundry" />
-            <key key="shop" value="laundry" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway">
-            <label text="Edit Tailor" />
-            <key key="shop" value="tailor" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Fabric" icon="presets/fabric.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dfabric"/>
-            <label text="Edit Fabric" />
-            <space />            
-            <key key="shop" value="fabric" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>                                                
-        <separator/>
-        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway">
-            <label text="Edit Computer Shop" />
-            <key key="shop" value="computer" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway">
-            <label text="Edit Electronics Shop" />
-            <key key="shop" value="electronics" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dmobile_phone"/>
-            <label text="Edit Mobile Phone" />
-            <space />            
-            <key key="shop" value="mobile_phone" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>                                     
-        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop%3Dvacuum_cleaner"/>
-            <label text="Edit Vacuum Cleaner" />
-            <space />            
-            <key key="shop" value="vacuum_cleaner" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />            
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>        
-        <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway">
-            <label text="Edit Hifi Shop" />
-            <key key="shop" value="hifi" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway">
-            <label text="Edit Video Shop" />
-            <key key="shop" value="video" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <separator/>
         <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
@@ -3269,4 +3367,12 @@
             <label text="Edit Garden Centre" />
             <key key="shop" value="garden_centre" />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
+        </item>
+        <separator/>
+        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+            <label text="Edit Do-it-yourself-store" />
+            <key key="shop" value="doityourself" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
@@ -3288,11 +3394,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>                                       
-        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-            <label text="Edit Do-it-yourself-store" />
-            <key key="shop" value="doityourself" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
+        <separator/>
         <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway">
             <label text="Edit Furniture Shop" />
@@ -3328,4 +3428,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>                             
+        <separator/>
         <item name="Stationery" icon="presets/empty.png" type="node,closedway">
             <label text="Edit Stationery Shop" />
@@ -3349,4 +3450,5 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
+        <separator/>
         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway">
             <label text="Edit Travel Agency" />
@@ -3379,103 +3481,21 @@
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" default="" delete_if_empty="true" />
         </item>
-        <separator/>
-        <item name="Vending machine" icon="presets/vending_machine.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-            <label text="Edit Vending machine" />
-            <key key="amenity" value="vending_machine" />
-            <combo key="vending" text="Vending products" values="public_transport_tickets,public_transport_plans,parking_tickets,food,drinks,sweets,cigarettes,photos,animal_food,news_papers,toys,stamps,SIM-cards,telephone_vouchers,vouchers,bicycle_tube,condoms,tampons,excrement_bags" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="ref" text="Reference number" default="" delete_if_empty="true" />
-            <text key="note" text="Note" default="" delete_if_empty="true" />
-            <check key="payment:coins" text="Coins" default="off" delete_if_empty="true" />
-            <check key="payment:notes" text="Notes" default="off" delete_if_empty="true" />
-            <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" delete_if_empty="true" />
-            <check key="payment:debit_cards" text="Debit cards" default="off" delete_if_empty="true" />
-            <check key="payment:credit_cards" text="Credit cards" default="off" delete_if_empty="true" />
-            <check key="payment:account_cards" text="Account or loyalty cards" default="off" delete_if_empty="true" />
-        </item>
-    </group> <!-- Shops -->
-    <group name="Cash" icon="presets/dollar.png">
-        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-            <label text="Edit Bank" />
-            <key key="amenity" value="bank" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-            <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
-        </item>
-        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-            <label text="Edit Money Exchange" />
-            <key key="amenity" value="bureau_de_change" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-            <label text="Edit Automated Teller Machine" />
-            <key key="amenity" value="atm" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-        </item>
-    </group> <!-- Cash -->
-    <group name="Health" icon="presets/pharmacy.png">
-        <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-            <label text="Edit Doctors" />
-            <key key="amenity" value="doctors" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway">
-            <label text="Edit Dentist" />
-            <key key="amenity" value="dentist" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-            <label text="Edit Pharmacy" />
-            <key key="amenity" value="pharmacy" />
-            <combo key="dispensing" text="Dispensing" values="yes,no" default="no" delete_if_empty="true" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-        <item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-            <label text="Edit Hospital" />
-            <key key="amenity" value="hospital" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-        </item>
-        <item name="Baby Hatch" icon="presets/empty.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-            <label text="Edit Baby Hatch" />
-            <key key="amenity" value="baby_hatch" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
-        </item>
-        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-            <label text="Edit Emergency Access Point" />
-            <space />
-            <key key="highway" value="emergency_access_point" />
-            <text key="ref" text="Point Number" default="" delete_if_empty="true" />
-            <text key="name" text="Point Name" default="" delete_if_empty="true" />
-            <text key="operator" text="Operator" default="" delete_if_empty="true" />
-            <text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-            <label text="(Use international code, like +12-345-67890)" />
-            <space />
-        </item>
-        <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-            <label text="Edit Veterinary" />
-            <key key="amenity" value="veterinary" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
-        </item>
-    </group> <!-- Health -->
-  </group>
+    </group> <!-- Other -->
+    <item name="Vending machine" icon="presets/vending_machine.png" type="node">
+        <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+        <label text="Edit Vending machine" />
+        <key key="amenity" value="vending_machine" />
+        <combo key="vending" text="Vending products" values="public_transport_tickets,public_transport_plans,parking_tickets,food,drinks,sweets,cigarettes,photos,animal_food,news_papers,toys,stamps,SIM-cards,telephone_vouchers,vouchers,bicycle_tube,condoms,tampons,excrement_bags" default="" delete_if_empty="true" />
+        <text key="operator" text="Operator" default="" delete_if_empty="true" />
+        <text key="ref" text="Reference number" default="" delete_if_empty="true" />
+        <text key="note" text="Note" default="" delete_if_empty="true" />
+        <check key="payment:coins" text="Coins" default="off" delete_if_empty="true" />
+        <check key="payment:notes" text="Notes" default="off" delete_if_empty="true" />
+        <check key="payment:electronic_purses" text="Electronic purses and Charge cards" default="off" delete_if_empty="true" />
+        <check key="payment:debit_cards" text="Debit cards" default="off" delete_if_empty="true" />
+        <check key="payment:credit_cards" text="Credit cards" default="off" delete_if_empty="true" />
+        <check key="payment:account_cards" text="Account or loyalty cards" default="off" delete_if_empty="true" />
+    </item>
+  </group> <!-- Shops -->
   <group name="Geography" icon="presets/peak.png">
     <group name="Boundaries" icon="presets/boundaries.png">