Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7392)
+++ trunk/data/defaultpresets.xml	(revision 7393)
@@ -435,5 +435,5 @@
   <!-- Link chunks -->
   <chunk id="link_contact">
-    <preset_link preset_name="Contact (common schema)" />
+    <preset_link preset_name="Contact (Common Schema)" />
   </chunk>
   <!--  Groups -->
@@ -469,5 +469,5 @@
                 </checkgroup>
             </optional>
-        </item>
+        </item> <!-- Motorway -->
         <item name="Motorway Link" icon="presets/motorway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
@@ -493,5 +493,5 @@
                 </checkgroup>
             </optional>
-        </item>
+        </item> <!-- Motorway Link -->
         <item name="Trunk" icon="presets/trunk.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
@@ -521,5 +521,5 @@
                 </checkgroup>
             </optional>
-        </item>
+        </item> <!-- Trunk -->
         <item name="Trunk Link" icon="presets/trunk.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
@@ -546,5 +546,5 @@
                 </checkgroup>
             </optional>
-        </item>
+        </item> <!-- Trunk Link -->
         <separator/>
         <item name="Primary" icon="presets/way_primary.png" type="way,closedway" preset_name_label="true">
@@ -567,5 +567,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
-        </item>
+        </item> <!-- Primary -->
         <item name="Primary Link" icon="presets/way_primary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
@@ -582,5 +582,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
-        </item>
+        </item> <!-- Primary Link -->
         <item name="Secondary" icon="presets/way_secondary.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
@@ -602,5 +602,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
-        </item>
+        </item> <!-- Secondary -->
         <item name="Secondary Link" icon="presets/way_secondary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
@@ -616,5 +616,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
-        </item>
+        </item> <!-- Secondary Link -->
         <item name="Tertiary" icon="presets/way_tertiary.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
@@ -637,5 +637,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
-        </item>
+        </item> <!-- Tertiary -->
         <item name="Tertiary Link" icon="presets/way_tertiary.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
@@ -651,5 +651,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit" />
             </optional>
-        </item>
+        </item> <!-- Tertiary Link -->
         <item name="Unclassified" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
@@ -671,5 +671,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Unclassified -->
         <item name="Residential" icon="presets/residential.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
@@ -692,5 +692,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Residential -->
         <item name="Bicycle Road" icon="presets/bicycle_road.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bicycle_road"
@@ -714,5 +714,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Bicycle Road -->
         <item name="Living Street" icon="presets/living_street.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
@@ -734,5 +734,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Living Street -->
         <item name="Pedestrian" icon="presets/pedestrian.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
@@ -758,5 +758,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Pedestrian -->
         <item name="Service" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
@@ -778,5 +778,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Service -->
         <item name="Parking Aisle" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
@@ -795,5 +795,5 @@
                 <check key="lit" text="Lit" />
             </optional>
-        </item>
+        </item> <!-- Parking Aisle -->
         <item name="Road (Unknown Type)" icon="presets/way_unclassified.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
@@ -811,5 +811,5 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
             </optional>
-        </item>
+        </item> <!-- Road (Unknown Type) -->
         <item name="Construction" icon="presets/construction.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:construction"
@@ -828,5 +828,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Construction -->
         <separator/>
         <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way" preset_name_label="true">
@@ -875,5 +875,5 @@
             <text key="maxlength" text="Max. length (meters)" match="key" />
             <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" match="key" />
-        </item>
+        </item> <!-- Road Restrictions -->
         <separator/>
         <item name="Roundabout" icon="presets/roundabout.png" type="node,closedway" preset_name_label="true">
@@ -897,5 +897,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Roundabout -->
         <item name="Bridge" icon="presets/bridge.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
@@ -921,5 +921,5 @@
                 <check key="toll" text="Toll" />
             </optional>
-        </item>
+        </item> <!-- Bridge -->
         <item name="Ford" icon="presets/ford.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
@@ -935,5 +935,5 @@
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
-        </item>
+        </item> <!-- Ford -->
     </group> <!-- Streets -->
     <group name="Ways" icon="presets/way_unclassified.png">
@@ -965,5 +965,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Track -->
         <item name="Path" icon="presets/path.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
@@ -1001,5 +1001,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Path -->
         <separator/>
         <item name="Dedicated Bridleway" icon="presets/equestrian.png" type="way" preset_name_label="true">
@@ -1019,5 +1019,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Dedicated Bridleway -->
         <item name="Cycle Lane/Track" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Bicycle"
@@ -1042,5 +1042,5 @@
                 <check key="oneway" text="Oneway" />
             </optional>
-        </item>
+        </item> <!-- Cycle Lane/Track -->
         <item name="Dedicated Cycleway" icon="presets/cycleway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
@@ -1060,5 +1060,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Dedicated Cycleway -->
         <item name="Segregated Foot- and Cycleway" icon="presets/foot_and_cycleway_segregated.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
@@ -1075,5 +1075,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Segregated Foot- and Cycleway -->
         <item name="Combined Foot- and Cycleway" icon="presets/foot_and_cycleway_combined.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
@@ -1091,5 +1091,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Combined Foot- and Cycleway -->
         <item name="Dedicated Footway" icon="presets/footway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
@@ -1112,5 +1112,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Dedicated Footway -->
         <item name="Steps" icon="presets/steps.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
@@ -1130,5 +1130,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Steps -->
     </group> <!-- Ways -->
     <group name="Waypoints" icon="presets/waypoints.png">
@@ -1145,5 +1145,5 @@
             <text key="ref" text="Number" />
             <text key="exit_to" text="Exit to" />
-        </item>
+        </item> <!-- Motorway Junction -->
         <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services"
@@ -1160,5 +1160,5 @@
                 <check key="toilets" text="Toilets" />
             </optional>
-        </item>
+        </item> <!-- Services -->
         <item name="Rest Area" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area"
@@ -1176,5 +1176,5 @@
                 <check key="drinking_water" text="Drinking Water" />
             </optional>
-        </item>
+        </item> <!-- Rest Area -->
         <separator/>
         <item name="Traffic Signal" icon="presets/traffic-light.png" type="node" preset_name_label="true">
@@ -1192,5 +1192,5 @@
                 <check key="horse" text="Cross on horseback" />
             </optional>
-        </item>
+        </item> <!-- Traffic Signal -->
         <item name="Stop" icon="presets/Stop.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stop"
@@ -1201,6 +1201,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=stop" />
             <key key="highway" value="stop" />
-        </item>
-        <item name="Give way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node" preset_name_label="true">
+        </item> <!-- Stop -->
+        <item name="Give Way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=give_way"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=give_way"
@@ -1210,6 +1210,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=give_way" />
             <key key="highway" value="give_way" />
-        </item>
-        <item name="Mini-roundabout" icon="presets/roundabout_left.png" type="node" preset_name_label="true">
+        </item> <!-- Give Way -->
+        <item name="Mini-Roundabout" icon="presets/roundabout_left.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
@@ -1221,5 +1221,5 @@
             <space />
             <combo key="direction" text="Direction" values="clockwise" />
-        </item>
+        </item> <!-- Mini-Roundabout -->
         <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
@@ -1239,5 +1239,5 @@
             <check key="bicycle" text="Cross by bicycle" />
             <check key="horse" text="Cross on horseback" />
-        </item>
+        </item> <!-- Pedestrian Crossing -->
         <item name="Traffic Calming" icon="presets/chicane.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
@@ -1252,5 +1252,5 @@
             <space />
             <combo key="traffic_calming" text="Type" values="yes,bump,chicane,choker,cushion,hump,island,rumble_strip,table" match="key" values_searchable="true" />
-        </item>
+        </item> <!-- Traffic Calming -->
         <item name="Passing Place" icon="presets/passingplace.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"
@@ -1258,5 +1258,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=passing_place" />
             <key key="highway" value="passing_place" />
-        </item>
+        </item> <!-- Passing Place -->
         <item name="Turning Circle" icon="styles/standard/vehicle/turning_circle.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
@@ -1266,10 +1266,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=turning_circle" />
             <key key="highway" value="turning_circle" />
-        </item>
+        </item> <!-- Turning Circle -->
         <item name="Turning Loop" icon="styles/standard/vehicle/turning_loop.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_loop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_loop" />
             <key key="highway" value="turning_loop" />
-        </item>
+        </item> <!-- Turning Loop -->
         <item name="City Limit" icon="presets/citylimit.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign=city_limit"
@@ -1283,5 +1283,5 @@
             <text key="name" text="Name" />
             <text key="alt_name" text="Second Name" />
-        </item>
+        </item> <!-- City Limit -->
         <item name="Speed Camera" icon="presets/speed_camera.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
@@ -1296,5 +1296,5 @@
                 <text key="maxspeed" text="Max. speed (km/h)" />
             </optional>
-        </item>
+        </item> <!-- Speed Camera -->
         <separator/>
         <item name="Elevator" icon="styles/standard/service/elevator.png" type="node,way,closedway" preset_name_label="true">
@@ -1304,5 +1304,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=elevator" />
             <key key="highway" value="elevator" />
-        </item>
+        </item> <!-- Elevator -->
         <separator/>
         <item name="Grit Bin" icon="styles/standard/misc/grit_bin.png" type="node" preset_name_label="true">
@@ -1312,5 +1312,5 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=grit_bin" />
             <key key="amenity" value="grit_bin" />
-        </item>
+        </item> <!-- Grit Bin -->
         <separator/>
         <item name="Mountain Pass" icon="presets/mountain_pass.png" type="node" preset_name_label="true">
@@ -1327,7 +1327,7 @@
                 <text key="wikipedia" text="Wikipedia" />
             </optional>
-        </item>
+        </item> <!-- Mountain Pass -->
     </group> <!-- Waypoints -->
-    <group name="Barriers" icon="presets/barrier.png"> <!-- *** node barriers *** -->
+    <group name="Barriers" icon="presets/barrier.png"> <!-- *** Node Barriers *** -->
         <item name="Block" icon="styles/standard/vehicle/block.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=block"
@@ -1341,5 +1341,5 @@
                 <combo key="material" text="Material" values="concrete,stone" />
             </optional>
-        </item> <!-- block -->
+        </item> <!-- Block -->
         <item name="Bollard" icon="presets/bollard.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard"
@@ -1358,5 +1358,5 @@
                 <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
             </optional>
-        </item> <!-- bollard -->
+        </item> <!-- Bollard -->
         <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cycle_barrier"
@@ -1367,5 +1367,5 @@
             <reference ref="barrier_4" />
             <reference ref="optional_maxwidth" />
-        </item> <!-- cycle_barrier -->
+        </item> <!-- Cycle Barrier -->
         <item name="Cattle Grid" icon="presets/cattle_grid.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
@@ -1374,5 +1374,5 @@
             <key key="barrier" value="cattle_grid" />
             <reference ref="barrier_4" />
-        </item> <!-- cattle_grid -->
+        </item> <!-- Cattle Grid -->
         <item name="Bus Trap" icon="presets/empty.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bus_trap"
@@ -1380,5 +1380,5 @@
             <key key="barrier" value="bus_trap" />
             <reference ref="optional_maxwidth" />
-        </item> <!-- bus_trap -->
+        </item> <!-- Bus Trap -->
         <item name="Spikes" icon="presets/empty.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
@@ -1395,5 +1395,5 @@
             <key key="barrier" value="spikes" />
             <reference ref="barrier_5" />
-        </item> <!-- spikes -->
+        </item> <!-- Spikes -->
         <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
@@ -1410,11 +1410,11 @@
                 <text key="operator" text="Operator" />
             </optional>
-        </item> <!-- toll_booth -->
+        </item> <!-- Toll Booth -->
         <item name="Border Control" icon="presets/douane.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=border_control" />
             <key key="barrier" value="border_control" />
             <reference ref="barrier_5" />
-        </item> <!-- border_control -->
-        <separator/> <!-- *** linear barriers *** -->
+        </item> <!-- Border Control -->
+        <separator/> <!-- *** Linear Barriers *** -->
         <item name="Hedge" icon="presets/hedge.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge"
@@ -1433,5 +1433,5 @@
                 <text key="taxon" text="Taxon" />
             </optional>
-        </item> <!-- hedge -->
+        </item> <!-- Hedge -->
         <item name="Fence" icon="presets/fence.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence"
@@ -1448,5 +1448,5 @@
                 <text key="height" text="Height (meters)" length="7" />
             </optional>
-        </item> <!-- fence -->
+        </item> <!-- Fence -->
         <item name="Guard Rail" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
@@ -1454,5 +1454,5 @@
             <key key="barrier" value="guard_rail" />
             <reference ref="optional_height" />
-        </item> <!-- guard_rail -->
+        </item> <!-- Guard Rail -->
         <item name="Wall" icon="presets/wall.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=wall"
@@ -1466,5 +1466,5 @@
             <key key="barrier" value="wall" />
             <reference ref="optional_height" />
-        </item> <!-- wall -->
+        </item> <!-- Wall -->
         <item name="City Wall" icon="presets/city_wall.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
@@ -1474,5 +1474,5 @@
             <key key="barrier" value="city_wall" />
             <reference ref="optional_height" />
-        </item> <!-- city_wall -->
+        </item> <!-- City Wall -->
         <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall"
@@ -1486,5 +1486,5 @@
             <key key="barrier" value="retaining_wall" />
             <reference ref="optional_height" />
-        </item> <!-- retaining_wall -->
+        </item> <!-- Retaining Wall -->
         <item name="Ditch" name_context="Barrier" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=ditch"
@@ -1497,5 +1497,5 @@
                 <text key="width" text="Width (meters)" length="7" />
             </optional>
-        </item> <!-- ditch -->
+        </item> <!-- Ditch -->
         <item name="Kerb" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kerb"
@@ -1503,7 +1503,7 @@
             <key key="barrier" value="kerb" />
             <reference ref="optional_height" />
-        </item> <!-- kerb -->
-        <separator/> <!-- *** access *** -->
-        <item name="Entrance (barrier opening)" icon="styles/standard/vehicle/entrance.png" type="node" preset_name_label="true">
+        </item> <!-- Kerb -->
+        <separator/> <!-- *** Access *** -->
+        <item name="Entrance (Barrier Opening)" icon="styles/standard/vehicle/entrance.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=entrance"
@@ -1512,5 +1512,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
-        </item> <!-- entrance -->
+        </item> <!-- Entrance (Barrier Opening) -->
         <item name="Gate" icon="presets/gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
@@ -1525,5 +1525,5 @@
             <reference ref="optional_maxheight_maxwidth" />
             <reference ref="general_access" />
-        </item> <!-- gate -->
+        </item> <!-- Gate -->
         <item name="Lift Gate" icon="presets/lift_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
@@ -1537,5 +1537,5 @@
             <reference ref="optional_maxwidth" />
             <reference ref="general_access" />
-        </item> <!-- lift_gate -->
+        </item> <!-- Lift Gate -->
         <item name="Swing Gate" icon="presets/swing_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=swing_gate" />
@@ -1545,5 +1545,5 @@
             <reference ref="optional_maxwidth" />
             <reference ref="general_access" />
-        </item> <!-- swing_gate -->
+        </item> <!-- Swing Gate -->
         <item name="Hampshire Gate" icon="presets/empty.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
@@ -1561,5 +1561,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
-        </item> <!-- hampshire_gate -->
+        </item> <!-- Hampshire Gate -->
         <item name="Bump Gate" icon="presets/empty.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
@@ -1577,5 +1577,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
-        </item> <!-- bump_gate -->
+        </item> <!-- Bump Gate -->
         <item name="Kissing Gate" icon="presets/empty.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate"
@@ -1584,5 +1584,5 @@
             <reference ref="barrier_2" />
             <reference ref="optional_maxwidth" />
-        </item> <!-- kissing_gate -->
+        </item> <!-- Kissing Gate -->
         <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
@@ -1591,5 +1591,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
-        </item> <!-- chain -->
+        </item> <!-- Chain -->
         <item name="Stile" icon="presets/stile.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=stile" />
@@ -1601,5 +1601,5 @@
             </optional>
             <reference ref="barrier_2" />
-        </item> <!-- stile -->
+        </item> <!-- Stile -->
         <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=turnstile"
@@ -1608,5 +1608,5 @@
             <key key="barrier" value="turnstile" />
             <reference ref="barrier_2" />
-        </item> <!-- turnstile -->
+        </item> <!-- Turnstile -->
         <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=sally_port"
@@ -1616,5 +1616,5 @@
             <reference ref="barrier_5" />
             <reference ref="optional_maxheight_maxwidth" />
-        </item> <!-- sally_port -->
+        </item> <!-- Sally Port -->
     </group> <!-- Barriers -->
     <group name="Passageways" icon="presets/tunnel.png">
@@ -1640,5 +1640,5 @@
                 <check key="toll" text="Toll" />
             </optional>
-        </item>
+        </item> <!-- Tunnel -->
         <item name="Building Passage" icon="presets/tunnel.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
@@ -1659,5 +1659,5 @@
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
-        </item>
+        </item> <!-- Building Passage -->
         <item name="Arcade" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
@@ -1676,5 +1676,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Arcade -->
         <item name="Colonnade" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
@@ -1693,5 +1693,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Colonnade -->
         <item name="Avalanche Protector" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
@@ -1713,7 +1713,7 @@
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
-        </item>
+        </item> <!-- Avalanche Protector -->
     </group> <!-- Passageways -->
-  </group>
+  </group> <!-- Highways -->
   <group name="Water" icon="presets/waterway.png">
     <group name="Water" icon="presets/waterway.png">
@@ -1729,5 +1729,5 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item>
+        </item> <!-- Drain -->
         <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
@@ -1740,5 +1740,5 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item>
+        </item> <!-- Ditch -->
         <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
@@ -1756,5 +1756,5 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item>
+        </item> <!-- Stream -->
         <item name="Wadi" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=wadi" />
@@ -1763,5 +1763,5 @@
             <text key="name" text="Name" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item>
+        </item> <!-- Wadi -->
         <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
@@ -1776,5 +1776,5 @@
             <reference ref="name_wikipedia" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item>
+        </item> <!-- Canal -->
         <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
@@ -1790,5 +1790,5 @@
             <reference ref="name_wikipedia" />
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item>
+        </item> <!-- River -->
         <separator/>
         <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
@@ -1810,5 +1810,5 @@
             <key key="waterway" value="waterfall" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Waterfall -->
         <item name="Weir" icon="presets/weir.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
@@ -1822,5 +1822,5 @@
             <key key="waterway" value="weir" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Weir -->
         <item name="Dam" icon="presets/dam.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
@@ -1834,5 +1834,5 @@
             <key key="waterway" value="dam" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Dam -->
         <item name="Groyne" icon="presets/groyne.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
@@ -1841,5 +1841,5 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=groyne" />
             <key key="man_made" value="groyne" />
-        </item>
+        </item> <!-- Groyne -->
         <item name="Breakwater" icon="presets/groyne.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
@@ -1852,5 +1852,5 @@
             <text key="ref" text="Reference" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Breakwater -->
         <separator/>
         <item name="Culvert" icon="presets/tunnel.png" type="way" preset_name_label="true">
@@ -1868,5 +1868,5 @@
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
             </optional>
-        </item>
+        </item> <!-- Culvert -->
         <separator/>
         <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
@@ -1881,5 +1881,5 @@
             <key key="landuse" value="basin" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Basin -->
         <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir"
@@ -1891,5 +1891,5 @@
             <key key="landuse" value="reservoir" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Reservoir -->
         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=reservoir_covered"
@@ -1900,5 +1900,5 @@
             <key key="man_made" value="reservoir_covered" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Covered Reservoir -->
         <separator/>
         <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
@@ -1946,5 +1946,5 @@
             <key key="waterway" value="riverbank" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Riverbank -->
         <separator/>
         <item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
@@ -2030,5 +2030,5 @@
             <text key="name" text="Name" />
             <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
-        </item>
+        </item> <!-- Ferry Terminal -->
         <item name="Ferry Route" icon="presets/ferry.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry"
@@ -2041,5 +2041,5 @@
                 <text key="name" text="Name" />
             </optional>
-        </item>
+        </item> <!-- Ferry Route -->
         <separator/>
         <item name="Marina" icon="presets/marina.png" type="node,closedway" preset_name_label="true">
@@ -2054,5 +2054,5 @@
             <key key="leisure" value="marina" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Marina -->
         <item name="Pier" icon="presets/pier.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
@@ -2066,5 +2066,5 @@
             <key key="man_made" value="pier" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Pier -->
         <item name="Lock Gate" icon="presets/lock_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
@@ -2076,10 +2076,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=lock_gate" />
             <key key="waterway" value="lock_gate" />
-        </item>
+        </item> <!-- Lock Gate -->
         <item name="Turning Point" icon="presets/turning.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=turning_point" />
             <key key="waterway" value="turning_point" />
-        </item>
+        </item> <!-- Turning Point -->
         <separator/>
         <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node" preset_name_label="true">
@@ -2094,5 +2094,5 @@
                 <text key="name" text="Name" />
             </optional>
-        </item>
+        </item> <!-- Slipway -->
         <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
@@ -2104,5 +2104,5 @@
             <key key="waterway" value="boatyard" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Boatyard -->
         <item name="Dock" icon="presets/boatyard.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
@@ -2114,7 +2114,7 @@
             <key key="waterway" value="dock" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Dock -->
     </group> <!-- Shipping -->
-  </group>
+  </group> <!-- Water -->
   <group name="Transport" icon="presets/railway.png">
     <group name="Railway" icon="presets/railway.png">
@@ -2134,5 +2134,5 @@
                 <reference ref="railway_service_gauge_electrified" />
             </optional>
-        </item>
+        </item> <!-- Rail -->
         <item name="Narrow Gauge Rail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
@@ -2142,5 +2142,5 @@
                 <reference ref="railway_service_gauge_electrified" />
             </optional>
-        </item>
+        </item> <!-- Narrow Gauge Rail -->
         <item name="Monorail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
@@ -2153,5 +2153,5 @@
                 <reference ref="railway_electrified" />
             </optional>
-        </item>
+        </item> <!-- Monorail -->
         <item name="Preserved" icon="presets/rail_preserved.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved"
@@ -2162,5 +2162,5 @@
                 <reference ref="railway_service_gauge_electrified" />
             </optional>
-        </item>
+        </item> <!-- Preserved -->
         <item name="Light Rail" icon="presets/rail_light.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
@@ -2169,5 +2169,5 @@
                 <reference ref="railway_service_gauge_electrified" />
             </optional>
-        </item>
+        </item> <!-- Light Rail -->
         <item name="Subway" icon="presets/rail_light.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
@@ -2179,5 +2179,5 @@
                 <reference ref="railway_service_gauge_electrified" />
             </optional>
-        </item>
+        </item> <!-- Subway -->
         <item name="Tram" icon="presets/tram.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
@@ -2191,5 +2191,5 @@
                 <reference ref="railway_service_gauge_electrified" />
             </optional>
-        </item>
+        </item> <!-- Tram -->
         <item name="Bus Guideway" icon="presets/busway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway"
@@ -2206,5 +2206,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-        </item>
+        </item> <!-- Bus Guideway -->
         <separator/>
         <item name="Disused Rail" icon="presets/railway.png" type="way" preset_name_label="true">
@@ -2215,5 +2215,5 @@
                 <reference ref="railway_service" />
             </optional>
-        </item>
+        </item> <!-- Disused Rail -->
         <item name="Abandoned Rail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
@@ -2224,5 +2224,5 @@
                 <reference ref="railway_service" />
             </optional>
-        </item>
+        </item> <!-- Abandoned Rail -->
         <separator/>
         <item name="Level Crossing" icon="presets/level_crossing.png" type="node" preset_name_label="true">
@@ -2245,5 +2245,5 @@
                 <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
             </optional>
-        </item>
+        </item> <!-- Level Crossing -->
         <item name="Crossing" icon="presets/crossing.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
@@ -2264,5 +2264,5 @@
                 <combo key="crossing:barrier" text="Barrier" values="yes,no,half,full,double_half" values_context="crossing:barrier" />
             </optional>
-        </item>
+        </item> <!-- Crossing -->
         <item name="Turntable" icon="presets/turntable.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable"
@@ -2270,10 +2270,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=turntable" />
             <key key="railway" value="turntable" />
-        </item>
+        </item> <!-- Turntable -->
         <item name="Buffer Stop" icon="styles/standard/transport/buffer_stop.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=buffer_stop" />
             <key key="railway" value="buffer_stop" />
-        </item>
+        </item> <!-- Buffer Stop -->
         <item name="Railway Switch" icon="presets/railway_switch.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
@@ -2281,5 +2281,5 @@
             <key key="railway" value="switch" />
             <text key="ref" text="Reference" />
-        </item>
+        </item> <!-- Railway Switch -->
     </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">
@@ -2297,5 +2297,5 @@
                 <check key="aerialway:heating" text="Has heating?" />
             </optional>
-        </item>
+        </item> <!-- Chair Lift -->
         <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
@@ -2307,5 +2307,5 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
-        </item>
+        </item> <!-- Drag Lift -->
         <item name="Cable Car" icon="presets/cable_car.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
@@ -2324,5 +2324,5 @@
                 <check key="aerialway:heating" text="Has heating?" />
             </optional>
-        </item>
+        </item> <!-- Cable Car -->
         <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=gondola" />
@@ -2336,5 +2336,5 @@
                 <check key="aerialway:heating" text="Has heating?" />
             </optional>
-        </item>
+        </item> <!-- Gondola -->
         <item name="Mixed Lift" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
@@ -2349,5 +2349,5 @@
                 <check key="aerialway:heating" text="Has heating?" />
             </optional>
-        </item>
+        </item> <!-- Mixed Lift -->
         <item name="T-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=t-bar" />
@@ -2359,5 +2359,5 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
-        </item>
+        </item> <!-- T-bar Lift -->
         <item name="J-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=j-bar" />
@@ -2369,5 +2369,5 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
-        </item>
+        </item> <!-- J-bar Lift -->
         <item name="Platter Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=platter" />
@@ -2379,5 +2379,5 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
-        </item>
+        </item> <!-- Platter Lift -->
         <item name="Rope Tow" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=rope_tow" />
@@ -2389,5 +2389,5 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
-        </item>
+        </item> <!-- Rope Tow -->
         <item name="Magic Carpet" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=magic_carpet" />
@@ -2399,5 +2399,5 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
-        </item>
+        </item> <!-- Magic Carpet -->
         <item name="Goods" icon="presets/goods.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=goods" />
@@ -2408,5 +2408,5 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
-        </item>
+        </item> <!-- Goods -->
         <separator/>
         <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway" preset_name_label="true">
@@ -2416,5 +2416,5 @@
             <key key="aerialway" value="station" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Station -->
         <item name="Pylon" icon="presets/power_tower.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=pylon" />
@@ -2422,5 +2422,5 @@
             <key key="aerialway" value="pylon" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Pylon -->
     </group> <!-- Aerialway -->
     <separator/>
@@ -2451,6 +2451,6 @@
             <reference ref="stay" />
             <reference ref="supervised_lit_oh" />
-        </item>
-        <item name="Parking space" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Parking -->
+        <item name="Parking Space" icon="presets/parking.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_space"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_space"
@@ -2467,6 +2467,6 @@
             <reference ref="supervised_lit_oh" />
             <check key="covered" text="Covered (with roof)" />
-        </item>
-        <item name="Parking entrance" icon="presets/parking.png" type="node" preset_name_label="true">
+        </item> <!-- Parking Space -->
+        <item name="Parking Entrance" icon="presets/parking.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_entrance"
@@ -2481,5 +2481,5 @@
             <reference ref="supervised_lit_oh" />
             <check key="covered" text="Covered (with roof)" />
-        </item>
+        </item> <!-- Parking Entrance -->
         <separator/>
         <item name="Fuel" icon="presets/fuel.png" type="node,closedway" preset_name_label="true">
@@ -2524,5 +2524,5 @@
                 </checkgroup>
             </optional>
-        </item>
+        </item> <!-- Fuel -->
         <item name="Charging Station" icon="styles/standard/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
@@ -2535,5 +2535,5 @@
             <text key="voltage" text="Voltage" />
             <text key="amperage" text="Amperage" />
-        </item>
+        </item> <!-- Charging Station -->
         <item name="Wash" icon="presets/car_wash.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_wash"
@@ -2547,5 +2547,5 @@
             <key key="amenity" value="car_wash" />
             <reference ref="name_brand_operator_oh" />
-        </item>
+        </item> <!-- Wash -->
         <separator/>
         <item name="Car Dealer" icon="presets/car.png" type="node,closedway" preset_name_label="true">
@@ -2563,5 +2563,5 @@
             <reference ref="name_brand_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Car Dealer -->
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_repair"
@@ -2574,5 +2574,5 @@
             <reference ref="name_brand_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Repair -->
         <item name="Parts" icon="styles/standard/vehicle/car_parts.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
@@ -2583,6 +2583,6 @@
             <reference ref="name_brand_operator_oh" />
             <reference ref="link_contact" />
-        </item>
-        <item name="Tyres" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Parts -->
+        <item name="Tires" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tyres"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=tyres" />
@@ -2591,5 +2591,5 @@
             <reference ref="name_brand_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Tires -->
         <separator/>
         <item name="Rental" icon="presets/car_rental.png" type="node,closedway" preset_name_label="true">
@@ -2606,5 +2606,5 @@
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Rental -->
         <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing"
@@ -2621,5 +2621,5 @@
             <reference ref="name_oh" />
             <text key="website" text="Website" />
-        </item>
+        </item> <!-- Sharing -->
     </group> <!-- Car -->
     <group name="Motorcycle" icon="presets/motorbike.png">
@@ -2634,5 +2634,5 @@
             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
             <combo key="fee" text="Fee" values="yes,no" />
-        </item>
+        </item> <!-- Parking -->
         <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
@@ -2658,5 +2658,5 @@
             </optional>
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Motorcycle Dealer -->
     </group> <!-- Motorcycle -->
     <group name="Bicycle" icon="presets/bike.png">
@@ -2679,5 +2679,5 @@
             <check key="covered" text="Covered" />
             <check key="supervised" text="Supervised" />
-        </item>
+        </item> <!-- Parking -->
         <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
@@ -2701,5 +2701,5 @@
             <check key="service:bicycle:cleaning" text="Bicycles are washed (for a fee)" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Bike Dealer -->
         <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
@@ -2718,8 +2718,8 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Rental -->
     </group> <!-- Bicycle -->
     <group name="Public Transport" icon="presets/bus.png">
-        <item name="Public transport route" icon="presets/path.png" type="relation" preset_name_label="true">
+        <item name="Public Transport Route" icon="presets/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
             <space />
@@ -2746,6 +2746,6 @@
                 <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
             </roles>
-        </item>
-        <item name="Route master" icon="presets/path.png" type="relation" preset_name_label="true">
+        </item> <!-- Public Transport Route -->
+        <item name="Route Master" icon="presets/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master" />
             <space />
@@ -2761,5 +2761,5 @@
                 <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route" /> <!-- FIXME: at least 2 members are required -->
             </roles>
-        </item>
+        </item> <!-- Route Master -->
         <item name="Stop Area" type="relation" icon="presets/interpolation.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
@@ -2780,5 +2780,5 @@
                 <role key="" text="Station or amenities" requisite="optional" type="node,way,closedway" member_expression="amenity|public_transport=station" />
             </roles>
-        </item>
+        </item> <!-- Stop Area -->
         <separator/>
         <item name="Stop Position" type="node" icon="presets/barrier.png" preset_name_label="true">
@@ -2808,5 +2808,5 @@
             <check key="aerialway" text="Aerialway" />
             <check key="ferry" text="Ferry" />
-        </item>
+        </item> <!-- Stop Position -->
         <item name="Platform" type="node,way,closedway" icon="presets/platform_bus.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
@@ -2838,5 +2838,5 @@
                 <check key="ferry" text="ferry" />
             </optional>
-        </item>
+        </item> <!-- Platform -->
         <item name="Station" name_context="railway" type="node,closedway" icon="styles/standard/transport/railway_station.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
@@ -2851,6 +2851,6 @@
             <text key="operator" text="Operator" />
             <text key="network" text="Network" />
-        </item>
-        <separator/>
+        </item> <!-- Station -->
+        <separator/> <!-- *** Access *** -->
         <item name="Subway Entrance" icon="presets/underground.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
@@ -2864,5 +2864,5 @@
                 <check key="bicycle" text="Bicycle" />
             </optional>
-        </item>
+        </item> <!-- Subway Entrance -->
         <item name="Ticket Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
@@ -2878,8 +2878,8 @@
             <text key="ref" text="Reference Number" />
             <reference ref="payment_account" />
-        </item>
-    </group>
-    <group name="Public Transport (legacy)" icon="presets/bus.png">
-        <item name="Public transport route (legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
+        </item> <!-- Ticket Machine -->
+    </group> <!-- Public Transport -->
+    <group name="Public Transport (Legacy)" icon="presets/bus.png">
+        <item name="Public transport route (Legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
             <key key="type" value="route" />
             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
@@ -2904,5 +2904,5 @@
                 <role key="platform" text="platform" requisite="optional" type="node,way,closedway" member_expression="highway=platform OR railway=platform" />
             </roles>
-        </item>
+        </item> <!-- Public transport route (Legacy) -->
         <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
@@ -2918,5 +2918,5 @@
                 <text key="uic_ref" text="UIC-Reference" />
             </optional>
-        </item>
+        </item> <!-- Station -->
         <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
@@ -2928,5 +2928,5 @@
                 <text key="name" text="Name" />
             </optional>
-        </item>
+        </item> <!-- Railway Halt -->
         <item name="Tram Stop" icon="presets/tram.png" type="node" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
@@ -2937,5 +2937,5 @@
                 <text key="name" text="Name" />
             </optional>
-        </item>
+        </item> <!-- Tram Stop -->
         <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
@@ -2947,5 +2947,5 @@
             <text key="width" text="Width (meters)" />
             <check key="area" text="Area" />
-        </item>
+        </item> <!-- Railway Platform -->
         <separator/>
         <item name="Bus Station" icon="presets/bus.png" type="node,closedway" preset_name_label="true">
@@ -2959,5 +2959,5 @@
                 <text key="name" text="Name" />
             </optional>
-        </item>
+        </item> <!-- Bus Station -->
         <item name="Bus Stop" icon="presets/bus_small.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
@@ -2977,5 +2977,5 @@
                 <combo key="tactile_paving" text="Tactile Paving" values="yes,no" />
             </optional>
-        </item>
+        </item> <!-- Bus Stop -->
         <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=platform"
@@ -2988,5 +2988,5 @@
             <text key="width" text="Width (meters)" />
             <check key="area" text="Area" />
-        </item>
+        </item> <!-- Bus Platform -->
     </group> <!-- Public Transport -->
     <item name="Taxi" icon="presets/taxi.png" type="node,closedway" preset_name_label="true">
@@ -3002,5 +3002,5 @@
         <key key="amenity" value="taxi" />
         <text key="name" text="Name" />
-    </item>
+    </item> <!-- Taxi -->
     <separator/>
     <group name="Airport" icon="presets/plane.png">
@@ -3017,5 +3017,5 @@
                 <text key="wikipedia" text="Wikipedia" />
             </optional>
-        </item>
+        </item> <!-- Airport Ground -->
         <separator/>
         <item name="Runway" icon="presets/runway.png" type="way" preset_name_label="true">
@@ -3029,5 +3029,5 @@
                 <text key="ref" text="Reference" />
             </optional>
-        </item>
+        </item> <!-- Runway -->
         <item name="Taxiway" icon="presets/taxiway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway"
@@ -3039,5 +3039,5 @@
                 <text key="ref" text="Reference" />
             </optional>
-        </item>
+        </item> <!-- Taxiway -->
         <item name="Helipad" icon="styles/standard/transport/airport/helipad.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad"
@@ -3051,5 +3051,5 @@
                 <text key="ref" text="Reference" />
             </optional>
-        </item>
+        </item> <!-- Helipad -->
         <item name="Apron" icon="presets/apron.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron"
@@ -3058,5 +3058,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=apron" />
             <key key="aeroway" value="apron" />
-        </item>
+        </item> <!-- Apron -->
         <item name="Hangar" icon="presets/hangar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
@@ -3064,5 +3064,5 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aeroway=hangar" />
             <key key="building" value="hangar" />
-        </item>
+        </item> <!-- Hangar -->
         <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
@@ -3070,5 +3070,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
             <key key="man_made" value="beacon" />
-        </item>
+        </item> <!-- Beacon -->
         <item name="Windsock" icon="styles/standard/transport/airport/windsock.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
@@ -3076,5 +3076,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=windsock" />
             <key key="aeroway" value="windsock" />
-        </item>
+        </item> <!-- Windsock -->
         <separator/>
         <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway" preset_name_label="true">
@@ -3090,5 +3090,5 @@
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Terminal -->
         <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate"
@@ -3098,7 +3098,7 @@
             <key key="aeroway" value="gate" />
             <text key="ref" text="Reference" />
-        </item>
-    </group> <!-- Aeroway -->
-  </group>
+        </item> <!-- Gate -->
+    </group> <!-- Airport -->
+  </group> <!-- Transport -->
   <group name="Facilities" icon="presets/bed.png">
     <group name="Accommodation" icon="presets/bed.png">
@@ -3120,5 +3120,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Hotel -->
         <item name="Motel" icon="styles/standard/accommodation/motel.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
@@ -3136,6 +3136,6 @@
             <space />
             <reference ref="contact" />
-        </item>
-        <item name="Guest House" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Motel -->
+        <item name="Guest House/Bed & Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
@@ -3151,5 +3151,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Guest House/Bed & Breakfast -->
         <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
@@ -3167,5 +3167,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Chalet -->
         <item name="Hostel" icon="presets/hostel.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
@@ -3184,5 +3184,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Hostel -->
         <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
@@ -3200,7 +3200,7 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Alpine Hut -->
         <separator/>
-        <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway" preset_name_label="true">
+        <item name="Caravan Site/RV Park" icon="presets/caravan2.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=caravan_site"
@@ -3220,5 +3220,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Caravan Site/RV Park -->
         <item name="Camping Site" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
@@ -3238,5 +3238,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Camping Site -->
     </group> <!-- Accommodation -->
     <group name="Food+Drinks" icon="presets/restaurant.png">
@@ -3260,5 +3260,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Restaurant -->
         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
@@ -3276,5 +3276,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Fast Food -->
         <item name="Food Court" icon="presets/fastfood.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=food_court"
@@ -3289,5 +3289,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Food Court -->
         <item name="Cafe" icon="presets/cafe.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
@@ -3309,5 +3309,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Cafe -->
         <item name="Pub" icon="presets/pub.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub"
@@ -3325,6 +3325,6 @@
             <space />
             <reference ref="contact" />
-        </item>
-        <item name="Biergarten" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Pub -->
+        <item name="Beer Garden" icon="presets/biergarten.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=biergarten"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=biergarten"
@@ -3341,5 +3341,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Beer Garden -->
         <item name="Bar" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
@@ -3358,6 +3358,6 @@
             <space />
             <reference ref="contact" />
-        </item>
-        <item name="Nightclub" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Bar -->
+        <item name="Night Club" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=nightclub"
@@ -3377,6 +3377,6 @@
             <space />
             <reference ref="contact" />
-        </item>
-        <item name="Stripclub" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Night Club -->
+        <item name="Strip Club" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=stripclub"
@@ -3391,5 +3391,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Strip Club -->
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/sightseeing.png">
@@ -3401,5 +3401,5 @@
             <key key="tourism" value="attraction" />
             <reference ref="name_oh" />
-        </item>
+        </item> <!-- Attraction -->
         <item name="Viewpoint" icon="presets/viewpoint.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
@@ -3414,5 +3414,5 @@
             <text key="name" text="Name" />
             <!--<check key="man_made" value="tower" text="Look-Out Tower" />-->
-        </item>
+        </item> <!-- Viewpoint -->
         <separator/>
         <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway" preset_name_label="true">
@@ -3511,5 +3511,5 @@
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
         </item> <!-- Information Terminal -->
-        <item name="Audioguide" icon="presets/information.png" type="node" preset_name_label="true">
+        <item name="Audio Guide" icon="presets/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -3529,5 +3529,5 @@
             <label text="Audioguide via mobile phone?" />
             <text key="phone" text="Phone number" />
-        </item> <!-- Audioguide -->
+        </item> <!-- Audio Guide -->
         <item name="Other Information Point" icon="presets/information.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
@@ -3545,5 +3545,5 @@
     </group> <!-- Tourism -->
     <group name="Leisure" icon="presets/theme_park.png">
-        <item name="Cinema" icon="presets/cinema.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Movie Theater/Cinema" icon="presets/cinema.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cinema"
@@ -3557,5 +3557,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Movie Theater/Cinema -->
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
@@ -3570,5 +3570,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Zoo -->
         <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
@@ -3588,6 +3588,6 @@
             <reference ref="oh" />
             <check key="lit" text="Lit" />
-        </item>
-        <item name="Theme Park" icon="presets/theme_park.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Dog Park -->
+        <item name="Amusement/Theme Park" icon="presets/theme_park.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=theme_park"
@@ -3599,5 +3599,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Amusement/Theme Park -->
         <item name="Water Park" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
@@ -3613,5 +3613,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Water Park -->
         <item name="Sauna" de.name="Sauna" icon="presets/sauna.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sauna"
@@ -3627,6 +3627,6 @@
             <space />
             <reference ref="contact" />
-        </item>
-        <item name="Horse riding" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Sauna -->
+        <item name="Horse Riding" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
             <space />
@@ -3636,5 +3636,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Horse Riding -->
         <item name="Brothel" de.name="Bordell" icon="styles/standard/leisure/stripclub.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=brothel"
@@ -3653,5 +3653,5 @@
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Brothel -->
         <separator/>
         <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway" preset_name_label="true">
@@ -3669,5 +3669,5 @@
             <key key="leisure" value="playground" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Playground -->
         <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=picnic_site"
@@ -3681,5 +3681,5 @@
             <text key="name" text="Name" />
             <check key="fireplace" text="Fireplace" />
-        </item>
+        </item> <!-- Picnic Site -->
         <item name="Public Grill" icon="presets/bbq.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
@@ -3693,5 +3693,5 @@
             <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
             <check key="covered" text="Covered" />
-        </item>
+        </item> <!-- Public Grill -->
         <item name="Fishing" icon="presets/fishing.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
@@ -3702,5 +3702,5 @@
             <key key="leisure" value="fishing" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Fishing -->
         <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool"
@@ -3714,5 +3714,5 @@
             <key key="leisure" value="swimming_pool" />
             <key key="access" value="private" />
-        </item>
+        </item> <!-- Private Swimming Pool -->
     </group> <!-- Leisure -->
     <group name="Culture" icon="presets/theater.png">
@@ -3729,5 +3729,5 @@
             <text key="wikipedia" text="Wikipedia" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Museum -->
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
@@ -3741,5 +3741,5 @@
             <reference ref="name_operator" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Theatre -->
         <item name="Library" icon="styles/standard/shop/rental/library.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
@@ -3755,5 +3755,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Library -->
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
@@ -3766,5 +3766,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Arts Centre -->
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork"
@@ -3781,5 +3781,5 @@
             <text key="name" text="Name" />
             <text key="artist_name" text="Artist Name" />
-        </item>
+        </item> <!-- Artwork -->
         <item name="Recording Studio" icon="presets/studio.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
@@ -3792,5 +3792,5 @@
             <combo key="type" text="Type" values="audio,video" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Recording Studio -->
     </group> <!-- Culture -->
     <group name="Place of Worship" icon="styles/standard/religion.png">
@@ -3817,5 +3817,5 @@
             <reference ref="service_times" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Church -->
         <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -3840,5 +3840,5 @@
             <reference ref="service_times" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Mosque -->
         <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -3863,5 +3863,5 @@
             <reference ref="service_times" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Synagogue -->
         <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -3885,5 +3885,5 @@
             <reference ref="service_times" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Buddhist Temple -->
         <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -3907,5 +3907,5 @@
             <reference ref="service_times" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Hindu Temple -->
         <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -3928,5 +3928,5 @@
             <reference ref="service_times" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Shinto Shrine -->
         <item name="Other Place of Worship" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
@@ -3949,5 +3949,5 @@
             <reference ref="service_times" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Other Place of Worship -->
     </group> <!-- Place of Worship -->
     <group name="Public Building" icon="presets/townhall.png">
@@ -3960,6 +3960,6 @@
             <key key="amenity" value="public_building" />
             <text key="name" text="Name" />
-        </item>
-        <item name="Town hall" icon="presets/townhall.png" type="node,closedway,relation" preset_name_label="true">
+        </item> <!-- Public Building -->
+        <item name="Town Hall" icon="presets/townhall.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=townhall"
@@ -3973,5 +3973,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Town Hall -->
         <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
@@ -3986,5 +3986,5 @@
             <reference ref="name_operator" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Community Centre -->
         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
@@ -3999,5 +3999,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Embassy -->
         <item name="Courthouse" icon="presets/JusticeScales.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
@@ -4011,5 +4011,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Courthouse -->
         <item name="Prison" icon="presets/prison.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
@@ -4023,5 +4023,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Prison -->
         <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
@@ -4037,5 +4037,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Police -->
         <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
@@ -4050,5 +4050,5 @@
             <key key="amenity" value="fire_station" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Fire Station -->
         <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office"
@@ -4064,5 +4064,5 @@
             <key key="amenity" value="post_office" />
             <reference ref="name_operator" />
-        </item>
+        </item> <!-- Post Office -->
     </group> <!-- Public Buildings -->
     <group name="Education" icon="presets/school.png">
@@ -4079,5 +4079,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Kindergarten -->
         <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school"
@@ -4095,5 +4095,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- School -->
         <item name="University" icon="styles/standard/education/university.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university"
@@ -4110,5 +4110,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- University -->
         <item name="College" icon="styles/standard/education/college.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college"
@@ -4122,5 +4122,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- College -->
          <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=driving_school"
@@ -4132,5 +4132,5 @@
             <combo key="license_classes" text="License Classes" values="A;A1;B;BE;C,A;A1;B;B1;C;C1;D;D1;BE;CE;C1E;DE;D1E" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Driving School -->
     </group> <!-- Education -->
     <group name="Health" icon="presets/pharmacy.png">
@@ -4148,5 +4148,5 @@
             <reference ref="name_operator" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Hospital -->
         <item name="Clinic" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
@@ -4156,6 +4156,6 @@
             <text key="name" text="Name" />
             <reference ref="link_contact" />
-        </item>
-        <item name="Doctors" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Clinic -->
+        <item name="Doctor's Office" icon="styles/standard/health/doctor.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=doctors"
@@ -4167,5 +4167,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Doctor's Office -->
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=dentist"
@@ -4177,5 +4177,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Dentist -->
         <item name="Nursing Home" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nursing_home"
@@ -4188,5 +4188,5 @@
             <reference ref="name_operator" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Nursing Home -->
         <item name="Retirement Home" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
@@ -4202,5 +4202,5 @@
             <text key="capacity" text="Capacity" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Retirement Home -->
         <separator/>
         <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway" preset_name_label="true">
@@ -4219,5 +4219,5 @@
             <reference ref="oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Pharmacy -->
         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
@@ -4228,7 +4228,7 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Hearing Aids -->
         <separator/>
-        <item name="Baby Hatch" icon="presets/baby_hatch.png" type="node,closedway" preset_name_label="true">
+        <item name="Baby Hatch/Safe Haven" icon="presets/baby_hatch.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=baby_hatch"
@@ -4245,5 +4245,5 @@
             <text key="operator" text="Operator" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Baby Hatch/Safe Haven -->
         <separator/>
         <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway" preset_name_label="true">
@@ -4261,5 +4261,5 @@
             <label text="(Use international code, like +12-345-67890)" />
             <space />
-        </item>
+        </item> <!-- Emergency Access Point -->
         <separator/>
         <item name="Veterinary" icon="styles/standard/health/veterinary.png" type="node,closedway" preset_name_label="true">
@@ -4277,8 +4277,8 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Veterinary -->
     </group> <!-- Health -->
     <group name="Facilities" icon="presets/telephone.png">
-        <item name="Toilets" icon="presets/toilet.png" type="node,closedway" preset_name_label="true">
+        <item name="Toilets/Restrooms" icon="presets/toilet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets"
@@ -4301,5 +4301,5 @@
                 <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
             </optional>
-        </item>
+        </item> <!-- Toilets/Restrooms -->
         <item name="Post Box" icon="styles/standard/service/post_box.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
@@ -4315,5 +4315,5 @@
             <combo key="collection_times" text="Collection times" delimiter="|" values="11:30|Mo-Fr 15:00,17:45,19:00,23:00; Sa 15:10; Su 10:30,23:00|Mo-Fr 09:00-12:00,17:15; Sa 14:00; Su,PH off" />
             <check key="drive_through" text="Drive through" />
-        </item>
+        </item> <!-- Post Box -->
         <item name="Telephone" icon="presets/telephone.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
@@ -4329,5 +4329,5 @@
             <reference ref="payment_base" />
             <check key="payment:telephone_cards" text="Telephone cards" />
-        </item>
+        </item> <!-- Telephone -->
         <item name="Emergency Phone" icon="presets/telephone.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
@@ -4336,5 +4336,5 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:emergency=phone" />
             <key key="emergency" value="phone" />
-        </item>
+        </item> <!-- Emergency Phone -->
         <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
@@ -4347,5 +4347,5 @@
             <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" match="key" />
             <combo key="internet_access:fee" text="Internet access fee" values="yes,no" match="key" />
-        </item>
+        </item> <!-- Internet Access -->
         <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
@@ -4365,5 +4365,5 @@
             </optional>
             -->
-        </item>
+        </item> <!-- Automated Defibrillator -->
         <item name="Clock" icon="styles/standard/service/clock.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
@@ -4382,5 +4382,5 @@
                 <check key="hygrometer" text="Shows humidity" />
             </optional>
-        </item>
+        </item> <!-- Clock -->
         <item name="Recycling" icon="presets/recycling.png" type="node,closedway" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
@@ -4404,6 +4404,6 @@
             <check key="recycling:scrap_metal" text="Scrap Metal" />
             <combo key="recycling_type" text="Type" values="container,centre" />
-        </item>
-        <item name="Waste Basket" icon="styles/standard/service/recycling/trash-bin.png" type="node" preset_name_label="true">
+        </item> <!-- Recycling -->
+        <item name="Waste Basket/Trash Can" icon="styles/standard/service/recycling/trash-bin.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
@@ -4415,6 +4415,6 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_basket" />
             <key key="amenity" value="waste_basket" />
-        </item>
-        <item name="Waste Disposal" icon="styles/standard/service/recycling/waste_disposal.png" type="node" preset_name_label="true">
+        </item> <!-- Waste Basket/Trash Can -->
+        <item name="Waste Disposal/Dumpster" icon="styles/standard/service/recycling/waste_disposal.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_disposal"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=waste_disposal"
@@ -4424,5 +4424,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_disposal" />
             <key key="amenity" value="waste_disposal" />
-        </item>
+        </item> <!-- Waste Disposal/Dumpster -->
         <separator/>
         <item name="Bench" icon="presets/bench.png" type="node" preset_name_label="true">
@@ -4445,5 +4445,5 @@
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
-        </item>
+        </item> <!-- Bench -->
         <item name="Shelter" icon="presets/shelter.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
@@ -4460,5 +4460,5 @@
             <check key="fireplace" text="Fireplace" />
             <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
-        </item>
+        </item> <!-- Shelter -->
         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hunting_stand"
@@ -4473,5 +4473,5 @@
             <combo key="hide" text="Hide" values="yes,no,unknown" />
             <combo key="lock" text="Lock" values="yes,no,unknown" />
-        </item>
+        </item> <!-- Hunting Stand -->
         <separator/>
         <item name="Drinking Water" icon="presets/drinking_water.png" type="node" preset_name_label="true">
@@ -4491,5 +4491,5 @@
                 <text key="description" text="Description" />
             </optional>
-        </item>
+        </item> <!-- Drinking Water -->
         <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
@@ -4512,5 +4512,5 @@
             <combo key="fire_hydrant:pressure" text="Pressure (in bar)" values="5,6,8,suction" />
             <text key="fire_hydrant:count" text="Count" />
-        </item>
+        </item> <!-- Fire Hydrant -->
     </group> <!-- Facilities -->
   </group>  <!-- Facilities -->
@@ -4529,5 +4529,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
-        </item>
+        </item> <!-- Stadium -->
         <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=sports_centre"
@@ -4541,5 +4541,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
-        </item>
+        </item> <!-- Sports Centre -->
         <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=pitch"
@@ -4556,5 +4556,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
-        </item>
+        </item> <!-- Pitch -->
         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=track"
@@ -4569,5 +4569,5 @@
             <text key="name" text="Name" />
             <reference ref="optional_sport" />
-        </item>
+        </item> <!-- Racetrack -->
         <item name="Golf Course" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
@@ -4580,5 +4580,5 @@
             <key key="leisure" value="golf_course" />
             <reference ref="name_oh" />
-        </item>
+        </item> <!-- Golf Course -->
         <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=miniature_golf"
@@ -4589,6 +4589,6 @@
             <key key="leisure" value="miniature_golf" />
             <reference ref="name_oh" />
-        </item>
-    </group> <!-- Sport facilities -->
+        </item> <!-- Miniature Golf -->
+    </group> <!-- Sport Facilities -->
     <group name="Sport" icon="presets/rowing.png">
         <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway" preset_name_label="true">
@@ -4598,6 +4598,6 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
-        </item>
-        <item name="9pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Multi -->
+        <item name="Nine-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
@@ -4606,6 +4606,6 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
-        <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Nine-pin Bowling -->
+        <item name="Ten-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
             <space />
@@ -4613,5 +4613,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+        </item> <!-- Ten-pin Bowling -->
         <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery"
@@ -4621,6 +4621,6 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
-        <item name="Athletics" icon="presets/athletics.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Archery -->
+        <item name="Track and Field Athletics" icon="presets/athletics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
             <space />
@@ -4628,5 +4628,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
-        </item>
+        </item> <!-- Track and Field Athletics -->
         <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
@@ -4637,11 +4637,11 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="sports_centre" />
-        </item>
-        <item name="Canoeing" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
+        </item> <!-- Climbing -->
+        <item name="Canoeing/Kayaking" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <space />
             <key key="sport" value="canoe" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Canoeing/Kayaking -->
         <item name="Cycling" icon="presets/cycling.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
@@ -4650,5 +4650,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
-        </item>
+        </item> <!-- Cycling -->
         <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
@@ -4657,5 +4657,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
-        </item>
+        </item> <!-- Dog Racing -->
         <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
@@ -4664,5 +4664,5 @@
             <text key="name" text="Name" />
             <reference ref="riding_surface" />
-        </item>
+        </item> <!-- Equestrian -->
         <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
@@ -4671,5 +4671,5 @@
             <text key="name" text="Name" />
             <reference ref="riding_surface" />
-        </item>
+        </item> <!-- Horse Racing -->
         <item name="Gymnastics" icon="presets/gymnastics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
@@ -4678,5 +4678,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+        </item> <!-- Gymnastics -->
         <item name="Skating" icon="presets/skating.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skating"
@@ -4686,5 +4686,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
-        </item>
+        </item> <!-- Skating -->
         <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
@@ -4694,5 +4694,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
-        </item>
+        </item> <!-- Skateboard -->
         <item name="Swimming" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
@@ -4702,5 +4702,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
-        </item>
+        </item> <!-- Swimming -->
         <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
@@ -4714,5 +4714,5 @@
             <combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
             <combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
-        </item>
+        </item> <!-- Skiing -->
         <item name="Shooting" icon="presets/range.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting"
@@ -4725,5 +4725,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+        </item> <!-- Shooting -->
     </group> <!-- Sport -->
     <group name="Sport (Ball)" icon="presets/soccer.png">
@@ -4736,5 +4736,5 @@
             <key key="sport" value="soccer" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Soccer -->
         <item name="Australian Football" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
@@ -4742,5 +4742,5 @@
             <key key="sport" value="australian_football" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Australian Football -->
         <item name="American Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
@@ -4748,5 +4748,5 @@
             <key key="sport" value="american_football" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- American Football -->
         <item name="Canadian Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
@@ -4754,5 +4754,5 @@
             <key key="sport" value="canadian_football" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Canadian Football -->
         <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
@@ -4766,5 +4766,5 @@
                 <check key="gaelic_games:rounders" text="Rounders" />
             </optional>
-        </item>
+        </item> <!-- Gaelic Games -->
         <item name="Rugby League" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
@@ -4773,5 +4773,5 @@
             <key key="sport" value="rugby_league" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Rugby League -->
         <item name="Rugby Union" icon="presets/football.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
@@ -4780,5 +4780,5 @@
             <key key="sport" value="rugby_union" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Rugby Union -->
         <item name="Baseball" icon="presets/baseball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
@@ -4786,5 +4786,5 @@
             <key key="sport" value="baseball" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Baseball -->
         <item name="Basketball" icon="presets/basketball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
@@ -4792,5 +4792,5 @@
             <key key="sport" value="basketball" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Basketball -->
         <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
@@ -4799,6 +4799,6 @@
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
-        </item>
-        <item name="Beach volleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Volleyball -->
+        <item name="Beach Volleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
             <space />
@@ -4806,5 +4806,5 @@
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
-        </item>
+        </item> <!-- Beach Volleyball -->
         <item name="Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
@@ -4816,5 +4816,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
-        </item>
+        </item> <!-- Golf -->
         <item name="Boule" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules" />
@@ -4822,11 +4822,11 @@
             <key key="sport" value="boules" />
             <reference ref="name_leisure_pitch" />
-        </item>
-        <item name="Bowls" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Boule -->
+        <item name="Lawn Bowling" icon="presets/boule.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
             <space />
             <key key="sport" value="bowls" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Lawn Bowling -->
         <item name="Cricket" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
@@ -4834,5 +4834,5 @@
             <key key="sport" value="cricket" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Cricket -->
         <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
@@ -4841,5 +4841,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+        </item> <!-- Cricket Nets -->
         <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
@@ -4847,5 +4847,5 @@
             <key key="sport" value="croquet" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Croquet -->
         <item name="Hockey" icon="presets/Hockey.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=hockey" />
@@ -4854,5 +4854,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
-        </item>
+        </item> <!-- Hockey -->
         <item name="Pelota" icon="presets/pelota.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
@@ -4861,6 +4861,6 @@
             <key key="sport" value="pelota" />
             <reference ref="name_leisure_pitch" />
-        </item>
-        <item name="Racquet" icon="presets/racquetball.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Pelota -->
+        <item name="Racquetball" icon="presets/racquetball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
@@ -4869,6 +4869,6 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
-        <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Racquetball -->
+        <item name="Table Tennis/Ping-Pong" icon="presets/table_tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
             <space />
@@ -4876,5 +4876,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+        </item> <!-- Table Tennis/Ping-Pong -->
         <item name="Tennis" icon="presets/tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
@@ -4882,5 +4882,5 @@
             <key key="sport" value="tennis" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Tennis -->
     </group> <!-- Sport (Ball) -->
     <group name="Motorsport" icon="presets/motorbike.png">
@@ -4891,6 +4891,6 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
-        </item>
-        <item name="Karting" icon="presets/karting.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Motorsport -->
+        <item name="Kart Racing" icon="presets/karting.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting" />
             <space />
@@ -4898,5 +4898,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
-        </item>
+        </item> <!-- Kart Racing -->
         <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motocross"
@@ -4915,5 +4915,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
-        </item>
+        </item> <!-- Motocross -->
         <item name="Safety Training" icon="presets/safety_training.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=safety_training"
@@ -4932,5 +4932,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
-        </item>
+        </item> <!-- Safety Training -->
         <separator/>
         <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
@@ -4940,5 +4940,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
-        </item>
+        </item> <!-- Model Aerodrome -->
         <item name="RC Car" icon="presets/car.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
@@ -4957,5 +4957,5 @@
             <text key="name" text="Name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
-        </item>
+        </item> <!-- RC Car -->
         <item name="Raceway" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=raceway"
@@ -4967,5 +4967,5 @@
             <key key="highway" value="raceway" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Raceway -->
     </group> <!-- Motorsport -->
   </group> <!-- Sports -->
@@ -4989,5 +4989,5 @@
             <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,construction" values_context="building" default="yes" match="keyvalue" values_searchable="true" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Building -->
         <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
@@ -5007,5 +5007,5 @@
             <combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" values_searchable="true" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Residential Building -->
         <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
@@ -5023,5 +5023,5 @@
                 <text key="addr:flats" text="Flat numbers" />
             </optional>
-        </item>
+        </item> <!-- Entrance -->
         <item name="Tower" icon="presets/tower.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=tower"
@@ -5040,5 +5040,5 @@
                 <text key="operator" text="Operator" />
             </optional>
-        </item>
+        </item> <!-- Tower -->
         <item name="Flagpole" icon="presets/flag.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
@@ -5046,5 +5046,5 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=flagpole" />
             <key key="man_made" value="flagpole" />
-        </item>
+        </item> <!-- Flagpole -->
         <separator/>
         <item name="Works" icon="presets/works.png" type="node,closedway" preset_name_label="true">
@@ -5056,5 +5056,5 @@
             <key key="man_made" value="works" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Works -->
         <item name="Chimney" icon="presets/chimney.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=chimney" />
@@ -5063,5 +5063,5 @@
             <reference ref="name_operator" />
             <text key="height" text="Height (meters)" />
-        </item>
+        </item> <!-- Chimney -->
         <item name="Windmill" icon="presets/windmill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
@@ -5074,5 +5074,5 @@
             <key key="man_made" value="windmill" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Windmill -->
         <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=gasometer"
@@ -5081,5 +5081,5 @@
             <key key="man_made" value="gasometer" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Gasometer -->
         <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
@@ -5092,5 +5092,5 @@
             <combo key="type" text="Type" values="water,gas,heat,oil,sewage" />
             <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
-        </item>
+        </item> <!-- Pipeline -->
         <item name="Crane" icon="presets/crane.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
@@ -5102,5 +5102,5 @@
             <key key="man_made" value="crane" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Crane -->
         <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=mineshaft"
@@ -5118,5 +5118,5 @@
             <combo key="headframe" text="Visible Headframe" values="yes,no" />
             <check key="disused" text="Disused" />
-        </item>
+        </item> <!-- Mineshaft -->
         <item name="Adit" icon="presets/adit.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
@@ -5134,5 +5134,5 @@
             <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" />
             <check key="disused" text="Disused" />
-        </item>
+        </item> <!-- Adit -->
         <item name="Embankment" icon="presets/cliff.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=embankment"
@@ -5141,5 +5141,5 @@
             <space />
             <key key="man_made" value="embankment" />
-        </item>
+        </item> <!-- Embankment -->
         <separator/>
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway" preset_name_label="true">
@@ -5151,5 +5151,5 @@
             <key key="man_made" value="water_tower" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Water Tower -->
         <item name="Water Works" icon="presets/water_works.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
@@ -5161,6 +5161,6 @@
             <key key="man_made" value="water_works" />
             <reference ref="name_operator" />
-        </item>
-        <item name="Wastewater Plant" icon="presets/wastewater_plant.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Water Works -->
+        <item name="Wastewater Treatment Plant" icon="presets/wastewater_plant.png" type="node,closedway" preset_name_label="true">
             <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"
@@ -5173,5 +5173,5 @@
             <key key="man_made" value="wastewater_plant" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Wastewater Treatment Plant -->
         <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
@@ -5184,5 +5184,5 @@
             <key key="man_made" value="watermill" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Watermill -->
         <item name="Fountain" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
@@ -5198,5 +5198,5 @@
             <key key="amenity" value="fountain" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Fountain -->
         <item name="Water Well" icon="presets/water_well.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
@@ -5210,5 +5210,5 @@
             <key key="man_made" value="water_well" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Water Well -->
         <separator/>
         <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
@@ -5221,5 +5221,5 @@
             <key key="man_made" value="lighthouse" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Lighthouse -->
         <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
@@ -5229,5 +5229,5 @@
             <key key="man_made" value="beacon" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Beacon -->
         <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=street_lamp"
@@ -5238,5 +5238,5 @@
             <key key="highway" value="street_lamp" />
             <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" />
-        </item>
+        </item> <!-- Street Lamp -->
         <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
@@ -5272,5 +5272,5 @@
                 <check key="display:digital" text="Digital" />
             </checkgroup>
-        </item>
+        </item> <!-- Monitoring Station -->
         <item name="Survey Point" icon="presets/survey_point.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
@@ -5281,5 +5281,5 @@
             <key key="man_made" value="survey_point" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Survey Point -->
         <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
@@ -5309,5 +5309,5 @@
                 <text key="height" text="Height in meter (m)" />
             </optional>
-        </item>
+        </item> <!-- Surveillance Camera -->
     </group> <!-- Man Made -->
     <group name="Power" icon="presets/power.png">
@@ -5334,5 +5334,5 @@
                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
             </optional>
-        </item>
+        </item> <!-- Power Plant -->
         <group name="Power Generator" icon="presets/power.png">
             <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
@@ -5342,5 +5342,5 @@
                 <combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Power Generator -->
             <item name="Biogas Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="biogas" />
@@ -5349,5 +5349,5 @@
                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Biogas Power Generator -->
             <item name="Biomass Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="biomass" />
@@ -5361,5 +5361,5 @@
                 </combo>
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Biomass Power Generator -->
             <item name="Coal Power Generator" icon="presets/power_source-coal.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="coal" />
@@ -5368,5 +5368,5 @@
                 <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Coal Power Generator -->
             <item name="Gas Power Generator" icon="presets/power_source-gas.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="gas" />
@@ -5375,5 +5375,5 @@
                 <combo key="generator:type" text="Generator Type" values="combined_cycle,gas_turbine,reciprocating_engine,steam_generator,steam_turbine" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Gas Power Generator -->
             <item name="Oil Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="oil" />
@@ -5382,5 +5382,5 @@
                 <combo key="generator:type" text="Generator Type" values="steam_generator,steam_turbine" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Oil Power Generator -->
             <item name="Diesel Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="diesel" />
@@ -5389,5 +5389,5 @@
                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Diesel Power Generator -->
             <item name="Gasoline Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="gasoline" />
@@ -5396,5 +5396,5 @@
                 <combo key="generator:type" text="Generator Type" values="reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Gasoline Power Generator -->
             <item name="Nuclear Reactor" icon="presets/power_source-nuclear.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="nuclear" />
@@ -5421,5 +5421,5 @@
                 </combo>
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Nuclear Reactor -->
             <item name="Solar Power Generator" icon="presets/power_source-sun.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="solar" />
@@ -5432,5 +5432,5 @@
                 </combo>
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Solar Power Generator -->
             <item name="Waste Power Generator" icon="presets/power_source-waste.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="waste" />
@@ -5445,5 +5445,5 @@
                 <combo key="generator:type" text="Generator Type" values="bioreactor,reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Waste Power Generator -->
             <item name="Water Turbine" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="hydro" />
@@ -5457,5 +5457,5 @@
                 </combo>
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Water Turbine -->
             <item name="Tidal Water Turbine" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="tidal" />
@@ -5468,15 +5468,15 @@
                 </combo>
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Tidal Water Turbine -->
             <item name="Wave Energy Converter" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="wave" />
                 <reference ref="power_generator" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Wave Energy Converter -->
             <item name="Osmotic Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="osmotic" />
                 <reference ref="power_generator" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Osmotic Power Generator -->
             <item name="Geothermal Power Generator" icon="presets/power_source-water.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="geothermal" />
@@ -5484,5 +5484,5 @@
                 <combo key="generator:type" text="Generator Type" values="heat_pump,steam_turbine" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Geothermal Power Generator -->
             <item name="Wind Turbine" icon="presets/power_source-wind.svg" type="node,closedway,relation" preset_name_label="true">
                 <key key="generator:source" value="wind" />
@@ -5491,6 +5491,6 @@
                 <combo key="generator:type" text="Generator Type" values="horizontal_axis,vertical_axis" />
                 <reference ref="power_output" />
-            </item>
-        </group>
+            </item> <!-- Wind Turbine -->
+        </group> <!-- Power Generator -->
         <separator/>
         <item name="Power Substation" icon="icons/power_substation.n.16.png" type="node,closedway" preset_name_label="true">
@@ -5510,5 +5510,5 @@
                 <check key="gas_insulated" text="Gas insulated" />
             </optional>
-        </item>
+        </item> <!-- Power Substation -->
         <item name="Power Transformer" icon="styles/standard/misc/landmark/power/transformer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
@@ -5526,5 +5526,5 @@
                 <combo key="phases" text="Phases" values="1,3" length="1" />
             </optional>
-        </item>
+        </item> <!-- Power Transformer -->
         <item name="Power Switchgear" icon="presets/power.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
@@ -5542,5 +5542,5 @@
                 <check key="gas_insulated" text="Gas insulated" />
             </optional>
-        </item>
+        </item> <!-- Power Switchgear -->
         <item name="Power Busbar" icon="presets/power.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar"
@@ -5553,5 +5553,5 @@
             <key key="line" value="busbar" />
             <reference ref="power_line_extra" />
-        </item>
+        </item> <!-- Power Busbar -->
         <item name="Power Bay" icon="presets/power.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay"
@@ -5564,10 +5564,10 @@
             <key key="line" value="bay" />
             <reference ref="power_line_extra" />
-        </item>
+        </item> <!-- Power Bay -->
         <item name="Power Switch" icon="presets/power.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch" />
             <space />
             <key key="power" value="switch" />
-        </item>
+        </item> <!-- Power Switch -->
         <separator/>
         <item name="Power Converter" icon="presets/power.png" type="node,closedway" preset_name_label="true">
@@ -5586,5 +5586,5 @@
                 <combo key="rating" text="Power rating (MVA)" values="15 MVA,50 MVA,100 MVA" />
             </optional>
-        </item>
+        </item> <!-- Power Converter -->
         <item name="Power Compensator" icon="presets/power.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator"
@@ -5601,5 +5601,5 @@
                 <combo key="rating" text="Power rating (kvar/Mvar)" values="500 kvar,1 Mvar,5 Mvar" />
             </optional>
-        </item>
+        </item> <!-- Power Compensator -->
         <separator/>
         <item name="Cable Distribution Cabinet" icon="presets/power.png" type="node" preset_name_label="true">
@@ -5611,5 +5611,5 @@
             <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110,low" /> <!-- Recheck values -->
             <reference ref="ref_operator_branch" />
-        </item>
+        </item> <!-- Cable Distribution Cabinet -->
         <separator/>
         <item name="Power Tower" icon="icons/power_tower_high2.n.16.png" type="node" preset_name_label="true">
@@ -5637,5 +5637,5 @@
                 <check key="design:incomplete" text="Incomplete tower" />
             </optional>
-        </item>
+        </item> <!-- Power Tower -->
         <item name="Pole" icon="icons/power_tower_low.n.16.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
@@ -5652,5 +5652,5 @@
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
             <reference ref="ref_operator_branch" />
-        </item>
+        </item> <!-- Pole -->
         <item name="Power Line" icon="presets/power.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
@@ -5672,5 +5672,5 @@
                 <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
             </optional>
-        </item>
+        </item> <!-- Power Line -->
         <item name="Power Cable" icon="presets/power.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
@@ -5687,5 +5687,5 @@
                 <check key="communication" text="Used for data communications" value_on="line" value_off="" default="off" />
             </optional>
-        </item>
+        </item> <!-- Power Cable -->
     </group> <!-- Power -->
     <group name="Historic Places" icon="presets/State_Tourist.png">
@@ -5699,5 +5699,5 @@
             <key key="historic" value="castle" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Castle -->
         <item name="Ruins" icon="presets/ruins.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=ruins"
@@ -5709,5 +5709,5 @@
             <key key="historic" value="ruins" />
             <reference ref="name_oh" />
-        </item>
+        </item> <!-- Ruins -->
         <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
@@ -5719,5 +5719,5 @@
             <key key="historic" value="archaeological_site" />
             <reference ref="name_oh" />
-        </item>
+        </item> <!-- Archaeological Site -->
         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
@@ -5730,5 +5730,5 @@
             <key key="historic" value="battlefield" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Battlefield -->
         <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:geological=palaeontological_site"
@@ -5740,5 +5740,5 @@
             <key key="geological" value="palaeontological_site" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Palaeontological Site -->
         <separator/>
         <item name="Monument" icon="presets/monument.png" type="node,closedway" preset_name_label="true">
@@ -5754,5 +5754,5 @@
             <key key="historic" value="monument" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Monument -->
         <item name="Memorial" icon="presets/memorial.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
@@ -5767,5 +5767,5 @@
             <key key="historic" value="memorial" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Memorial -->
         <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_cross"
@@ -5776,5 +5776,5 @@
             <key key="historic" value="wayside_cross" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Wayside Cross -->
         <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_shrine"
@@ -5788,5 +5788,5 @@
             <key key="historic" value="wayside_shrine" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Wayside Shrine -->
         <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=boundary_stone"
@@ -5798,7 +5798,7 @@
             <key key="historic" value="boundary_stone" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Boundary Stone -->
     </group> <!-- Historic Places -->
-  </group> <!-- Structures -->
+  </group> <!-- Man Made -->
   <group name="Shops" icon="styles/standard/shop/mall.png">
     <group name="Food" icon="styles/standard/shop/supermarket.png">
@@ -5815,5 +5815,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Supermarket -->
         <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
@@ -5828,5 +5828,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Convenience Store -->
         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
@@ -5840,5 +5840,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Kiosk -->
         <separator/>
         <item name="Bakery" icon="presets/baker.png" type="node,closedway" preset_name_label="true">
@@ -5856,5 +5856,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Bakery -->
         <item name="Butcher" icon="presets/cow.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
@@ -5870,5 +5870,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Butcher -->
         <item name="Seafood" icon="presets/seafood.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
@@ -5880,5 +5880,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Seafood -->
         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
@@ -5892,6 +5892,6 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
-        <item name="Confectionery" icon="presets/confectionery.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Deli (Fine Food) -->
+        <item name="Candy Store" icon="presets/confectionery.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=confectionery"
@@ -5906,5 +5906,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Candy Store -->
         <item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea" />
@@ -5913,5 +5913,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Tea -->
         <item name="Coffee" icon="styles/standard/shop/groceries/coffee.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=coffee" />
@@ -5920,7 +5920,7 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Coffee -->
         <separator/>
-        <item name="Marketplace" icon="styles/standard/place/marketplace.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Public Market" icon="styles/standard/place/marketplace.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
@@ -5936,5 +5936,5 @@
             <text key="website" text="Website" />
             <combo key="organic" text="Organic" values="only,yes,no" />
-        </item>
+        </item> <!-- Public Market -->
         <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
@@ -5949,5 +5949,5 @@
             <combo key="organic" text="Organic" values="only,yes,no" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Greengrocer -->
         <item name="Farm Stand" icon="presets/apple.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
@@ -5962,5 +5962,5 @@
             <combo key="organic" text="Organic" values="only,yes,no" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Farm Stand -->
         <separator/>
         <item name="Organic" type="node,closedway" preset_name_label="true">
@@ -5969,10 +5969,10 @@
             <space />
             <combo text="Organic/Bio" key="organic" values="only,yes,no" match="key" />
-        </item>
+        </item> <!-- Organic -->
         <item name="Fair Trade" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
             <space />
             <combo text="Fair Trade" key="fair_trade" values="no,yes,only" match="key" />
-        </item>
+        </item> <!-- Fair Trade -->
         <separator/>
         <item name="Alcohol" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
@@ -5987,5 +5987,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Alcohol -->
         <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
@@ -5998,5 +5998,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Beverages -->
     </group> <!-- Food -->
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
@@ -6015,5 +6015,5 @@
             <combo key="organic" text="Organic" values="only,yes,no" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Clothes -->
         <item name="Boutique" icon="presets/boutique.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
@@ -6026,5 +6026,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Boutique -->
         <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
@@ -6038,5 +6038,5 @@
             <combo key="organic" text="Organic" values="only,yes,no" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Shoes -->
         <item name="Outdoor" icon="presets/tent.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
@@ -6049,5 +6049,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Outdoor -->
         <item name="Sports" icon="presets/rowing.png" type="node,closedway" preset_name_label="true">
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
@@ -6058,5 +6058,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Sports -->
         <separator/>
         <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
@@ -6070,5 +6070,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Dry Cleaning -->
         <item name="Laundry" icon="presets/laundry.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
@@ -6080,5 +6080,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Laundry -->
         <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tailor"
@@ -6102,5 +6102,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Tailor -->
         <item name="Fabric" icon="presets/fabric.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
@@ -6112,5 +6112,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Fabric -->
     </group> <!-- Clothes -->
     <group name="Electronic" icon="styles/standard/shop/electronics.png">
@@ -6125,5 +6125,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Computer -->
         <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
@@ -6135,5 +6135,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Computer -->
         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
@@ -6144,5 +6144,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Mobile Phone -->
         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
@@ -6153,5 +6153,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Vacuum Cleaner -->
         <item name="Hifi" icon="styles/standard/shop/hifi.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hifi"
@@ -6163,5 +6163,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Hifi -->
         <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video"
@@ -6173,6 +6173,6 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
-        <item name="Video games" icon="styles/standard/shop/video_games.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Video -->
+        <item name="Video Games" icon="styles/standard/shop/video_games.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video_games" />
             <space />
@@ -6180,5 +6180,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Video Games -->
     </group> <!-- Electronic -->
     <group name="Cash" icon="presets/dollar.png">
@@ -6199,5 +6199,5 @@
             <check key="atm" text="Automated Teller Machine" default="on" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Bank -->
         <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
@@ -6211,5 +6211,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Money Exchange -->
         <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
@@ -6229,5 +6229,5 @@
             <text key="operator" text="Operator" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Automated Teller Machine -->
         <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
@@ -6238,5 +6238,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Pawnbroker -->
     </group> <!-- Cash -->
     <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg">	
@@ -6251,5 +6251,5 @@
             <reference ref="name_brand_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Furniture -->
         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
@@ -6263,5 +6263,5 @@
             <reference ref="name_brand_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Kitchen -->
         <item name="Curtain" icon="presets/curtain.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
@@ -6272,5 +6272,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Curtain -->
         <item name="Frame" icon="presets/frame.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
@@ -6282,5 +6282,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Frame -->
         <item name="Bed" icon="styles/standard/shop/bed.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bed"
@@ -6293,6 +6293,6 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
-        <item name="Interior decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway" preset_name_label="true">
+        </item> <!-- Bed -->
+        <item name="Interior Decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=interior_decoration"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=interior_decoration"
@@ -6302,8 +6302,8 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Interior Decoration -->
     </group> <!-- Home decoration -->
-    <group name="Printed material" icon="presets/stationery.png">
-            <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
+    <group name="Printed Material" icon="presets/stationery.png">
+        <item name="Stationery" icon="presets/stationery.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=stationery"
@@ -6314,6 +6314,6 @@
             <key key="shop" value="stationery" />
             <reference ref="name_oh" />
-        </item>
-        <item name="Copyshop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Stationery -->
+        <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=copyshop"
@@ -6324,5 +6324,5 @@
             <key key="shop" value="copyshop" />
             <reference ref="name_operator_oh" />
-        </item>
+        </item> <!-- Copy Shop -->
         <item name="Book Store" icon="presets/book.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=books"
@@ -6336,6 +6336,6 @@
             <reference ref="name_brand_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-        </item>
-        <item name="Newsagent's shop" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Book Store -->
+        <item name="Newspaper Stand" icon="presets/kiosk.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=newsagent"
@@ -6347,5 +6347,5 @@
             <key key="shop" value="newsagent" />
             <reference ref="name_oh" />
-        </item>
+        </item> <!-- Newspaper Stand -->
         <item name="Ticket" icon="styles/standard/shop/ticket.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=ticket"
@@ -6355,6 +6355,6 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
-    </group> <!-- Printed material -->
+        </item> <!-- Ticket -->
+    </group> <!-- Printed Material -->
     <group name="Other" icon="styles/standard/shop/mall.png">
         <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
@@ -6369,5 +6369,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Department Store -->
         <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
@@ -6380,5 +6380,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Mall -->
         <separator/>
         <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway" preset_name_label="true">
@@ -6392,6 +6392,6 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
-        <item name="Hairdresser" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Chemist -->
+        <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
@@ -6404,5 +6404,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Hairdresser/Barber -->
         <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
@@ -6415,5 +6415,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Beauty -->
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
@@ -6424,6 +6424,6 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
-        <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
+        </item> <!-- Optician -->
+        <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
@@ -6433,6 +6433,6 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
-        <item name="Gift" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
+        </item> <!-- Jewellery -->
+        <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
@@ -6449,5 +6449,5 @@
             </optional>
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Gift/Souvenir -->
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
@@ -6458,5 +6458,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Erotic -->
         <separator/>
         <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway" preset_name_label="true">
@@ -6471,5 +6471,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Florist -->
         <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
@@ -6484,7 +6484,7 @@
             <reference ref="name_brand_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Garden Centre -->
         <separator/>
-        <item name="Do-it-yourself-store" icon="presets/diy_store.png" type="node,closedway" preset_name_label="true">
+        <item name="Do-It-Yourself Store" icon="presets/diy_store.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"
@@ -6497,5 +6497,5 @@
             <reference ref="name_brand_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Do-It-Yourself Store -->
         <item name="Hardware" icon="presets/hardware.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
@@ -6508,5 +6508,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Hardware -->
         <item name="Paint" icon="presets/paint.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
@@ -6518,5 +6518,5 @@
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Paint -->
         <separator/>
         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway" preset_name_label="true">
@@ -6527,5 +6527,5 @@
             <key key="shop" value="travel_agency" />
             <reference ref="name_brand_oh" />
-        </item>
+        </item> <!-- Travel Agency -->
         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
@@ -6535,5 +6535,5 @@
             <key key="shop" value="musical_instrument" />
             <reference ref="name_operator_oh" />
-        </item>
+        </item> <!-- Musical Instrument -->
         <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toys"
@@ -6545,5 +6545,5 @@
             <key key="shop" value="toys" />
             <reference ref="name_oh" />
-        </item>
+        </item> <!-- Toys -->
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
@@ -6556,5 +6556,5 @@
             <key key="shop" value="variety_store" />
             <reference ref="name_operator_oh" />
-        </item>
+        </item> <!-- Variety Store -->
         <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bookmaker" />
@@ -6562,5 +6562,5 @@
             <key key="shop" value="bookmaker" />
             <reference ref="name_operator_oh" />
-        </item>
+        </item> <!-- Bookmaker -->
         <item name="Lottery" icon="presets/lottery.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=lottery"
@@ -6569,5 +6569,5 @@
             <key key="shop" value="lottery" />
             <reference ref="name_operator_oh" />
-        </item>
+        </item> <!-- Lottery -->
         <item name="Bag" icon="styles/standard/shop/bag.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bag"
@@ -6578,5 +6578,5 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Bag -->
         <item name="Pet" icon="styles/standard/shop/pet.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pet"
@@ -6589,8 +6589,8 @@
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Pet -->
     </group> <!-- Other -->
         <separator/>
-    <item name="Vending machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
+    <item name="Vending Machine" icon="presets/vending_machine.png" type="node" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
@@ -6604,5 +6604,5 @@
         <text key="note" text="Note" />
         <reference ref="payment_account" />
-    </item>
+    </item> <!-- Vending Machine -->
   </group> <!-- Shops -->
   <group name="Geography" icon="presets/peak.svg">
@@ -6613,5 +6613,5 @@
             <key key="boundary" value="national" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- National -->
         <item name="Administrative" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
@@ -6625,5 +6625,5 @@
             <key key="boundary" value="administrative" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Administrative -->
         <item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=political"
@@ -6633,5 +6633,5 @@
             <combo key="political_division" text="Division" values="canton,linguistic_community,ward" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Political -->
         <item name="Postal Code" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code" />
@@ -6639,6 +6639,6 @@
             <key key="boundary" value="postal_code" />
             <text key="postal_code" text="Postal Code" />
-        </item>
-        <item name="National park" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
+        </item> <!-- Postal Code -->
+        <item name="National Park" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=national_park"
@@ -6648,5 +6648,5 @@
             <key key="boundary" value="national_park" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- National Park -->
     </group> <!-- Boundaries -->
     <group name="Places" icon="presets/places.png">
@@ -6657,12 +6657,12 @@
             <key key="place" value="continent" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Places -->
         <item name="Country" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=country"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=country" />
-        <space />
+            <space />
             <key key="place" value="country" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Country -->
         <item name="State" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=state"
@@ -6671,5 +6671,5 @@
             <key key="place" value="state" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- State -->
         <item name="Region" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=region"
@@ -6678,5 +6678,5 @@
             <key key="place" value="region" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Region -->
         <item name="County" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=county"
@@ -6686,5 +6686,5 @@
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
-        </item>
+        </item> <!-- County -->
         <separator/>
         <item name="City" icon="presets/places.png" type="node,closedway" preset_name_label="true">
@@ -6699,5 +6699,5 @@
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
-        </item>
+        </item> <!-- City -->
         <item name="Town" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town"
@@ -6712,5 +6712,5 @@
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
-        </item>
+        </item> <!-- Town -->
         <item name="Suburb" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
@@ -6724,5 +6724,5 @@
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
-        </item>
+        </item> <!-- Suburb -->
         <item name="Village" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=village"
@@ -6738,5 +6738,5 @@
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
-        </item>
+        </item> <!-- Village -->
         <item name="Hamlet" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=hamlet"
@@ -6751,5 +6751,5 @@
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
-        </item>
+        </item> <!-- Hamlet -->
         <item name="Isolated Dwelling" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
@@ -6763,5 +6763,5 @@
             <reference ref="name_wikipedia" />
             <reference ref="population_postcode_website" />
-        </item>
+        </item> <!-- Isolated Dwelling -->
         <item name="Neighbourhood" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
@@ -6776,5 +6776,5 @@
             <text key="population" text="Population" />
             <text key="website" text="Website" />
-        </item>
+        </item> <!-- Neighbourhood -->
         <separator/>
         <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
@@ -6788,5 +6788,5 @@
             <key key="place" value="locality" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Locality -->
     </group> <!-- Places -->
     <group name="Geography" icon="presets/peak.svg">
@@ -6864,5 +6864,5 @@
             <key key="place" value="island" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Island -->
         <item name="Islet" icon="presets/islet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
@@ -6873,5 +6873,5 @@
             <key key="place" value="islet" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Islet -->
         <item name="Ridge" icon="presets/empty.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
@@ -7075,5 +7075,5 @@
             <key key="landuse" value="farmyard" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Farmyard -->
         <item name="Farmland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmland"
@@ -7088,5 +7088,5 @@
             <key key="landuse" value="farmland" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Farmland -->
         <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=meadow"
@@ -7099,5 +7099,5 @@
             <key key="landuse" value="meadow" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Meadow -->
         <item name="Orchard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
@@ -7110,5 +7110,5 @@
             <key key="landuse" value="orchard" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Orchard -->
         <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=vineyard"
@@ -7119,5 +7119,5 @@
             <key key="landuse" value="vineyard" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Vineyard -->
         <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
@@ -7130,5 +7130,5 @@
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
-        </item>
+        </item> <!-- Greenhouse Horticulture -->
         <item name="Plant Nursery" icon="styles/standard/misc/landmark/plant.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=plant_nursery"
@@ -7144,5 +7144,5 @@
             <text key="genus" text="Genus" />
             <text key="species" text="Species" />
-        </item>
+        </item> <!-- Plant Nursery -->
         <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
@@ -7158,5 +7158,5 @@
             <key key="landuse" value="allotments" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Allotments -->
         <separator/>
         <item name="Garden" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
@@ -7169,5 +7169,5 @@
             <key key="leisure" value="garden" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Garden -->
         <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=grass"
@@ -7182,5 +7182,5 @@
             <key key="landuse" value="grass" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Grass -->
         <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
@@ -7194,5 +7194,5 @@
             <key key="landuse" value="village_green" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Village Green -->
         <item name="Common" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
@@ -7202,5 +7202,5 @@
             <key key="leisure" value="common" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Common -->
         <item name="Park" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=park"
@@ -7215,5 +7215,5 @@
             <key key="leisure" value="park" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Park -->
         <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground"
@@ -7226,5 +7226,5 @@
             <key key="landuse" value="recreation_ground" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Recreation Ground -->
         <separator/>
         <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">
@@ -7240,5 +7240,5 @@
             <key key="landuse" value="residential" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Residential Area -->
         <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard"
@@ -7253,5 +7253,5 @@
             <key key="amenity" value="grave_yard" />
             <reference ref="religious" />
-        </item>
+        </item> <!-- Graveyard -->
         <item name="Cemetery" icon="presets/cemetery.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery"
@@ -7268,5 +7268,5 @@
             <key key="landuse" value="cemetery" />
             <reference ref="religious" />
-        </item>
+        </item> <!-- Cemetery -->
         <item name="Religious" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=religious"
@@ -7277,5 +7277,5 @@
             <key key="landuse" value="religious" />
             <reference ref="religious" />
-        </item>
+        </item> <!-- Religious -->
         <item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
@@ -7288,5 +7288,5 @@
             <key key="landuse" value="retail" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Retail -->
         <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
@@ -7299,5 +7299,5 @@
             <key key="landuse" value="commercial" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Commercial -->
         <item name="Industrial" icon="presets/works.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
@@ -7311,5 +7311,5 @@
             <key key="landuse" value="industrial" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Industrial -->
         <item name="Garages" icon="presets/garages.png" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
@@ -7323,6 +7323,6 @@
             <text key="name" text="Name" />
             <text key="operator" text="Operator" />
-        </item>
-        <item name="Railway land" icon="presets/rail_light.png" type="closedway,relation" preset_name_label="true">
+        </item> <!-- Garages -->
+        <item name="Railway Land" icon="presets/rail_light.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=railway"
@@ -7334,5 +7334,5 @@
             <key key="landuse" value="railway" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Railway Land -->
         <item name="Military" icon="presets/military.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
@@ -7344,7 +7344,7 @@
             <key key="landuse" value="military" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Military -->
         <separator/>
-        <item name="Construction area" icon="presets/construction.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Construction Area" icon="presets/construction.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=construction"
@@ -7356,5 +7356,5 @@
             <key key="landuse" value="construction" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Construction Area -->
         <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
@@ -7367,5 +7367,5 @@
             <key key="landuse" value="brownfield" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Brownfield -->
         <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
@@ -7377,5 +7377,5 @@
             <key key="landuse" value="greenfield" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Greenfield -->
         <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
@@ -7388,5 +7388,5 @@
             <key key="landuse" value="landfill" />
             <text key="name" text="Name" />
-        </item>
+        </item> <!-- Landfill -->
         <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
@@ -7399,7 +7399,7 @@
             <key key="landuse" value="quarry" />
             <reference ref="name_operator" />
-        </item>
+        </item> <!-- Quarry -->
     </group> <!-- Landuse -->
-  </group>
+  </group> <!-- Geography -->
     <group name="Annotation" icon="presets/addresses.png">
         <item name="Name" icon="presets/message.png" type="node,way,closedway,relation" preset_name_label="true">
@@ -7433,5 +7433,5 @@
                 <text key="short_name" text="Common name abbreviation" match="key" />
             </optional>
-        </item>
+        </item> <!-- Name -->
         <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
@@ -7458,5 +7458,5 @@
                 <combo key="addr:country" text="Country code" values_from="java.util.Locale#getISOCountries" use_last_as_default="force" match="key" />
             </optional>
-        </item>
+        </item> <!-- Addresses -->
         <item name="Address Interpolation" icon="presets/interpolation.png" type="way" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
@@ -7477,6 +7477,6 @@
                 <combo key="addr:inclusion" text="Accuracy" values="actual,estimate,potential" match="key" />
             </optional>
-        </item>
-        <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
+        </item> <!-- Address Interpolation -->
+        <item name="Contact (Common Schema)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Annotations"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Annotations"
@@ -7492,6 +7492,6 @@
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
-        </item>
-        <item name="Contact (schema with 'contact:*' prefix)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
+        </item> <!-- Contact (Common Schema) -->
+        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:contact"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:contact"
@@ -7511,5 +7511,5 @@
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
-        </item>
+        </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
     </group> <!-- Annotation -->
     <group name="Relations" icon="presets/relations.png">
@@ -7532,5 +7532,5 @@
                 <role key="inner" text="inner segment" requisite="optional" type="way" />
             </roles>
-        </item>
+        </item> <!-- Multipolygon -->
         <item name="Boundary" icon="presets/boundaries.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
@@ -7555,5 +7555,5 @@
                 <role key="label" text="Label point" requisite="optional" type="node" count="1" />
             </roles>
-        </item>
+        </item> <!-- Boundary -->
         <item name="Site" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:site"
@@ -7570,7 +7570,7 @@
                 <role key="" text="members of site" requisite="optional" type="node,way,closedway,relation" />
             </roles>
-        </item>
+        </item> <!-- Site -->
         <separator/>
-        <item name="Turn restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
+        <item name="Turn Restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
@@ -7593,5 +7593,5 @@
                 <role key="to" text="to way" requisite="required" count="1" type="way" />
             </roles>
-        </item>
+        </item> <!-- Turn Restriction -->
         <item name="Enforcement" icon="presets/speed_camera.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:enforcement"
@@ -7614,8 +7614,8 @@
                 <role key="force" text="traffic light or barrier that stops you" requisite="optional" type="node" />
             </roles>
-        </item>
+        </item> <!-- Enforcement -->
         <separator/>
         <group name="Routes">
-            <item name="Bicycle route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Bicycle Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Cycle_routes"
@@ -7633,6 +7633,6 @@
                     <role key="" text="route segment" requisite="required" type="way"/>
                 </roles>
-            </item>
-            <item name="MTB route" icon="presets/path.png" type="relation" preset_name_label="true">
+            </item> <!-- Bicycle Route -->
+            <item name="Mountain Biking Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Mountain_biking"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Mountain_biking"
@@ -7653,6 +7653,6 @@
                     <role key="" text="route segment" requisite="required" type="way" member_expression="highway=path OR highway=track"/>
                 </roles>
-            </item>
-            <item name="Hiking route" icon="presets/path.png" type="relation" preset_name_label="true">
+            </item> <!-- Mountain Biking Route -->
+            <item name="Hiking Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=hiking#Tagging_walking_and_hiking_Route_Networks"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Hiking"
@@ -7675,6 +7675,6 @@
                     <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
                 </roles>
-            </item>
-            <item name="Piste route" icon="presets/path.png" type="relation" preset_name_label="true">
+            </item> <!-- Hiking Route -->
+            <item name="Piste Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:route=piste" />
@@ -7696,6 +7696,6 @@
                     <role key="start" text="entry points" requisite="optional" type="node" />
                 </roles>
-            </item>
-            <item name="Ski route" icon="presets/path.png" type="relation" preset_name_label="true">
+            </item> <!-- Piste Route -->
+            <item name="Ski Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ski"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=ski" />
@@ -7717,7 +7717,7 @@
                     <role key="start" text="entry points" requisite="optional" type="node" />
                 </roles>
-            </item>
+            </item> <!-- Ski Route -->
             <separator/>
-            <item name="Detour route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Detour Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=detour" />
@@ -7734,6 +7734,6 @@
                     <role key="fork" text="fork node for alternative routes" requisite="optional" type="node"/>
                 </roles>
-            </item>
-            <item name="Power route" icon="presets/path.png" type="relation" preset_name_label="true">
+            </item> <!-- Detour Route -->
+            <item name="Power Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=power" />
                 <space/>
@@ -7744,6 +7744,6 @@
                     <role key="" text="route segment" requisite="required" type="way" member_expression="power"/>
                 </roles>
-            </item>
-            <item name="Railway route" icon="presets/path.png" type="relation" preset_name_label="true">
+            </item> <!-- Power Route -->
+            <item name="Railway Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
@@ -7757,6 +7757,6 @@
                     <role key="" text="route segment" requisite="required" type="way" member_expression="railway"/>
                 </roles>
-            </item>
-            <item name="Road route" icon="presets/path.png" type="relation" preset_name_label="true">
+            </item> <!-- Railway Route -->
+            <item name="Road Route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=road"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:route=road"
@@ -7775,5 +7775,5 @@
                     <role key="link" text="link segment" requisite="optional" type="way" member_expression="highway"/>
                 </roles>
-            </item>
+            </item> <!-- Road Route -->
         </group> <!-- Routes -->
         <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
@@ -7789,5 +7789,5 @@
                 <role key="" text="member" requisite="required" type="relation" />
             </roles>
-        </item>
+        </item> <!-- Route Network -->
         <separator/>
         <item name="Associated Street" icon="presets/addresses.png" type="relation" preset_name_label="true">
@@ -7806,5 +7806,5 @@
                 <role key="house" text="house" requisite="required" type="node,way,closedway,relation" member_expression="&quot;addr:housenumber&quot; | &quot;addr:interpolation&quot;" />
             </roles>
-        </item>
+        </item> <!-- Associated Street -->
         <item name="Street" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:street"
@@ -7819,6 +7819,6 @@
                 <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway" />
             </roles>
-        </item>
-        <item name="Destination sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
+        </item> <!-- Street -->
+        <item name="Destination Sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:destination_sign"
@@ -7842,5 +7842,5 @@
                 <role key="sign" text="position of sign" requisite="optional" type="node" />
             </roles>
-        </item>
+        </item> <!-- Destination Sign -->
         <separator/>
         <item name="Waterway" icon="presets/river.png" type="relation" preset_name_label="true">
@@ -7866,5 +7866,5 @@
                 <role key="spring" text="spring of waterway" requisite="optional" type="node" />
             </roles>
-        </item>
+        </item> <!-- Waterway -->
         <item name="Bridge" icon="presets/bridge.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
@@ -7885,5 +7885,5 @@
                 <role key="edge" text="edge ways parallel to 'across'" requisite="optional" type="way" />
             </roles>
-        </item>
+        </item> <!-- Bridge -->
         <item name="Tunnel" icon="presets/tunnel.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
@@ -7899,5 +7899,5 @@
                 <role key="edge" text="edge ways parallel to 'through'" requisite="optional" type="way" />
             </roles>
-        </item>
+        </item> <!-- Tunnel -->
     </group> <!-- Relations -->
 </presets>