--- data/defaultpresets.xml
+++ data/defaultpresets.xml
@@ -165,10 +165,14 @@
     <chunk id="surface">
         <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground,sett" />
     </chunk>
+    <chunk id="riding_surface">
+        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
+        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
+    </chunk>
     <chunk id="highway_base">
         <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3"/>
         <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3"/>
-        <text key="maxspeed" text="Max. speed (km/h)"/>
+        <reference ref="maxspeed" />
         <reference ref="surface" />
     </chunk>
     <chunk id="highway_yesno_incline">
@@ -176,7 +180,7 @@
         <check key="tunnel" text="Tunnel" disable_off="true" />
         <check key="cutting" text="Cutting" disable_off="true" />
         <check key="embankment" text="Embankment" disable_off="true" />
-        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
+        <reference ref="incline" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway">
         <check key="oneway" text="Oneway" />
@@ -184,11 +188,34 @@
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit">
         <reference ref="highway_yesno_incline_oneway" />
-        <check key="lit" text="Lit" />
+        <reference ref="lit_yesno" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width">
         <reference ref="highway_yesno_incline_oneway_lit" />
-        <text key="width" text="Width (meters)" />
+        <reference ref="width" />
+    </chunk>
+    <chunk id="highway_yesno_oneway_bridge_tunnel_cutting_embankment_lit_toll">
+        <checkgroup columns="4">
+            <check key="oneway" text="Oneway" default="on" />
+            <check key="bridge" text="Bridge" disable_off="true" />
+            <check key="tunnel" text="Tunnel" disable_off="true" />
+            <check key="cutting" text="Cutting" disable_off="true" />
+            <check key="embankment" text="Embankment" disable_off="true" />
+            <reference ref="lit_yesno" />
+            <check key="toll" text="Toll" />
+        </checkgroup>
+    </chunk>
+    <chunk id="highway_yesno_oneway_motorroad_bridge_tunnel_cutting_embankment_lit_toll">
+        <checkgroup columns="4">
+            <check key="oneway" text="Oneway" default="on" />
+            <check key="motorroad" text="Motorroad" default="on" />
+            <check key="bridge" text="Bridge" disable_off="true" />
+            <check key="tunnel" text="Tunnel" disable_off="true" />
+            <check key="cutting" text="Cutting" disable_off="true" />
+            <check key="embankment" text="Embankment" disable_off="true" />
+            <reference ref="lit_yesno" />
+            <check key="toll" text="Toll" />
+        </checkgroup>
     </chunk>
     <chunk id="railway_service">
         <combo key="service" text="Service type" values="yard,siding,spur" />
@@ -204,6 +231,18 @@
         <combo key="gauge" text="Gauge (mm)" values="1668,1676,1674,1600,1524,1520,1495,1435,1067,1000,914,762,760,750" length="4" />
         <reference ref="railway_electrified" />
     </chunk>
+    <chunk id="aerialway_capacity">
+        <text key="aerialway:capacity" text="Number of people per hour" />
+    </chunk>
+    <chunk id="aerialway_duration">
+        <text key="aerialway:duration" text="Typical journey time in minutes" />
+    </chunk>
+    <chunk id="aerialway_bubble">
+        <check key="aerialway:bubble" text="Has bubble?" />
+    </chunk>
+    <chunk id="aerialway_heating">
+        <check key="aerialway:heating" text="Has heating?" />
+    </chunk>
     <chunk id="barrier_5">
         <optional text="Allowed traffic:">
             <check key="foot" text="Foot" default="on"/>
@@ -231,33 +270,57 @@
         <text key="phone" text="Phone Number"/>
         <text key="fax" text="Fax Number"/>
         <text key="website" text="Website"/>
-    <text key="email" text="Email Address"/>
+        <text key="email" text="Email Address"/>
     </chunk>
-    <chunk id="name_ref">
-        <text key="name" text="Name" />
-        <text key="ref" text="Reference" />
+    <chunk id="website">
+        <text key="website" text="Website" />
     </chunk>
-    <chunk id="name_ref_operator">
-        <text key="name" text="Name" />
-        <text key="ref" text="Reference" />
-        <text key="operator" text="Operator" />
+    <chunk id="wikipedia">
+        <text key="wikipedia" text="Wikipedia" />
     </chunk>
-    <chunk id="name_operator">
-        <text key="name" text="Name" />
+    <chunk id="operator">
         <text key="operator" text="Operator" />
     </chunk>
-    <chunk id="name_layer">
+    <chunk id="network">
+        <text key="network" text="Network" />
+    </chunk>
+    <chunk id="ref">
+        <text key="ref" text="Reference" />
+    </chunk>
+    <chunk id="ref_number">
+        <text key="ref" text="Reference number" />
+    </chunk>
+    <chunk id="fee">
+        <combo key="fee" text="Fee" values="yes,no" />
+    </chunk>
+    <chunk id="description">
+        <text key="description" text="Description" />
+    </chunk>
+    <chunk id="closer_description">
+        <text key="description" text="Closer description" />
+    </chunk>
+    <chunk id="name">
         <text key="name" text="Name" />
-        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
     </chunk>
-    <chunk id="service_times">
-        <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+    <chunk id="name_ref">
+        <reference ref="name" />
+        <reference ref="ref" />
     </chunk>
-    <chunk id="oh">
-        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+    <chunk id="name_ref_operator">
+        <reference ref="name" />
+        <reference ref="ref" />
+        <reference ref="operator" />
+    </chunk>
+    <chunk id="name_operator">
+        <reference ref="name" />
+        <reference ref="operator" />
+    </chunk>
+    <chunk id="name_layer">
+        <reference ref="name" />
+        <reference ref="layer" />
     </chunk>
     <chunk id="name_oh">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <reference ref="oh" />
     </chunk>
     <chunk id="name_operator_oh">
@@ -265,25 +328,86 @@
         <reference ref="oh" />
     </chunk>
     <chunk id="name_brand_operator_oh">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <text key="brand" text="Brand" />
-        <text key="operator" text="Operator" />
+        <reference ref="operator" />
         <reference ref="oh" />
     </chunk>
     <chunk id="name_brand_oh">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <text key="brand" text="Brand" />
         <reference ref="oh" />
     </chunk>
-    <chunk id="internet_smoking_wheelchair">
+    <chunk id="name_leisure_pitch">
+        <reference ref="name" />
+        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
+    </chunk>
+    <chunk id="name_leisure_type">
+        <reference ref="name" />
+        <reference ref="leisure_type" />
+    </chunk>
+    <chunk id="name_wikipedia">
+        <reference ref="name" />
+        <reference ref="wikipedia" />
+    </chunk>
+    <chunk id="name_wikipedia_elevation">
+        <reference ref="name_wikipedia" />
+        <reference ref="elevation" />
+    </chunk>
+    <chunk id="sport">
+        <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+    </chunk>
+    <chunk id="leisure_type">
+        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
+    </chunk>
+    <chunk id="layer">
+        <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+    </chunk>
+    <chunk id="service_times">
+        <combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+    </chunk>
+    <chunk id="oh">
+        <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" />
+    </chunk>
+    <chunk id="internet">
         <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
         <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+    </chunk>
+    <chunk id="smoking_wheelchair">
         <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
         <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
     </chunk>
+    <chunk id="internet_smoking_wheelchair">
+        <reference ref="internet" />
+        <reference ref="smoking_wheelchair" />
+    </chunk>
+    <chunk id="capacity">
+        <text key="capacity" text="Capacity" />
+    </chunk>
+    <chunk id="maxspeed">
+        <text key="maxspeed" text="Max. speed (km/h)" />
+    </chunk>
+    <chunk id="incline">
+        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+    </chunk>
+    <chunk id="length">
+        <text key="length" text="Length (meters)" length="7" />
+    </chunk>
+    <chunk id="width">
+        <text key="width" text="Width (meters)" length="7" />
+    </chunk>
+    <chunk id="height">
+        <text key="height" text="Height (meters)" length="7" />
+    </chunk>
+    <chunk id="elevation">
+        <text key="ele" text="Elevation" />
+    </chunk>
+    <chunk id="stars">
+        <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+    </chunk>
     <chunk id="optional_height">
         <optional>
-            <text key="height" text="Height (meters)" length="7" />
+            <reference ref="height" />
         </optional>
     </chunk>
     <chunk id="optional_maxwidth">
@@ -297,10 +421,6 @@
             <text key="maxwidth" text="Max. width (meters)" length="7" />
         </optional>
     </chunk>
-    <chunk id="name_leisure_pitch">
-        <text key="name" text="Name" />
-        <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
-    </chunk>
     <chunk id="payment_base">
         <check key="payment:coins" text="Coins" />
         <check key="payment:notes" text="Notes" />
@@ -313,18 +433,21 @@
         <check key="payment:account_cards" text="Account or loyalty cards" />
     </chunk>
     <chunk id="parking_name_type_ref">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-        <text key="ref" text="Reference number" />
+        <reference ref="ref_number" />
     </chunk>
     <chunk id="parking_access_fee_operator_surface">
         <space />
         <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
         <combo key="fee" text="Fee" values="yes,no,interval" />
-        <text key="operator" text="Operator" />
+        <reference ref="operator" />
         <reference ref="surface" />
         <space />
     </chunk>
+    <chunk id="organic">
+        <combo key="organic" text="Organic" values="only,yes,no" />
+    </chunk>
     <chunk id="stay">
         <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
     </chunk>
@@ -333,17 +456,16 @@
         <combo key="lit" text="Lit" values="yes,no,interval" />
         <reference ref="oh" />
     </chunk>
+    <chunk id="lit_yesno">
+        <check key="lit" text="Lit" />
+    </chunk>
     <chunk id="general_access">
         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_searchable="true" />
     </chunk>
-    <chunk id="name_wikipedia">
-        <text key="name" text="Name" />
-        <text key="wikipedia" text="Wikipedia" />
-    </chunk>
     <chunk id="population_postcode_website">
         <text key="population" text="Population" />
         <text key="addr:postcode" text="Post code" />
-        <text key="website" text="Website" />
+        <reference ref="website" />
     </chunk>
     <chunk id="route_hikebike_optionals">
         <text key="distance" text="Distance (km)"/>
@@ -353,12 +475,20 @@
         <text key="symbol" text="Symbol description"/>
         <text key="description" text="Description"/>
     </chunk>
+    <chunk id="genus_species">
+        <text key="genus" text="Genus" />
+        <text key="species" text="Species" />
+    </chunk>
+    <chunk id="genus_species_taxon">
+        <reference ref="genus_species" />
+        <text key="taxon" text="Taxon" />
+    </chunk>
     <chunk id="leaf">
         <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" />
         <combo key="leaf_cycle" text="Cycle" values="deciduous,evergreen,semi_deciduous,semi_evergreen,mixed" />
     </chunk>
     <chunk id="religious">
-        <text key="name" text="Name" />
+        <reference ref="name" />
         <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
         <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
     </chunk>
@@ -373,8 +503,8 @@
         <reference ref="frequency" />
     </chunk>
     <chunk id="ref_operator_branch">
-        <text key="ref" text="Reference" />
-        <text key="operator" text="Operator" />
+        <reference ref="ref" />
+        <reference ref="operator" />
         <text key="branch" text="Branch operator" />
     </chunk>
     <chunk id="cable_circuit">
@@ -445,21 +575,13 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=motorway" />
             <space />
             <key key="highway" value="motorway" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
+                <reference ref="highway_yesno_oneway_bridge_tunnel_cutting_embankment_lit_toll" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link"
@@ -473,17 +595,9 @@
             <key key="highway" value="motorway_link" />
             <optional>
                 <reference ref="highway_base" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
+                <reference ref="highway_yesno_oneway_bridge_tunnel_cutting_embankment_lit_toll" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk"
@@ -496,22 +610,13 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=trunk" />
             <space />
             <key key="highway" value="trunk" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="motorroad" text="Motorroad" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
+                <reference ref="highway_yesno_oneway_motorroad_bridge_tunnel_cutting_embankment_lit_toll" />
             </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)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -522,21 +627,12 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Link_(highway)" />
             <space />
             <key key="highway" value="trunk_link" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
                 <reference ref="highway_base" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="motorroad" text="Motorroad" default="on" />
-                    <check key="bridge" text="Bridge" disable_off="true" />
-                    <check key="tunnel" text="Tunnel" disable_off="true" />
-                    <check key="cutting" text="Cutting" disable_off="true" />
-                    <check key="embankment" text="Embankment" disable_off="true" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
+                <reference ref="highway_yesno_oneway_motorroad_bridge_tunnel_cutting_embankment_lit_toll" />
             </optional>
-        </item>
+        </item> <!-- Trunk Link -->
         <separator/>
         <item name="Primary" icon="presets/way_primary.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
@@ -550,14 +646,14 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=primary" />
             <space />
             <key key="highway" value="primary" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <check key="motorroad" text="Motorroad" />
                 <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)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -572,7 +668,7 @@
                 <check key="motorroad" text="Motorroad" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
@@ -586,13 +682,13 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=secondary" />
             <space />
             <key key="highway" value="secondary" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <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)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -606,7 +702,7 @@
                 <reference ref="highway_base" />
                 <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=tertiary"
@@ -621,13 +717,13 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=tertiary" />
             <space />
             <key key="highway" value="tertiary" />
-            <text key="ref" text="Reference" />
+            <reference ref="ref" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <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)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -641,7 +737,7 @@
                 <reference ref="highway_base" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
@@ -654,14 +750,13 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=unclassified" />
             <key key="highway" value="unclassified" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="ref" text="Reference" />
+                <reference ref="name_ref" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential"
@@ -675,14 +770,14 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=residential" />
             <space />
             <key key="highway" value="residential" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bicycle_road"
@@ -691,7 +786,7 @@
             <key key="bicycle_road" value="yes" />
             <key key="bicycle" value="designated" />
             <combo key="highway" text="Highway type" values="residential,service,unclassified,path,cycleway" values_context="Highway" default="residential" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="vehicle" text="Vehicle access" values="yes,no,destination" default="no" />
             <text key="maxspeed" text="Max. speed (km/h)" default="30" />
             <optional>
@@ -701,10 +796,10 @@
                 <check key="oneway" text="Oneway" />
                 <check key="oneway:bicycle" text="Oneway for bicycle" />
                 <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="lit_yesno" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street"
@@ -716,15 +811,15 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=living_street" />
             <space />
             <key key="highway" value="living_street" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian"
@@ -738,17 +833,17 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=pedestrian" />
             <space />
             <key key="highway" value="pedestrian" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <reference ref="surface" />
                 <check key="area" text="Area" />
                 <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="lit_yesno" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service"
@@ -762,13 +857,13 @@
             <key key="highway" value="service" />
             <combo key="service" text="Service way type" values="alley,driveway,parking_aisle,drive-through" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
@@ -783,9 +878,9 @@
             <optional>
                 <reference ref="surface" />
                 <check key="oneway" text="Oneway" />
-                <check key="lit" text="Lit" />
+                <reference ref="lit_yesno" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road"
@@ -797,11 +892,11 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:highway=road" />
             <key key="highway" value="road" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <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/Tag:highway=construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:construction"
@@ -812,13 +907,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:construction" />
             <key key="highway" value="construction" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
                 <combo key="junction" text="Junction" values="roundabout,jughandle,yes" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
-        </item>
+        </item> <!-- Construction -->
         <separator/>
         <item name="Road Restrictions" icon="presets/restrictions.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:access"
@@ -857,7 +952,7 @@
             <combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
             <combo key="tourist_bus" text="Tourist buses" values="yes,no" match="key" />
-            <text key="maxspeed" text="Max. speed (km/h)" />
+            <reference ref="maxspeed" />
             <text key="minspeed" text="Min. speed (km/h)" match="key" />
             <text key="maxweight" text="Max. weight (tonnes)" match="key" />
             <text key="maxaxleload" text="Max. axleload (tonnes)" match="key" />
@@ -865,7 +960,7 @@
             <text key="maxwidth" text="Max. width (meters)" match="key" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
@@ -885,9 +980,9 @@
                 <reference ref="name_layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3,4,5" length="3" />
                 <reference ref="highway_yesno_incline_oneway" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
@@ -902,15 +997,15 @@
             <space />
             <combo key="bridge" text="Bridge" values="yes,aqueduct,cantilever,covered,low_water_crossing,movable,suspension,swing,trestle,viaduct" match="keyvalue" default="yes" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="1" length="3" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
+                <reference ref="maxspeed" />
                 <text key="maxweight" text="Max. weight (tonnes)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="incline" />
+                <reference ref="width" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
@@ -921,10 +1016,10 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:ford" />
             <key key="ford" value="yes" />
             <optional>
-                <text key="name" text="Name" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="name" />
+                <reference ref="incline" />
             </optional>
-        </item>
+        </item> <!-- Ford -->
     </group> <!-- Streets -->
     <group name="Ways" icon="presets/way_unclassified.png">
         <item name="Track" icon="presets/track1.png" type="way,closedway" preset_name_label="true">
@@ -952,9 +1047,9 @@
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path"
@@ -988,9 +1083,9 @@
                 <combo key="ski" text="Ski" values="yes,official,designated,permissive,private,no" />
                 <combo key="snowmobile" text="Snowmobile" values="yes,official,designated,permissive,destination,delivery,private,no" />
                 <!-- <combo key="motorcar" text="Motorcar" values="yes,designated,no" default="no" /> -->
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
-        </item>
+        </item> <!-- Path -->
         <separator/>
         <item name="Dedicated Bridleway" icon="presets/equestrian.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway"
@@ -1003,12 +1098,12 @@
             <key key="highway" value="bridleway" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
+                <reference ref="maxspeed" />
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
-        </item>
+        </item> <!-- Dedicated Bridleway -->
         <item name="Cycle Lane/Track" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
@@ -1031,7 +1126,7 @@
                 <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,living_street,service,bus_guideway,construction" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1047,9 +1142,9 @@
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
                 <combo key="foot" text="Pedestrians" values="unknown,yes,no" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1062,9 +1157,9 @@
                 <reference ref="name_layer" />
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1078,9 +1173,9 @@
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
                 <check key="passing_places" text="Passing Places" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway"
@@ -1097,11 +1192,11 @@
                 <reference ref="name_layer" />
                 <reference ref="surface" />
                 <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
+                <reference ref="lit_yesno" />
                 <check key="bicycle" text="Bicycle" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
@@ -1117,9 +1212,9 @@
                 <reference ref="surface" />
                 <text key="step_count" text="Amount of Steps" />
                 <reference ref="highway_yesno_incline_oneway_lit" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
-        </item>
+        </item> <!-- Steps -->
     </group> <!-- Ways -->
     <group name="Waypoints" icon="presets/waypoints.png">
         <item name="Motorway Junction" icon="presets/motorway_exit.png" type="node" preset_name_label="true">
@@ -1131,10 +1226,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway_junction" />
             <space />
             <key key="highway" value="motorway_junction" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=services"
@@ -1145,11 +1240,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=services" />
             <key key="highway" value="services" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
+                <reference ref="name_operator" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=rest_area"
@@ -1161,11 +1255,11 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:highway=rest_area" />
             <key key="highway" value="rest_area" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <check key="toilets" text="Toilets" />
                 <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
@@ -1181,13 +1275,13 @@
                  <check key="bicycle" text="Cross by bicycle" />
                  <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">
             <key key="highway" value="stop" />
-        </item>
+        </item> <!-- Stop -->
         <item name="Give way" icon="styles/standard/vehicle/restriction/right_of_way.png" type="node" preset_name_label="true">
             <key key="highway" value="give_way" />
-        </item>
+        </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"
@@ -1198,7 +1292,7 @@
             <key key="highway" value="mini_roundabout" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:crossing"
@@ -1216,7 +1310,7 @@
             <check key="supervised" text="Crossing attendant" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_calming"
@@ -1229,13 +1323,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:traffic_calming" />
             <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=passing_place"
                   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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
@@ -1243,12 +1337,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=turning_circle"
                   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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
@@ -1258,9 +1352,9 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:traffic_sign" />
             <space />
             <key key="traffic_sign" value="city_limit" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   az.href="http://wiki.openstreetmap.org/wiki/Az:Tag:highway=speed_camera"
@@ -1271,9 +1365,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=speed_camera" />
             <key key="highway" value="speed_camera" />
             <optional>
-                <text key="maxspeed" text="Max. speed (km/h)" />
+                <reference ref="maxspeed" />
             </optional>
-        </item>
+        </item> <!-- Speed Camera -->
         <separator/>
         <item name="Elevator" icon="styles/standard/service/elevator.png" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=elevator"
@@ -1281,7 +1375,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=elevator"
                   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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grit_bin"
@@ -1289,7 +1383,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=grit_bin"
                   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">
             <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass"
@@ -1300,11 +1394,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Key:mountain_pass" />
             <key key="mountain_pass" value="yes" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="ele" text="Elevation" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="name_wikipedia_elevation" />
             </optional>
-        </item>
+        </item> <!-- Mountain Pass -->
     </group> <!-- Waypoints -->
     <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">
@@ -1318,7 +1410,7 @@
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=bollard"
@@ -1335,7 +1427,7 @@
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cycle_barrier"
@@ -1344,24 +1436,24 @@
             <key key="barrier" value="cycle_barrier" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=cattle_grid" />
             <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"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bus_trap" />
             <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">
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=toll_booth"
@@ -1373,16 +1465,15 @@
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=toll_booth" />
             <key key="barrier" value="toll_booth" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
+                <reference ref="name_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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=hedge"
@@ -1394,12 +1485,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=hedge" />
             <key key="barrier" value="hedge" />
             <optional>
-                <text key="height" text="Height (meters)" length="7" />
-                <text key="genus" text="Genus" />
-                <text key="species" text="Species" />
-                <text key="taxon" text="Taxon" />
+                <reference ref="height" />
+                <reference ref="genus_species_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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=fence"
@@ -1412,15 +1501,15 @@
             <key key="barrier" value="fence" />
             <optional>
                 <combo key="fence_type" text="Type" values="barbed_wire,chain_link,electric,metal,pole,split_rail,wire,wood" />
-                <text key="height" text="Height (meters)" length="7" />
+                <reference ref="height" />
             </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"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=wall"
@@ -1432,7 +1521,7 @@
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Tag:barrier=wall" />
             <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"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=city_wall"
@@ -1440,7 +1529,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=city_wall" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=retaining_wall"
@@ -1452,7 +1541,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:barrier=retaining_wall" />
             <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"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:barrier=ditch"
@@ -1463,14 +1552,14 @@
             <optional>
                 <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"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=kerb" />
             <key key="barrier" value="kerb" />
             <reference ref="optional_height" />
-        </item> <!-- kerb -->
-        <separator/> <!-- *** access *** -->
+        </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"
@@ -1478,7 +1567,7 @@
             <key key="barrier" value="entrance" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
@@ -1491,7 +1580,7 @@
             <reference ref="barrier_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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=lift_gate"
@@ -1503,7 +1592,7 @@
             <reference ref="barrier_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" />
             <key key="barrier" value="swing_gate" />
@@ -1511,31 +1600,31 @@
             <reference ref="barrier_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">
             <key key="barrier" value="hampshire_gate" />
             <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">
             <key key="barrier" value="bump_gate" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=kissing_gate" />
             <key key="barrier" value="kissing_gate" />
             <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"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
             <key key="barrier" value="chain" />
             <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:highway=stile" />
             <space />
@@ -1545,14 +1634,14 @@
                 <combo key="material" text="Material" values="metal,stone,wood" />
             </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:highway=stile"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=stile"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=stile" />
             <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:highway=sally_port" />
             <key key="barrier" value="sally_port" />
@@ -1561,7 +1650,7 @@
                 <text key="maxheight" text="Max. height (meters)" length="7" />
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
             </optional>
-        </item> <!-- sally_port -->
+        </item> <!-- Sally Port -->
     </group> <!-- Barriers -->
     <group name="Passageways" icon="presets/tunnel.png">
         <item name="Tunnel" icon="presets/tunnel.png" type="way" preset_name_label="true">
@@ -1577,14 +1666,14 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:tunnel" />
             <key key="tunnel" value="yes" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
-                <text key="width" text="Width (meters)" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="width" />
+                <reference ref="maxspeed" />
+                <reference ref="incline" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1598,11 +1687,11 @@
             <key key="tunnel" value="building_passage" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="width" />
+                <reference ref="maxspeed" />
+                <reference ref="incline" />
             </optional>
-        </item>
+        </item> <!-- Building Passage -->
         <item name="Arcade" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
@@ -1617,9 +1706,9 @@
             <check key="arcade:right" value_on="open" text="Open on right side" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
-        </item>
+        </item> <!-- Arcade -->
         <item name="Colonnade" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
@@ -1632,9 +1721,9 @@
             <check key="colonnade:right" value_on="open" text="Open on right side" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="width" />
             </optional>
-        </item>
+        </item> <!-- Colonnade -->
         <item name="Avalanche Protector" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1651,12 +1740,12 @@
             <check key="avalanche_protector:right" value_on="open" text="Open on right side" />
             <optional>
                 <reference ref="name_layer" />
-                <text key="width" text="Width (meters)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="width" />
+                <reference ref="incline" />
             </optional>
-        </item>
-    </group>
-  </group> <!-- Passageways -->
+        </item> <!-- Avalanche Protector -->
+    </group> <!-- Passageways -->
+  </group> <!-- Highways -->
   <group name="Water" icon="presets/waterway.png">
     <group name="Water" icon="presets/waterway.png">
         <item name="Drain" icon="presets/waterway.png" type="way" preset_name_label="true">
@@ -1668,9 +1757,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=drain" />
             <space />
             <key key="waterway" value="drain" />
-            <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>
+            <reference ref="name" />
+            <reference ref="layer" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=ditch"
@@ -1679,9 +1768,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=ditch" />
             <space />
             <key key="waterway" value="ditch" />
-            <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>
+            <reference ref="name_layer" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=stream"
@@ -1695,16 +1783,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=stream" />
             <space />
             <key key="waterway" value="stream" />
-            <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>
+            <reference ref="name_layer" />
+        </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" />
             <space />
             <key key="waterway" value="wadi" />
-            <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>
+            <reference ref="name_layer" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
@@ -1716,8 +1802,8 @@
             <space />
             <key key="waterway" value="canal" />
             <reference ref="name_wikipedia" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item>
+            <reference ref="layer" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
@@ -1730,8 +1816,8 @@
             <space />
             <key key="waterway" value="river" />
             <reference ref="name_wikipedia" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-        </item>
+            <reference ref="layer" />
+        </item> <!-- River -->
         <separator/>
         <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
@@ -1742,13 +1828,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
             <space />
             <key key="natural" value="spring" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Spring -->
         <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=weir"
@@ -1759,8 +1845,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=weir" />
             <space />
             <key key="waterway" value="weir" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dam"
@@ -1772,14 +1858,14 @@
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=groyne"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=groyne"
                   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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=breakwater"
@@ -1788,9 +1874,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=breakwater" />
             <space />
             <key key="man_made" value="breakwater" />
-            <text key="ref" text="Reference" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="ref" />
+            <reference ref="name" />
+        </item> <!-- Breakwater -->
         <separator/>
         <item name="Culvert" icon="presets/tunnel.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tunnel=culvert"
@@ -1801,18 +1887,18 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tunnel=culvert" />
             <key key="tunnel" value="culvert" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="-1" length="3" />
-                <text key="width" text="Width (meters)" />
-                <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <reference ref="width" />
+                <reference ref="incline" />
             </optional>
-        </item>
+        </item> <!-- Culvert -->
         <separator/>
         <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="basin" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=reservoir"
@@ -1821,13 +1907,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=reservoir" />
             <space />
             <key key="landuse" value="reservoir" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Reservoir -->
         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="man_made" value="reservoir_covered" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Covered Reservoir -->
         <separator/>
         <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
@@ -1839,14 +1925,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
             <space />
             <key key="natural" value="water" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river" match="key" values_searchable="true" />
-        </item>
+        </item> <!-- Water -->
         <item name="Land" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="land" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Land -->
         <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=coastline"
@@ -1857,8 +1943,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=coastline" />
             <space />
             <key key="natural" value="coastline" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Coastline -->
         <item name="Riverbank" icon="presets/waterway.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank"
@@ -1872,8 +1958,8 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:waterway=riverbank" />
             <space />
             <key key="waterway" value="riverbank" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Riverbank -->
         <separator/>
         <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
@@ -1888,14 +1974,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wetland" />
             <space />
             <key key="natural" value="wetland" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
-        </item>
+        </item> <!-- Wetland -->
         <item name="Mud" icon="presets/mud.png" type="node,closedway,relation" preset_name_label="true">
             <key key="natural" value="mud" />
             <space />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Mud -->
         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
@@ -1905,13 +1991,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=beach" />
             <space />
             <key key="natural" value="beach" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Beach -->
         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="bay" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Bay -->
         <item name="Cliff" icon="presets/cliff.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=cliff"
@@ -1921,8 +2007,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cliff" />
             <space />
             <key key="natural" value="cliff" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Cliff -->
       </group> <!-- Water -->
     <group name="Shipping" icon="presets/ferry.png">
         <item name="Ferry Terminal" icon="presets/ferry.png" type="node,closedway" preset_name_label="true">
@@ -1935,9 +2021,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=ferry_terminal" />
             <space />
             <key key="amenity" value="ferry_terminal" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:route=ferry"
@@ -1946,15 +2032,15 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:route=ferry" />
             <key key="route" value="ferry" />
             <optional>
-              <text key="name" text="Name" />
+              <reference ref="name" />
             </optional>
-        </item>
+        </item> <!-- Ferry Route -->
         <separator/>
         <item name="Marina" icon="presets/marina.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="marina" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pier"
@@ -1965,8 +2051,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pier" />
             <space />
             <key key="man_made" value="pier" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=lock_gate"
@@ -1976,12 +2062,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=lock_gate"
                   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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
@@ -1992,9 +2078,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=slipway" />
             <key key="leisure" value="slipway" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=boatyard"
@@ -2003,8 +2089,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=boatyard" />
             <space />
             <key key="waterway" value="boatyard" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=dock"
@@ -2012,10 +2098,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=dock" />
             <space />
             <key key="waterway" value="dock" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Dock -->
     </group> <!-- Shipping -->
-  </group>
+  </group> <!-- Water -->
   <group name="Transport" icon="presets/railway.png">
     <group name="Railway" icon="presets/railway.png">
         <item name="Rail" icon="presets/railway.png" type="way" preset_name_label="true">
@@ -2033,7 +2119,7 @@
                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
                 <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" />
             <key key="railway" value="narrow_gauge" />
@@ -2041,7 +2127,7 @@
                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=monorail"
@@ -2052,7 +2138,7 @@
                 <reference ref="railway_service" />
                 <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=preserved"
@@ -2061,14 +2147,14 @@
             <optional>
                 <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" />
             <key key="railway" value="light_rail" />
             <optional>
                 <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"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway"
@@ -2078,7 +2164,7 @@
             <optional>
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram"
@@ -2090,7 +2176,7 @@
             <optional>
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_guideway"
@@ -2098,14 +2184,14 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=bus_guideway" />
             <key key="highway" value="bus_guideway" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <reference ref="highway_yesno_incline_oneway" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <reference ref="surface" />
-                <text key="maxspeed" text="Max. speed (km/h)" />
-                <text key="width" text="Width (meters)" />
+                <reference ref="maxspeed" />
+                <reference ref="width" />
             </optional>
-        </item>
+        </item> <!-- Bus Guideway -->
         <separator/>
         <item name="Disused Rail" icon="presets/railway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
@@ -2114,7 +2200,7 @@
             <optional>
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned"
@@ -2123,7 +2209,7 @@
             <optional>
                 <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing"
@@ -2144,7 +2230,7 @@
                 <check key="crossing:bell" text="Sound signals" />
                 <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"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Key:crossing"
@@ -2163,24 +2249,24 @@
                 <check key="crossing:bell" text="Sound signals" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=turntable"
                   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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=switch" />
             <key key="railway" value="switch" />
-            <text key="ref" text="Reference" />
-        </item>
+            <reference ref="ref" />
+        </item> <!-- Railway Switch -->
     </group> <!-- Railway -->
     <group name="Aerialway" icon="presets/aerialway.png">
         <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
@@ -2190,23 +2276,23 @@
             <key key="aerialway" value="chair_lift" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
+                <reference ref="aerialway_capacity" />
                 <text key="aerialway:occupancy" text="Number of people per chair" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:bubble" text="Has bubble?" />
-                <check key="aerialway:heating" text="Has heating?" />
+                <reference ref="aerialway_duration" />
+                <reference ref="aerialway_bubble" />
+                <reference ref="aerialway_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" />
             <space />
             <key key="aerialway" value="drag_lift" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=cable_car"
@@ -2218,12 +2304,12 @@
             <key key="aerialway" value="cable_car" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
+                <reference ref="aerialway_capacity" />
                 <text key="aerialway:occupancy" text="Number of people per car" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:heating" text="Has heating?" />
+                <reference ref="aerialway_duration" />
+                <reference ref="aerialway_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/Proposed_features/Piste_Maps"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
@@ -2233,25 +2319,25 @@
             <key key="aerialway" value="gondola" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
+                <reference ref="aerialway_capacity" />
                 <text key="aerialway:occupancy" text="Number of people per gondola" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:heating" text="Has heating?" />
+                <reference ref="aerialway_duration" />
+                <reference ref="aerialway_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" />
             <space />
             <key key="aerialway" value="mixed_lift" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
+                <reference ref="aerialway_capacity" />
                 <text key="aerialway:occupancy" text="Number of people per gondola/chair" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:bubble" text="Has bubble?" />
-                <check key="aerialway:heating" text="Has heating?" />
+                <reference ref="aerialway_duration" />
+                <reference ref="aerialway_bubble" />
+                <reference ref="aerialway_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/Proposed_features/Piste_Maps#aerialway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
@@ -2261,71 +2347,71 @@
             <key key="aerialway" value="t-bar" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </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/Proposed_features/Piste_Maps#aerialway" />
             <space />
             <key key="aerialway" value="j-bar" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </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/Proposed_features/Piste_Maps#aerialway" />
             <space />
             <key key="aerialway" value="platter" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
-        </item>
+        </item> <!-- Platter Lift -->
         <item name="Rope Tow" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <space />
             <key key="aerialway" value="rope_tow" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
-        </item>
+        </item> <!-- Rope Tow -->
         <item name="Magic Carpet" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <space />
             <key key="aerialway" value="magic_carpet" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_capacity" />
+                <reference ref="aerialway_duration" />
             </optional>
-        </item>
+        </item> <!-- Magic Carpet -->
         <item name="Goods" icon="presets/goods.png" type="way" preset_name_label="true">
             <space />
             <key key="aerialway" value="goods" />
             <reference ref="name_ref" />
             <optional>
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <reference ref="aerialway_duration" />
             </optional>
-        </item>
+        </item> <!-- Goods -->
         <separator/>
         <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <space />
             <key key="aerialway" value="station" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Station -->
         <item name="Pylon" icon="presets/power_tower.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
             <space />
             <key key="aerialway" value="pylon" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Pylon -->
     </group> <!-- Aerialway -->
     <separator/>
     <group name="Car" icon="presets/car.png">
@@ -2354,7 +2440,7 @@
             <space />
             <reference ref="stay" />
             <reference ref="supervised_lit_oh" />
-        </item>
+        </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"
@@ -2365,12 +2451,12 @@
             <space />
             <key key="amenity" value="parking_space" />
             <reference ref="parking_name_type_ref" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="capacity" />
             <reference ref="parking_access_fee_operator_surface" />
             <reference ref="stay" />
             <reference ref="supervised_lit_oh" />
             <check key="covered" text="Covered (with roof)" />
-        </item>
+        </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"
@@ -2384,7 +2470,7 @@
             <reference ref="parking_access_fee_operator_surface" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
@@ -2403,9 +2489,7 @@
             <key key="amenity" value="fuel" />
             <combo key="brand" text="Brand" values="Agip,Aral,Avia,BP,Chevron,Citgo,Esso,Exxon,Gulf,Mobil,OMV,Petro-Canada,Pioneer,Q8,Repsol,Shell,Sunoco,Statoil,Tamoil,Texaco,Total,Independent" values_searchable="true" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
-                <reference ref="oh" />
+                <reference ref="name_operator_oh" />
                 <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
                 <label text="Fuel types:" />
                 <checkgroup columns="2">
@@ -2427,7 +2511,7 @@
                     <check key="fuel:1_50" text="1/50 mix (mofa/moped)" />
                 </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=charging_station"
@@ -2438,12 +2522,12 @@
             <reference ref="name_operator" />
             <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">
             <space />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car"
@@ -2459,13 +2543,13 @@
             <key key="shop" value="car" />
             <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">
             <space />
             <key key="shop" value="car_repair" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_parts"
@@ -2474,13 +2558,13 @@
             <key key="shop" value="car_parts" />
             <reference ref="name_brand_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Parts -->
         <item name="Tyres" icon="presets/tyres.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="shop" value="tyres" />
             <reference ref="name_brand_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Tyres -->
         <separator/>
         <item name="Rental" icon="presets/car_rental.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
@@ -2495,7 +2579,7 @@
             <reference ref="name_brand_operator_oh" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_sharing"
@@ -2506,21 +2590,21 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=car_sharing" />
             <space />
             <key key="amenity" value="car_sharing" />
-            <text key="operator" text="Operator" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="operator" />
+            <reference ref="capacity" />
             <reference ref="name_oh" />
-            <text key="website" text="Website" />
-        </item>
+            <reference ref="website" />
+        </item> <!-- Sharing -->
     </group> <!-- Car -->
     <group name="Motorcycle" icon="presets/motorbike.png">
         <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="motorcycle_parking" />
-            <text key="name" text="Name" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="name" />
+            <reference ref="capacity" />
             <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-            <combo key="fee" text="Fee" values="yes,no" />
-        </item>
+            <reference ref="fee" />
+        </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"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=motorcycle"
@@ -2529,10 +2613,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=motorcycle" />
             <space />
             <key key="shop" value="motorcycle" />
-            <text key="name" text="Name" />
-            <combo key="brand" text="Brand" values="independent" />
-            <text key="operator" text="Operator" />
-            <reference ref="oh" />
+            <reference ref="name_brand_operator_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <optional text="Services:">
                 <combo key="sale" text="Sale" values="yes,brand,no" />
@@ -2544,7 +2625,7 @@
                 <text key="services" text="Other" />
             </optional>
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Motorcycle Dealer -->
     </group> <!-- Motorcycle -->
     <group name="Bicycle" icon="presets/bike.png">
         <item name="Parking" icon="styles/standard/vehicle/parking/bicycle.png" type="node,way,closedway" preset_name_label="true">
@@ -2561,11 +2642,11 @@
             <space />
             <key key="amenity" value="bicycle_parking" />
             <reference ref="name_operator" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="capacity" />
             <combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bicycle"
@@ -2578,7 +2659,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=bicycle" />
             <space />
             <key key="shop" value="bicycle" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="service:bicycle:retail" text="Bicycles are sold" />
             <check key="service:bicycle:second_hand" text="Second-hand bicycles are sold" />
             <check key="service:bicycle:repair" text="Bicycles are repaired" />
@@ -2587,7 +2668,7 @@
             <check key="service:bicycle:diy" text="Tools for do-it-yourself repair (may be a bike co-operative)" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_rental"
@@ -2602,9 +2683,9 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=bicycle_rental" />
             <space />
             <key key="amenity" value="bicycle_rental" />
-            <text key="name" text="Name" />
+            <reference ref="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">
@@ -2618,9 +2699,9 @@
                 <text key="from" text="From (initial stop)" />
                 <text key="to" text="To (terminal stop)" />
                 <text key="via" text="Via (intermediate stops)" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
-                <text key="description" text="Description" />
+                <reference ref="operator" />
+                <reference ref="network" />
+                <reference ref="description" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             </optional>
             <roles>
@@ -2632,7 +2713,7 @@
                 <role key="platform_exit_only" text="platform (exit only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
                 <role key="platform_entry_only" text="platform (entry only)" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
             </roles>
-        </item>
+        </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 />
@@ -2640,45 +2721,45 @@
             <combo key="route_master" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" />
             <reference ref="name_ref" />
             <optional>
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
+                <reference ref="operator" />
+                <reference ref="network" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             </optional>
             <roles>
                 <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" />
             <space />
             <key key="type" value="public_transport" />
             <key key="public_transport" value="stop_area" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <text key="uic_ref" text="UIC reference" />
                 <text key="uic_name" text="UIC name" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
+                <reference ref="operator" />
+                <reference ref="network" />
             </optional>
             <roles>
                 <role key="stop" text="Stop Position" requisite="optional" type="node" member_expression="public_transport=stop_position" />
                 <role key="platform" text="Platform" requisite="optional" type="node,way,closedway" member_expression="public_transport=platform" />
                 <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">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
             <space />
             <key key="public_transport" value="stop_position" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <text key="uic_ref" text="UIC reference" />
                 <text key="uic_name" text="UIC name" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
+                <reference ref="operator" />
+                <reference ref="network" />
             </optional>
             <check key="bus" text="Bus" />
             <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)" />
@@ -2694,22 +2775,22 @@
             <check key="funicular" text="Funicular" />
             <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" />
             <space />
             <key key="public_transport" value="platform" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="bench" text="Bench" />
             <check key="shelter" text="Shelter" />
             <check key="covered" text="Covered" />
             <combo key="wheelchair" text="Wheelchair" values="yes,no,limited,only" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <text key="uic_ref" text="UIC reference" />
                 <text key="uic_name" text="UIC name" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
+                <reference ref="operator" />
+                <reference ref="network" />
                 <space/>
                 <check key="bus" text="Bus" />
                 <check key="highway" value_on="platform" text="Highway platform (legacy)" />
@@ -2724,7 +2805,7 @@
                 <check key="aerialway" text="aerialway" />
                 <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:public_transport=station"
@@ -2732,12 +2813,12 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:public_transport=station" />
             <space />
             <key key="public_transport" value="station" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="area" text="Area" disable_off="true" />
             <check key="building" text="Building" disable_off="true" />
-            <text key="operator" text="Operator" />
-            <text key="network" text="Network" />
-        </item>
+            <reference ref="operator" />
+            <reference ref="network" />
+        </item> <!-- Station -->
         <separator/>
         <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"
@@ -2746,11 +2827,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:railway=subway_entrance" />
             <key key="railway" value="subway_entrance" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <check key="wheelchair" text="Wheelchair" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
@@ -2762,10 +2843,10 @@
             <key key="amenity" value="vending_machine" />
             <key key="vending" value="public_transport_tickets" />
             <reference ref="name_operator" />
-            <text key="ref" text="Reference Number" />
+            <reference ref="ref_number" />
             <reference ref="payment_account" />
-        </item>
-    </group>
+        </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" />
@@ -2776,9 +2857,9 @@
                 <text key="from" text="From (initial stop)" />
                 <text key="to" text="To (terminal stop)" />
                 <text key="via" text="Via (intermediate stops)" />
-                <text key="operator" text="Operator" />
-                <text key="network" text="Network" />
-                <text key="description" text="Description" />
+                <reference ref="operator" />
+                <reference ref="network" />
+                <reference ref="description" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
             </optional>
             <roles>
@@ -2790,7 +2871,7 @@
                 <role key="backward_stop" text="backward halt point" requisite="optional" type="node" member_expression="highway=bus_stop OR railway=station OR railway=halt OR railway=tram_stop" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station"
@@ -2801,10 +2882,10 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=station" />
             <key key="railway" value="station" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=halt"
@@ -2812,18 +2893,18 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:railway=halt" />
             <key key="railway" value="halt" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:railway=tram_stop" />
             <key key="railway" value="tram_stop" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform"
@@ -2831,9 +2912,9 @@
             <space />
             <key key="railway" value="platform" />
             <text key="ref" text="Reference (track number)" />
-            <text key="width" text="Width (meters)" />
+            <reference ref="width" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
@@ -2843,9 +2924,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bus_station" />
             <key key="amenity" value="bus_station" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
@@ -2858,20 +2939,20 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:highway=bus_stop" />
             <key key="highway" value="bus_stop" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
                 <combo key="shelter" text="Shelter" values="yes,no" />
                 <combo key="bench" text="Bench" values="yes,no" />
                 <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">
             <space />
             <key key="highway" value="platform" />
             <text key="ref" text="Reference (track number)" />
-            <text key="width" text="Width (meters)" />
+            <reference ref="width" />
             <check key="area" text="Area" />
-        </item>
-    </group> <!-- Public Transport -->
+        </item> <!-- Bus Platform -->
+    </group> <!-- Public Transport (legacy) -->
     <item name="Taxi" icon="presets/taxi.png" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=taxi"
@@ -2883,8 +2964,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=taxi" />
         <space />
         <key key="amenity" value="taxi" />
-        <text key="name" text="Name" />
-    </item>
+        <reference ref="name" />
+    </item> <!-- Taxi -->
     <separator/>
     <group name="Airport" icon="presets/plane.png">
         <item name="Airport Ground" icon="presets/plane.png" type="node,closedway" preset_name_label="true">
@@ -2893,13 +2974,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=aerodrome" />
             <space />
             <key key="aeroway" value="aerodrome" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
                 <text key="iata" text="IATA" />
                 <text key="icao" text="ICAO" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia" />
             </optional>
-        </item>
+        </item> <!-- Airport Ground -->
         <separator/>
         <item name="Runway" icon="presets/runway.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway"
@@ -2909,9 +2990,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=runway" />
             <key key="aeroway" value="runway" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
             </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"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=taxiway"
@@ -2919,9 +3000,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=taxiway" />
             <key key="aeroway" value="taxiway" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=helipad"
@@ -2931,34 +3012,34 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=helipad" />
             <key key="aeroway" value="helipad" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
             </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"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:aeroway=apron"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=apron"
                   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"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:aeroway=hangar"
                   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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
                   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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=windsock"
                   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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal"
@@ -2968,21 +3049,20 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=terminal" />
             <space />
             <key key="aeroway" value="terminal" />
-            <text key="name" text="Name" />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <reference ref="name" />
+            <reference ref="internet" />
             <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=gate"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=gate" />
             <space />
             <key key="aeroway" value="gate" />
-            <text key="ref" text="Reference" />
-        </item>
-    </group> <!-- Aeroway -->
-  </group>
+            <reference ref="ref" />
+        </item> <!-- Gate -->
+    </group> <!-- Airport -->
+  </group> <!-- Transport -->
   <group name="Facilities" icon="presets/bed.png">
     <group name="Accommodation" icon="presets/bed.png">
         <item name="Hotel" icon="presets/bed.png" type="node,closedway" preset_name_label="true">
@@ -2997,12 +3077,12 @@
             <space />
             <key key="tourism" value="hotel" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=motel"
@@ -3013,12 +3093,12 @@
             <space />
             <key key="tourism" value="motel" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Motel -->
         <item name="Guest House" 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"
@@ -3028,12 +3108,12 @@
             <space />
             <key key="tourism" value="guest_house" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Guest House -->
         <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=chalet"
@@ -3044,12 +3124,12 @@
             <space />
             <key key="tourism" value="chalet" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
@@ -3061,12 +3141,12 @@
             <space />
             <key key="tourism" value="hostel" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=alpine_hut"
@@ -3077,12 +3157,12 @@
             <space />
             <key key="tourism" value="alpine_hut" />
             <reference ref="name_operator" />
-            <text key="ele" text="Elevation" />
+            <reference ref="elevation" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Alpine Hut -->
         <separator/>
         <item name="Caravan Site" icon="presets/caravan2.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
@@ -3092,17 +3172,17 @@
             <space />
             <key key="tourism" value="caravan_site" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
-            <text key="capacity" text="Number of places" />
+            <reference ref="capacity" />
             <combo key="fee" text="Requires a fee" values="yes,no,interval" />
             <check key="power_supply" text="Power supply" />
             <check key="tents" text="Tents allowed" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Caravan Site -->
         <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=camp_site"
@@ -3115,13 +3195,13 @@
             <space />
             <key key="tourism" value="camp_site" />
             <reference ref="name_operator" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
-    </group> <!-- Accomodation -->
+        </item> <!-- Camping Site -->
+    </group> <!-- Accommodation -->
     <group name="Food+Drinks" icon="presets/restaurant.png">
         <item name="Restaurant" icon="presets/restaurant.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant"
@@ -3137,12 +3217,12 @@
             <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;sushi" values_searchable="true" />
             <check key="microbrewery" text="Microbrewery" />
             <reference ref="oh" />
-            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
+            <reference ref="stars" />
             <space />
             <reference ref="internet_smoking_wheelchair" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fast_food"
@@ -3158,7 +3238,7 @@
             <reference ref="internet_smoking_wheelchair" />
             <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"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=food_court"
@@ -3171,7 +3251,7 @@
             <reference ref="internet_smoking_wheelchair" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cafe"
@@ -3191,7 +3271,7 @@
             <reference ref="internet_smoking_wheelchair" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pub"
@@ -3207,7 +3287,7 @@
             <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Pub -->
         <item name="Biergarten" 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"
@@ -3223,7 +3303,7 @@
             <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Biergarten -->
         <item name="Bar" icon="presets/bar.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
@@ -3240,7 +3320,7 @@
             <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Bar -->
         <item name="Nightclub" 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"
@@ -3255,11 +3335,10 @@
             <key key="amenity" value="nightclub" />
             <reference ref="name_operator_oh" />
             <space />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Nightclub -->
         <item name="Stripclub" 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"
@@ -3273,14 +3352,14 @@
             <reference ref="internet_smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Stripclub -->
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/sightseeing.png">
         <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway" preset_name_label="true">
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=viewpoint"
@@ -3291,9 +3370,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=viewpoint" />
             <space />
             <key key="tourism" value="viewpoint" />
-            <text key="name" text="Name" />
+            <reference ref="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">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
@@ -3306,19 +3385,18 @@
             <key key="tourism" value="information" />
             <key key="information" value="office" />
             <reference ref="name_oh" />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
+            <reference ref="internet" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Information Office -->
         <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="map" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="map_type" text="Detail Grade" values="topo,street,scheme,toposcope" />
             <combo key="map_size" text="Shown Area" values="site,city,region" />
-            <text key="description" text="Closer Description" />
+            <reference ref="closer_description" />
             <optional text="Routes shown for:">
                 <check key="hiking" text="Hiking" />
                 <check key="bicycle" text="Cycling" />
@@ -3328,7 +3406,7 @@
                 <space />
                 <label text="... other transportation modes possible" />
             </optional>
-        </item>
+        </item> <!-- Map -->
         <item name="Information Board" icon="presets/board.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=board"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Proposed_features/information"
@@ -3336,10 +3414,10 @@
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="board" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="board_type" text="Board Content" values="notice,history,nature,wildlife,plants" />
-            <text key="description" text="Closer Description" />
-        </item>
+            <reference ref="closer_description" />
+        </item> <!-- Information Board -->
         <item name="Guidepost" icon="presets/guidepost.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:information=guidepost"
@@ -3348,8 +3426,8 @@
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="guidepost" />
-            <text key="name" text="Name" />
-            <text key="ele" text="Elevation" />
+            <reference ref="name" />
+            <reference ref="elevation" />
             <optional text="Routes shown for:">
                 <check key="hiking" text="Hiking" />
                 <check key="bicycle" text="Cycling" />
@@ -3359,34 +3437,31 @@
                 <space />
                 <label text="... other transportation modes possible" />
             </optional>
-        </item>
+        </item> <!-- Guidepost -->
         <item name="Information Terminal" icon="presets/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="terminal" />
-            <text key="name" text="Name" />
-            <text key="description" text="Closer description" />
-            <text key="operator" text="Operator" />
-            <text key="ref" text="Reference number" />
-            <combo key="fee" text="Fee" values="yes,no" />
-            <combo key="internet_access" text="Internet access" values="yes,wlan,wired,terminal,no" />
-            <combo key="internet_access:fee" text="Internet access fee" values="yes,no" />
-        </item>
+            <reference ref="name_operator" />
+            <reference ref="closer_description" />
+            <reference ref="ref_number" />
+            <reference ref="fee" />
+            <reference ref="internet" />
+        </item> <!-- Information Terminal -->
         <item name="Audioguide" icon="presets/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
             <space />
             <key key="tourism" value="information" />
             <key key="information" value="audioguide" />
-            <text key="name" text="Name" />
-            <text key="description" text="Closer description" />
-            <text key="operator" text="Operator" />
-            <text key="ref" text="Reference number" />
-            <combo key="fee" text="Fee" values="yes,no" />
+            <reference ref="name_operator" />
+            <reference ref="closer_description" />
+            <reference ref="ref_number" />
+            <reference ref="fee" />
             <space />
             <label text="Audioguide via mobile phone?" />
             <text key="phone" text="Phone number" />
-        </item>
+        </item> <!-- Audioguide -->
         <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=information"
@@ -3397,9 +3472,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:tourism=information" />
             <space />
             <key key="tourism" value="information" />
-            <text key="name" text="Name" />
-            <text key="description" text="Closer Description" />
-        </item>
+            <reference ref="name" />
+            <reference ref="closer_description" />
+        </item> <!-- Other Information Point -->
     </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">
@@ -3414,7 +3489,7 @@
             <key key="amenity" value="cinema" />
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- 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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=zoo"
@@ -3424,10 +3499,10 @@
             <space />
             <key key="tourism" value="zoo" />
             <reference ref="name_oh" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia" />
             <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:leisure=dog_park"
@@ -3440,12 +3515,12 @@
                   sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:leisure=dog_park" />
             <space />
             <key key="leisure" value="dog_park" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <check key="area" text="Area" />
             <combo key="barrier" text="Barrier" values="fence,wall" />
             <reference ref="oh" />
-            <check key="lit" text="Lit" />
-        </item>
+            <reference ref="lit_yesno" />
+        </item> <!-- Dog Park -->
         <item name="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"
@@ -3456,7 +3531,7 @@
             <reference ref="name_operator_oh" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- 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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=water_park"
@@ -3470,7 +3545,7 @@
             <reference ref="name_operator_oh" />
             <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"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=sauna"
@@ -3478,13 +3553,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=sauna" />
             <space />
             <key key="leisure" value="sauna" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <reference ref="oh" />
+            <reference ref="name_operator_oh" />
             <combo key="access" text="Access" values="yes,permissive,private,unknown" />
             <space />
             <reference ref="contact" />
-        </item>
+        </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 />
@@ -3493,7 +3566,7 @@
             <text key="fee" text="Fee" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=brothel"
@@ -3506,11 +3579,10 @@
             <key key="amenity" value="brothel" />
             <reference ref="name_operator_oh" />
             <space />
-            <combo key="smoking" text="Smoking" values="yes,dedicated,separated,isolated,no" />
-            <combo key="wheelchair" text="Wheelchairs" values="yes,no" />
+            <reference ref="smoking_wheelchair" />
             <space />
             <reference ref="contact" />
-        </item>
+        </item> <!-- Brothel -->
         <separator/>
         <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground"
@@ -3525,14 +3597,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=playground" />
             <space />
             <key key="leisure" value="playground" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Playground -->
         <item name="Picnic Site" icon="presets/picnic.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="tourism" value="picnic_site" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bbq"
@@ -3541,10 +3613,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=bbq" />
             <space />
             <key key="amenity" value="bbq" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <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"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fishing"
@@ -3552,12 +3624,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=fishing" />
             <space />
             <key key="leisure" value="fishing" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Fishing -->
         <item name="Private Swimming Pool" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
             <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">
         <item name="Museum" icon="presets/State_Public.png" type="node,closedway" preset_name_label="true">
@@ -3570,9 +3642,9 @@
             <space />
             <key key="tourism" value="museum" />
             <reference ref="name_operator_oh" />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=theatre"
@@ -3584,7 +3656,7 @@
             <key key="amenity" value="theatre" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library"
@@ -3598,7 +3670,7 @@
             <key key="amenity" value="library" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=arts_centre"
@@ -3607,9 +3679,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=arts_centre" />
             <space />
             <key key="amenity" value="arts_centre" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=artwork"
@@ -3622,9 +3694,9 @@
             <space />
             <key key="tourism" value="artwork" />
             <combo key="artwork_type" text="Type" values="mural,sculpture,statue" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=studio"
@@ -3635,7 +3707,7 @@
             <reference ref="name_operator" />
             <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">
         <item name="Church" icon="styles/standard/religion/church.png" type="node,closedway,relation" preset_name_label="true">
@@ -3655,12 +3727,12 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="christian" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist" values_context="christian" values_searchable="true" />
             <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3678,12 +3750,12 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="muslim" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="building" text="Building type" values="mosque" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
             <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3701,12 +3773,12 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="jewish" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="building" text="Building type" values="synagogue" values_searchable="true" />
             <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_context="jewish" values_searchable="true" />
             <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3724,11 +3796,11 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="buddhist" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
             <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3746,11 +3818,11 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="hindu" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
             <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3768,10 +3840,10 @@
             <space />
             <key key="amenity" value="place_of_worship" />
             <key key="religion" value="shinto" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -3788,11 +3860,11 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=place_of_worship" />
             <space />
             <key key="amenity" value="place_of_worship" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue" values_searchable="true" />
             <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">
         <item name="Public Building" icon="styles/standard/service.png" type="node,closedway,relation" preset_name_label="true">
@@ -3802,8 +3874,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=public_building" />
             <space />
             <key key="amenity" value="public_building" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
@@ -3814,9 +3886,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=townhall" />
             <space />
             <key key="amenity" value="townhall" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=community_centre"
@@ -3829,7 +3901,7 @@
             <key key="amenity" value="community_centre" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=embassy"
@@ -3839,9 +3911,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=embassy" />
             <space />
             <key key="amenity" value="embassy" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=courthouse"
@@ -3851,9 +3923,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=courthouse" />
             <space />
             <key key="amenity" value="courthouse" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=prison"
@@ -3863,9 +3935,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=prison" />
             <space />
             <key key="amenity" value="prison" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=police"
@@ -3877,9 +3949,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=police" />
             <space />
             <key key="amenity" value="police" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fire_station"
@@ -3891,8 +3963,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=fire_station" />
             <space />
             <key key="amenity" value="fire_station" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_office"
@@ -3906,15 +3978,15 @@
             <space />
             <key key="amenity" value="post_office" />
             <reference ref="name_operator" />
-        </item>
+        </item> <!-- Post Office -->
     </group> <!-- Public Buildings -->
     <group name="Education" icon="presets/school.png">
         <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="amenity" value="kindergarten" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:amenity=school"
@@ -3928,9 +4000,9 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=school" />
             <space />
             <key key="amenity" value="school" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=university"
@@ -3943,9 +4015,9 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:amenity=university" />
             <space />
             <key key="amenity" value="university" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=college"
@@ -3955,17 +4027,17 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=college" />
             <space />
             <key key="amenity" value="college" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
-        </item>
-         <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway" preset_name_label="true">
+        </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/Proposed_features/driving_school" />
             <space />
             <key key="amenity" value="driving_school" />
             <reference ref="name_operator" />
             <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">
         <item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway" preset_name_label="true">
@@ -3981,15 +4053,15 @@
             <key key="amenity" value="hospital" />
             <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"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=clinic" />
             <space />
             <key key="amenity" value="clinic" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Clinic -->
         <item name="Doctors" 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"
@@ -4000,19 +4072,19 @@
             <key key="amenity" value="doctors" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Doctors -->
         <item name="Dentist" icon="styles/standard/health/dentist.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="dentist" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Dentist -->
         <item name="Nursing Home" type="node,closedway" preset_name_label="true">
             <space />
             <key key="amenity" value="nursing_home" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:social_facility"
@@ -4024,9 +4096,9 @@
             <key key="social_facility" value="group_home" />
             <key key="social_facility:for" value="senior" />
             <reference ref="name_operator" />
-            <text key="capacity" text="Capacity" />
+            <reference ref="capacity" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Retirement Home -->
         <separator/>
         <item name="Pharmacy" icon="presets/pharmacy.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy"
@@ -4039,11 +4111,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=pharmacy" />
             <space />
             <key key="amenity" value="pharmacy" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="dispensing" text="Dispensing" values="yes,no" default="no" />
             <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids"
@@ -4052,7 +4124,7 @@
             <key key="shop" value="hearing_aids" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch"
@@ -4067,9 +4139,9 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=baby_hatch" />
             <space />
             <key key="amenity" value="baby_hatch" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <reference ref="oh" />
-        </item>
+        </item> <!-- Baby Hatch -->
         <separator/>
         <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
@@ -4081,11 +4153,11 @@
             <key key="highway" value="emergency_access_point" />
             <text key="ref" text="Point Number" />
             <text key="name" text="Point Name" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <text key="phone" text="Phone Number" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
@@ -4101,7 +4173,7 @@
             <key key="amenity" value="veterinary" />
             <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">
@@ -4119,13 +4191,13 @@
             <combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
             <combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
             <optional>
-                <text key="description" text="Description" />
-                <combo key="fee" text="Fee" values="yes,no" />
-                <text key="operator" text="Operator" />
+                <reference ref="description" />
+                <reference ref="fee" />
+                <reference ref="operator" />
                 <combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
                 <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
             </optional>
-        </item>
+        </item> <!-- Toilets -->
         <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_box"
@@ -4135,11 +4207,11 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=post_box" />
             <space />
             <key key="amenity" value="post_box" />
-            <text key="operator" text="Operator" />
-            <text key="ref" text="Reference number" />
+            <reference ref="operator" />
+            <reference ref="ref_number" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=telephone"
@@ -4150,17 +4222,17 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=telephone" />
             <space />
             <key key="amenity" value="telephone" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
                   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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:internet_access"
@@ -4171,7 +4243,7 @@
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=defibrillator"
@@ -4181,7 +4253,7 @@
             <space />
             <key key="emergency" value="defibrillator" />
             <reference ref="oh" />
-            <text  key="operator" text="Operator" />
+            <reference ref="operator" />
             <check key="indoor" text="Located inside a building?" />
             <!-- lastcheck is in use for aed devices, but not yet well discussed or documented
             <optional>
@@ -4189,7 +4261,7 @@
                 <text key="lastcheck:note" text="Last check note" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock"
@@ -4206,7 +4278,7 @@
                 <check key="barometer" text="Shows barometric pressure" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=recycling"
@@ -4228,7 +4300,7 @@
             <check key="recycling:paper" text="Paper" />
             <check key="recycling:scrap_metal" text="Scrap Metal" />
             <combo key="recycling_type" text="Type" values="container,centre" />
-        </item>
+        </item> <!-- Recycling -->
         <item name="Waste Basket" 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"
@@ -4239,7 +4311,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=waste_basket"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_basket" />
             <key key="amenity" value="waste_basket" />
-        </item>
+        </item> <!-- Waste Basket -->
         <item name="Waste Disposal" 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"
@@ -4248,7 +4320,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=waste_disposal"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=waste_disposal" />
             <key key="amenity" value="waste_disposal" />
-        </item>
+        </item> <!-- Waste Disposal -->
         <separator/>
         <item name="Bench" icon="presets/bench.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
@@ -4269,14 +4341,14 @@
             <combo key="material" text="Material" values="stone,metal,wood,plastic" />
             <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">
             <space />
             <key key="amenity" value="shelter" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <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">
             <space />
             <key key="amenity" value="hunting_stand" />
@@ -4284,7 +4356,7 @@
             <combo key="shelter" text="Shelter" values="yes,no,unknown" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
@@ -4299,10 +4371,10 @@
             <key key="amenity" value="drinking_water" />
             <check key="indoor" text="Indoor" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="description" text="Description" />
+                <reference ref="name" />
+                <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant"
@@ -4318,12 +4390,12 @@
             <combo key="fire_hydrant:diameter" text="Diameter (in mm)" values="50,80,100,150,200,250,300,400" />
             <space />
             <reference ref="name_ref" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <space />
             <combo key="fire_hydrant:position" text="Hydrant Position" values="lane,parking_lot,sidewalk,green" values_context="hydrant position" />
             <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 -->
   <group name="Sports" icon="presets/soccer.png">
@@ -4331,169 +4403,167 @@
         <item name="Stadium" icon="presets/stadium.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="stadium" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional text="Select sport:">
-                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+                <reference ref="sport" />
             </optional>
-        </item>
+        </item> <!-- Stadium -->
         <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="sports_centre" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional text="Select sport:">
-                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+                <reference ref="sport" />
             </optional>
-        </item>
+        </item> <!-- Sports Centre -->
         <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="leisure" value="pitch" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional text="Select sport:">
-                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+                <reference ref="sport" />
             </optional>
-        </item>
+        </item> <!-- Pitch -->
         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="track" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional text="Select sport:">
-                <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,boules,bowls,canadian_football,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,gaelic_games,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby_league,rugby_union,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" values_context="sport" />
+                <reference ref="sport" />
             </optional>
-        </item>
+        </item> <!-- Racetrack -->
         <item name="Golf Course" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
             <space />
             <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">
             <space />
             <key key="leisure" value="miniature_golf" />
             <reference ref="name_oh" />
-        </item>
+        </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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi" />
             <space />
             <key key="sport" value="multi" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
-        </item>
+        </item> <!-- Multi -->
         <item name="9pin" 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" />
             <space />
             <key key="sport" value="9pin" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
+        </item> <!-- 9pin -->
         <item name="10pin" icon="styles/standard/sport/10pin.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin" />
             <space />
             <key key="sport" value="10pin" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
+        </item> <!-- 10pin -->
         <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"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=archery" />
             <space />
             <key key="sport" value="archery" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
+        </item> <!-- Archery -->
         <item name="Athletics" icon="presets/athletics.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
             <space />
             <key key="sport" value="athletics" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
-        </item>
+        </item> <!-- 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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:sport=climbing" />
             <space />
             <key key="sport" value="climbing" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="sports_centre" />
-        </item>
+        </item> <!-- Climbing -->
         <item name="Canoeing" 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>
+            <reference ref="name" />
+        </item> <!-- Canoeing -->
         <item name="Cycling" icon="presets/cycling.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <space />
             <key key="sport" value="cycling" />
-            <text key="name" text="Name" />
+            <reference ref="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" />
             <space />
             <key key="sport" value="dog_racing" />
-            <text key="name" text="Name" />
+            <reference ref="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" />
             <space />
             <key key="sport" value="equestrian" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
-            <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
-        </item>
+            <reference ref="name" />
+            <reference ref="riding_surface" />
+        </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" />
             <space />
             <key key="sport" value="horse_racing" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
-            <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
-        </item>
+            <reference ref="name" />
+            <reference ref="riding_surface" />
+        </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" />
             <space />
             <key key="sport" value="gymnastics" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
+        </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"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skating" />
             <space />
             <key key="sport" value="skating" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
             <space />
             <key key="sport" value="skateboard" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
             <space />
             <key key="sport" value="swimming" />
-            <text key="name" text="Name" />
+            <reference ref="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" />
             <space />
             <key key="sport" value="skiing" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=shooting"
@@ -4502,9 +4572,9 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=shooting" />
             <space />
             <key key="sport" value="shooting" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
+        </item> <!-- Shooting -->
     </group> <!-- Sport -->
     <group name="Sport (Ball)" icon="presets/soccer.png">
         <item name="Soccer" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
@@ -4515,25 +4585,25 @@
             <space />
             <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" />
             <space />
             <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" />
             <space />
             <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" />
             <space />
             <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" />
             <space />
@@ -4545,47 +4615,47 @@
                 <check key="gaelic_games:camogie" text="Camogie" />
                 <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league" />
             <space />
             <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union" />
             <space />
             <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" />
             <space />
             <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" />
             <space />
             <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" />
             <space />
             <key key="sport" value="volleyball" />
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
-        </item>
+        </item> <!-- Volleyball -->
         <item name="Beachvolleyball" icon="presets/beachvolleyball.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
             <space />
             <key key="sport" value="beachvolleyball" />
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
-        </item>
+        </item> <!-- Beachvolleyball -->
         <item name="Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"
@@ -4593,114 +4663,114 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:sport=golf" />
             <space />
             <key key="sport" value="golf" />
-            <text key="name" text="Name" />
+            <reference ref="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" />
             <space />
             <key key="sport" value="boules" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Boule -->
         <item name="Bowls" 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> <!-- Bowls -->
         <item name="Cricket" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
             <space />
             <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" />
             <space />
             <key key="sport" value="cricket_nets" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
+        </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" />
             <space />
             <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" />
             <space />
             <key key="sport" value="hockey" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota" />
             <space />
             <key key="sport" value="pelota" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Pelota -->
         <item name="Racquet" 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" />
             <space />
             <key key="sport" value="racquet" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
+        </item> <!-- Racquet -->
         <item name="Table Tennis" icon="presets/table_tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
             <space />
             <key key="sport" value="table_tennis" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
-        </item>
+            <reference ref="name" />
+            <reference ref="name_leisure_type" />
+        </item> <!-- Table Tennis -->
         <item name="Tennis" icon="presets/tennis.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
             <space />
             <key key="sport" value="tennis" />
             <reference ref="name_leisure_pitch" />
-        </item>
+        </item> <!-- Tennis -->
     </group> <!-- Sport (Ball) -->
     <group name="Motorsport" icon="presets/motorbike.png">
         <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="motor" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
-        </item>
+        </item> <!-- Motorsport -->
         <item name="Karting" icon="presets/karting.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="karting" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
-        </item>
+        </item> <!-- Karting -->
         <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="sport" value="motocross" />
-            <text key="name" text="Name" />
+            <reference ref="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">
             <space />
             <key key="sport" value="safety_training" />
-            <text key="name" text="Name" />
+            <reference ref="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">
             <space />
             <key key="sport" value="model_aerodrome" />
-            <text key="name" text="Name" />
+            <reference ref="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">
             <space />
             <key key="sport" value="rc_car" />
-            <text key="name" text="Name" />
+            <reference ref="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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=raceway"
@@ -4709,8 +4779,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:highway=raceway" />
             <space />
             <key key="highway" value="raceway" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Raceway -->
     </group> <!-- Motorsport -->
   </group> <!-- Sports -->
   <group name="Man Made" icon="presets/works.png">
@@ -4731,8 +4801,8 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <space />
             <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>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building"
@@ -4745,8 +4815,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building" />
             <space />
             <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>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:entrance"
@@ -4762,36 +4832,36 @@
                 <text key="ref" text="Entrance number" />
                 <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">
             <space />
             <key key="man_made" value="tower" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="tower:type" text="Tower type" values="communication,observation" />
             <optional>
-                <text key="height" text="Height (meters)" />
-                <text key="operator" text="Operator" />
+                <reference ref="height" />
+                <reference ref="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"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=flagpole"
                   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">
             <space />
             <key key="man_made" value="works" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Works -->
         <item name="Chimney" icon="presets/chimney.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Chimney" />
             <space />
             <key key="man_made" value="chimney" />
             <reference ref="name_operator" />
-            <text key="height" text="Height (meters)" />
-        </item>
+            <reference ref="height" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=windmill"
@@ -4801,13 +4871,13 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=windmill" />
             <space />
             <key key="man_made" value="windmill" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Windmill -->
         <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="gasometer" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"
@@ -4815,10 +4885,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=pipeline" />
             <space />
             <key key="man_made" value="pipeline" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=crane"
@@ -4827,8 +4897,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=crane" />
             <space />
             <key key="man_made" value="crane" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=mineshaft"
@@ -4837,14 +4907,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=mineshaft" />
             <space />
             <key key="man_made" value="mineshaft" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="mineshaft_type" text="Function" values="winding,air" />
             <text key="depth" text="Depth in meters" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <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" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=adit"
@@ -4855,18 +4925,18 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=adit" />
             <space />
             <key key="man_made" value="adit" />
-            <text key="name" text="Name" />
-            <text key="length" text="Length in meters" />
-            <text key="operator" text="Operator" />
+            <reference ref="name" />
+            <reference ref="length" />
+            <reference ref="operator" />
             <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 -->
         <separator/>
         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="man_made" value="water_tower" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_works"
@@ -4876,7 +4946,7 @@
             <space />
             <key key="man_made" value="water_works" />
             <reference ref="name_operator" />
-        </item>
+        </item> <!-- Water Works -->
         <item name="Wastewater 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"
@@ -4887,8 +4957,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=wastewater_plant" />
             <space />
             <key key="man_made" value="wastewater_plant" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Wastewater 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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=watermill"
@@ -4898,8 +4968,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=watermill" />
             <space />
             <key key="man_made" value="watermill" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fountain"
@@ -4912,8 +4982,8 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=fountain" />
             <space />
             <key key="amenity" value="fountain" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_well"
@@ -4924,8 +4994,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_well" />
             <space />
             <key key="man_made" value="water_well" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Water Well -->
         <separator/>
         <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse"
@@ -4935,16 +5005,16 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=lighthouse" />
             <space />
             <key key="man_made" value="lighthouse" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
             <space />
             <key key="man_made" value="beacon" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=street_lamp"
@@ -4953,7 +5023,7 @@
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=monitoring_station"
@@ -4987,7 +5057,7 @@
                 <check key="display:analog" text="Analog" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
@@ -4995,8 +5065,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=survey_point" />
             <space />
             <key key="man_made" value="survey_point" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=surveillance"
@@ -5009,10 +5079,9 @@
             <key key="surveillance:type" value="camera" />
             <combo key="surveillance" text="Type" values="indoor,outdoor,public" />
             <combo key="surveillance:zone" text="Zone" values="town,parking,traffic,shop,bank,building" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="ref" text="Reference" />
+                <reference ref="name_ref" />
             </optional>
             <space />
             <label text="Camera" />
@@ -5022,9 +5091,9 @@
             <optional>
                 <text key="camera:direction" text="Direction in degrees" match="key" />
                 <text key="camera:angle" text="Inclination in degrees" match="key" />
-                <text key="height" text="Height in meter (m)" />
+                <reference ref="height" />
             </optional>
-        </item>
+        </item> <!-- Surveillance Camera -->
     </group> <!-- Man Made -->
     <group name="Power" icon="presets/power.png">
         <item name="Power Plant" icon="icons/power_station.png" type="closedway,relation" preset_name_label="true">
@@ -5049,7 +5118,7 @@
                 <space />
                 <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">
                 <key key="generator:source" value="biofuel" />
@@ -5057,14 +5126,14 @@
                 <key key="generator:method" value="combustion" />
                 <combo key="generator:type" text="Generator Type" values="gas_turbine,reciprocating_engine,steam_generator" />
                 <reference ref="power_output" />
-            </item>
+            </item> <!-- Biofuel 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" />
                 <reference ref="power_generator" />
                 <key key="generator:method" value="combustion" />
                 <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" />
                 <reference ref="power_generator" />
@@ -5076,42 +5145,42 @@
                     <list_entry value="steam_turbine" short_description="combustion" />
                 </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" />
                 <reference ref="power_generator" />
                 <key key="generator:method" value="combustion" />
                 <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" />
                 <reference ref="power_generator" />
                 <key key="generator:method" value="combustion" />
                 <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" />
                 <reference ref="power_generator" />
                 <key key="generator:method" value="combustion" />
                 <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" />
                 <reference ref="power_generator" />
                 <key key="generator:method" value="combustion" />
                 <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" />
                 <reference ref="power_generator" />
                 <key key="generator:method" value="combustion" />
                 <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" />
                 <reference ref="power_generator" />
@@ -5136,7 +5205,7 @@
                     <list_entry value="VVER" display_value="Vodo-Vodyanoi Energetichesky Reactor (VVER)" short_description="fission" />
                 </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" />
                 <reference ref="power_generator" />
@@ -5147,7 +5216,7 @@
                     <list_entry value="steam_turbine" short_description="thermal" />
                 </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" />
                 <reference ref="power_generator" />
@@ -5160,7 +5229,7 @@
                 </combo>
                 <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" />
                 <reference ref="power_generator" />
@@ -5172,7 +5241,7 @@
                     <list_entry value="pelton_turbine" short_description="run-of-the-river / water-storage" />
                 </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" />
                 <reference ref="power_generator" />
@@ -5183,31 +5252,31 @@
                     <list_entry value="vertical_axis" short_description="steam" />
                 </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" />
                 <reference ref="power_generator" />
                 <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" />
                 <reference ref="power_generator" />
                 <key key="generator:method" value="wind_turbine" />
                 <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
@@ -5217,7 +5286,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=substation" />
             <space />
             <key key="power" value="substation" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="substation" text="Type of substation" values="transmission,distribution,minor_distribution,converter,compensation,transition,traction,industrial" values_context="power" />
             <reference ref="power_extra" />
             <optional>
@@ -5225,7 +5294,7 @@
                 <text key="start_date" text="Start date" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=transformer"
@@ -5241,7 +5310,7 @@
                 <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -5257,7 +5326,7 @@
             <optional>
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -5268,7 +5337,7 @@
             <key key="power" value="line" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -5279,12 +5348,12 @@
             <key key="power" value="line" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter"
@@ -5301,7 +5370,7 @@
                 <combo key="poles" text="Amount of poles" values="monopole,bipole" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -5316,7 +5385,7 @@
             <optional>
                 <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
@@ -5326,7 +5395,7 @@
             <key key="power" value="cable_distribution_cabinet" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
@@ -5340,7 +5409,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=tower" />
             <space />
             <key key="power" value="tower" />
-            <text key="height" text="Height in meter (m)" />
+            <reference ref="height" />
             <combo key="structure" text="Type of construction" values="lattice,tubular,solid " />
             <combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
@@ -5352,7 +5421,7 @@
                 <check key="triple_tower" text="Triple tower" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
@@ -5364,10 +5433,10 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:power=pole" />
             <space />
             <key key="power" value="pole" />
-            <text key="height" text="Height in meter (m)" />
+            <reference ref="height" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
@@ -5384,10 +5453,10 @@
             <optional>
                 <reference ref="cable_circuit" />
                 <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
@@ -5399,10 +5468,10 @@
             <optional>
                 <reference ref="cable_circuit" />
                 <combo key="location" text="Location" values="underground,underwater,overground" />
-                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+                <reference ref="layer" />
                 <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">
         <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway" preset_name_label="true">
@@ -5414,12 +5483,12 @@
             <space />
             <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">
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
@@ -5429,7 +5498,7 @@
             <space />
             <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:historic=battlefield"
@@ -5439,20 +5508,20 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=battlefield" />
             <space />
             <key key="historic" value="battlefield" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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" />
             <space />
             <key key="geological" value="palaeontological_site" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Palaeontological Site -->
         <separator/>
         <item name="Monument" icon="presets/monument.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="monument" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=memorial"
@@ -5463,25 +5532,25 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:historic=memorial" />
             <space />
             <key key="historic" value="memorial" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Memorial -->
         <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="wayside_cross" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Wayside Cross -->
         <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="wayside_shrine" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Wayside Shrine -->
         <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="historic" value="boundary_stone" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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">
         <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway" preset_name_label="true">
@@ -5496,7 +5565,7 @@
             <key key="shop" value="supermarket" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=convenience"
@@ -5509,7 +5578,7 @@
             <key key="shop" value="convenience" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kiosk"
@@ -5521,7 +5590,7 @@
             <key key="shop" value="kiosk" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery"
@@ -5537,7 +5606,7 @@
             <key key="shop" value="bakery" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=butcher"
@@ -5551,7 +5620,7 @@
             <key key="shop" value="butcher" />
             <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"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=seafood"
@@ -5561,7 +5630,7 @@
             <key key="shop" value="seafood" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=deli"
@@ -5573,7 +5642,7 @@
             <key key="shop" value="deli" />
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Deli (Fine Food) -->
         <item name="Confectionery" 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"
@@ -5587,21 +5656,21 @@
             <key key="shop" value="confectionery" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Confectionery -->
         <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" />
             <space />
             <key key="shop" value="tea" />
             <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" />
             <space />
             <key key="shop" value="coffee" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
@@ -5615,9 +5684,9 @@
             <space />
             <key key="amenity" value="marketplace" />
             <reference ref="name_operator_oh" />
-            <text key="website" text="Website" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
-        </item>
+            <reference ref="website" />
+            <reference ref="organic" />
+        </item> <!-- Marketplace -->
         <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=greengrocer"
@@ -5627,9 +5696,9 @@
             <space />
             <key key="shop" value="greengrocer" />
             <reference ref="name_oh" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="organic" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
@@ -5639,22 +5708,22 @@
             <space />
             <key key="shop" value="farm" />
             <reference ref="name_oh" />
-            <text key="description" text="Description" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="description" />
+            <reference ref="organic" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Farm Stand -->
         <separator/>
         <item name="Organic" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:organic"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Key:organic" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
@@ -5667,7 +5736,7 @@
             <key key="shop" value="alcohol" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beverages"
@@ -5678,7 +5747,7 @@
             <key key="shop" value="beverages" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Beverages -->
     </group> <!-- Food -->
     <group name="Clothes" icon="styles/standard/shop/clothes.png">
         <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway" preset_name_label="true">
@@ -5693,9 +5762,9 @@
             <key key="shop" value="clothes" />
             <reference ref="name_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="organic" />
             <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=boutique"
@@ -5706,7 +5775,7 @@
             <key key="shop" value="boutique" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=shoes"
@@ -5716,9 +5785,9 @@
             <key key="shop" value="shoes" />
             <reference ref="name_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <reference ref="organic" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
@@ -5729,7 +5798,7 @@
             <key key="shop" value="outdoor" />
             <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=sports"
@@ -5738,7 +5807,7 @@
             <key key="shop" value="sports" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning"
@@ -5750,7 +5819,7 @@
             <key key="shop" value="dry_cleaning" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=laundry"
@@ -5760,13 +5829,13 @@
             <key key="shop" value="laundry" />
             <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">
             <space />
             <key key="shop" value="tailor" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=fabric"
@@ -5776,7 +5845,7 @@
             <key key="shop" value="fabric" />
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Fabric -->
     </group> <!-- Clothes -->
     <group name="Electronic" icon="styles/standard/shop/electronics.png">
         <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway" preset_name_label="true">
@@ -5789,7 +5858,7 @@
             <key key="shop" value="computer" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=electronics"
@@ -5799,7 +5868,7 @@
             <key key="shop" value="electronics" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Electronics -->
         <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=mobile_phone"
@@ -5808,7 +5877,7 @@
             <key key="shop" value="mobile_phone" />
             <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner"
@@ -5817,7 +5886,7 @@
             <key key="shop" value="vacuum_cleaner" />
             <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"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=hifi"
@@ -5827,7 +5896,7 @@
             <key key="shop" value="hifi" />
             <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=video"
@@ -5837,14 +5906,14 @@
             <key key="shop" value="video" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </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 />
             <key key="shop" value="video_games" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Video games -->
     </group> <!-- Electronic -->
     <group name="Cash" icon="presets/dollar.png">
         <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway" preset_name_label="true">
@@ -5863,7 +5932,7 @@
             <reference ref="name_brand_operator_oh" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bureau_de_change"
@@ -5875,7 +5944,7 @@
             <key key="amenity" value="bureau_de_change" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=atm"
@@ -5891,10 +5960,10 @@
             <space />
             <key key="amenity" value="atm" />
             <text key="brand" text="Brand" />
-            <text key="operator" text="Operator" />
+            <reference ref="operator" />
             <reference ref="oh" />
-        </item>
-        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway" preset_name_label="true">
+        </item> <!-- Automated Teller Machine -->
+        <item name="PawnbrokerPawnbroker" icon="presets/pawnbroker.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=pawnbroker"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=pawnbroker" />
@@ -5902,7 +5971,7 @@
             <key key="shop" value="pawnbroker" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Furniture -->
     </group> <!-- Cash -->
     <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg">	
         <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway" preset_name_label="true">
@@ -5910,7 +5979,7 @@
             <key key="shop" value="furniture" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kitchen"
@@ -5922,7 +5991,7 @@
             <key key="shop" value="kitchen" />
             <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=curtain"
@@ -5931,7 +6000,7 @@
             <key key="shop" value="curtain" />
             <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=frame"
@@ -5941,7 +6010,7 @@
             <key key="shop" value="frame" />
             <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"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=bed"
@@ -5952,7 +6021,7 @@
             <key key="shop" value="bed" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </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"
@@ -5961,10 +6030,10 @@
             <key key="shop" value="interior_decoration" />
             <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">
+        <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"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=stationery"
@@ -5973,7 +6042,7 @@
             <space />
             <key key="shop" value="stationery" />
             <reference ref="name_oh" />
-        </item>
+        </item> <!-- Stationery -->
         <item name="Copyshop" 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"
@@ -5983,7 +6052,7 @@
             <space />
             <key key="shop" value="copyshop" />
             <reference ref="name_operator_oh" />
-        </item>
+        </item> <!-- Copyshop -->
         <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=books"
@@ -5995,7 +6064,7 @@
             <key key="shop" value="books" />
             <reference ref="name_brand_oh" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
-        </item>
+        </item> <!-- Book Store -->
         <item name="Newsagent's shop" 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"
@@ -6006,7 +6075,7 @@
             <space />
             <key key="shop" value="newsagent" />
             <reference ref="name_oh" />
-        </item>
+        </item> <!-- Newsagent's shop -->
         <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"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=ticket" />
@@ -6014,7 +6083,7 @@
             <key key="shop" value="ticket" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </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">
@@ -6028,7 +6097,7 @@
             <key key="shop" value="department_store" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mall"
@@ -6039,7 +6108,7 @@
             <key key="shop" value="mall" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
@@ -6051,7 +6120,7 @@
             <key key="shop" value="chemist" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Chemist -->
         <item name="Hairdresser" 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"
@@ -6063,7 +6132,7 @@
             <key key="shop" value="hairdresser" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Hairdresser -->
         <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
@@ -6074,7 +6143,7 @@
             <key key="shop" value="beauty" />
             <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=optician"
@@ -6083,7 +6152,7 @@
             <key key="shop" value="optician" />
             <reference ref="name_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Optician -->
         <item name="Jewelry" 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"
@@ -6092,7 +6161,7 @@
             <key key="shop" value="jewelry" />
             <reference ref="name_operator_oh" />
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Jewelry -->
         <item name="Gift" 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"
@@ -6108,7 +6177,7 @@
                 <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
             </optional>
             <reference ref="link_contact" />
-        </item>
+        </item> <!-- Gift -->
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"
@@ -6117,7 +6186,7 @@
             <key key="shop" value="erotic" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist"
@@ -6130,7 +6199,7 @@
             <key key="shop" value="florist" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=garden_centre"
@@ -6143,7 +6212,7 @@
             <key key="shop" value="garden_centre" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
@@ -6156,7 +6225,7 @@
             <key key="shop" value="doityourself" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hardware"
@@ -6167,7 +6236,7 @@
             <key key="shop" value="hardware" />
             <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"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=paint"
@@ -6177,7 +6246,7 @@
             <key key="shop" value="paint" />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=travel_agency"
@@ -6186,7 +6255,7 @@
             <space />
             <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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=musical_instrument"
@@ -6194,7 +6263,7 @@
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=toys"
@@ -6204,7 +6273,7 @@
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=variety_store"
@@ -6215,20 +6284,20 @@
             <space />
             <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" />
             <space />
             <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"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=lottery" />
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bag"
@@ -6237,7 +6306,7 @@
             <key key="shop" value="bag" />
             <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"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=pet"
@@ -6248,7 +6317,7 @@
             <key key="shop" value="pet" />
             <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">
@@ -6259,19 +6328,19 @@
         <space />
         <key key="amenity" value="vending_machine" />
         <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;news_papers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM-cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
-        <text key="operator" text="Operator" />
-        <text key="ref" text="Reference number" />
+        <reference ref="operator" />
+        <reference ref="ref_number" />
         <text key="note" text="Note" />
         <reference ref="payment_account" />
-    </item>
+    </item> <!-- Vending machine -->
   </group> <!-- Shops -->
   <group name="Geography" icon="presets/peak.svg">
     <group name="Boundaries" icon="presets/boundaries.png">
         <item name="National" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="boundary" value="national" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=administrative"
@@ -6282,22 +6351,22 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:boundary=administrative" />
             <space />
             <key key="boundary" value="administrative" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=political" />
             <space />
             <key key="boundary" value="political" />
             <combo key="political_division" text="Division" values="canton,linguistic_community,ward" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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" />
             <space />
             <key key="boundary" value="postal_code" />
             <text key="postal_code" text="Postal Code" />
-        </item>
+        </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"
@@ -6305,43 +6374,43 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:boundary=national_park" />
             <space />
             <key key="boundary" value="national_park" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- National park -->
     </group> <!-- Boundaries -->
     <group name="Places" icon="presets/places.png">
         <item name="Continent" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <space />
             <key key="place" value="continent" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Continent -->
         <item name="Country" icon="presets/places.png" type="node,closedway" preset_name_label="true">
             <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">
             <space />
             <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">
             <space />
             <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">
             <space />
             <key key="place" value="county" />
             <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">
             <space />
             <key key="place" value="city" />
             <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"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=town"
@@ -6354,7 +6423,7 @@
             <key key="place" value="town" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
@@ -6366,25 +6435,25 @@
             <key key="place" value="suburb" />
             <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">
             <space />
             <key key="place" value="village" />
             <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">
             <space />
             <key key="place" value="hamlet" />
             <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">
             <space />
             <key key="place" value="isolated_dwelling" />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
@@ -6396,8 +6465,8 @@
             <key key="place" value="neighbourhood" />
             <reference ref="name_wikipedia" />
             <text key="population" text="Population" />
-            <text key="website" text="Website" />
-        </item>
+            <reference ref="website" />
+        </item> <!-- Neighbourhood -->
         <separator/>
         <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality"
@@ -6409,7 +6478,7 @@
             <space />
             <key key="place" value="locality" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Locality -->
     </group> <!-- Places -->
     <group name="Geography" icon="presets/peak.svg">
         <item name="Peak" icon="presets/peak.svg" type="node" preset_name_label="true">
@@ -6420,9 +6489,8 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:natural=peak" />
             <space />
             <key key="natural" value="peak" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
-        </item>
+            <reference ref="name_wikipedia_elevation" />
+        </item> <!-- Peak -->
         <item name="Saddle" icon="presets/saddle.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=saddle"
@@ -6430,9 +6498,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
             <space/>
             <key key="natural" value="saddle" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
-        </item>
+            <reference ref="name_wikipedia_elevation" />
+        </item> <!-- Saddle -->
         <item name="Glacier" icon="presets/glacier.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=glacier"
@@ -6440,9 +6507,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
             <space />
             <key key="natural" value="glacier" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
-        </item>
+            <reference ref="name_wikipedia_elevation" />
+        </item> <!-- Glacier -->
         <item name="Volcano" icon="presets/volcano.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=volcano"
@@ -6451,9 +6517,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=volcano" />
             <space />
             <key key="natural" value="volcano" />
-            <reference ref="name_wikipedia" />
-            <text key="ele" text="Elevation" />
-        </item>
+            <reference ref="name_wikipedia_elevation" />
+        </item> <!-- Volcano -->
         <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=cave_entrance"
@@ -6462,7 +6527,7 @@
             <space />
             <key key="natural" value="cave_entrance" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Cave Entrance -->
         <separator/>
         <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island"
@@ -6473,7 +6538,7 @@
             <space />
             <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"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=islet"
@@ -6482,7 +6547,7 @@
             <space />
             <key key="place" value="islet" />
             <reference ref="name_wikipedia" />
-        </item>
+        </item> <!-- Islet -->
     </group> <!-- Geography -->
     <group name="Nature" icon="presets/tree.png">
         <item name="Tree" icon="presets/tree.png" type="node" preset_name_label="true">
@@ -6497,16 +6562,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree" />
             <space />
             <key key="natural" value="tree" />
-            <text key="name" text="Name" />
-            <text key="height" text="Height in meter (m)" />
+            <reference ref="name" />
+            <reference ref="height" />
             <text key="name:botanical" text="Botanical Name" />
             <optional>
-                <text key="genus" text="Genus" />
-                <text key="species" text="Species" />
-                <text key="taxon" text="Taxon" />
+                <reference ref="genus_species_taxon" />
                 <reference ref="leaf" />
             </optional>
-        </item>
+        </item> <!-- Tree -->
         <item name="Tree Row" icon="presets/tree.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree_row"
@@ -6520,7 +6583,7 @@
             <optional>
                 <reference ref="leaf" />
             </optional>
-        </item>
+        </item> <!-- Tree Row -->
         <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
@@ -6530,9 +6593,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
             <space />
             <key key="natural" value="wood" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="leaf" />
-        </item>
+        </item> <!-- Wood -->
         <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest"
@@ -6543,9 +6606,9 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=forest" />
             <space />
             <key key="landuse" value="forest" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <reference ref="leaf" />
-        </item>
+        </item> <!-- Forest -->
         <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
@@ -6557,20 +6620,20 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=grassland" />
             <space />
             <key key="natural" value="grassland" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <combo key="grassland" text="Type" values="pampas,prairie,puszta,savanna,steppe,veld" />
-        </item>
+        </item> <!-- Grassland -->
         <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="nature_reserve" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Nature Reserve -->
         <separator/>
         <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="scree" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Scree -->
         <item name="Fell" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=fell"
@@ -6579,13 +6642,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
             <space />
             <key key="natural" value="fell" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Fell -->
         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="natural" value="scrub" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Scrub -->
         <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=heath"
@@ -6595,16 +6658,16 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
             <space />
             <key key="natural" value="heath" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Heath -->
         <item name="Sand" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=sand"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=sand" />
             <space />
             <key key="natural" value="sand" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Sand -->
     </group> <!-- Nature -->
     <group name="Land use" icon="presets/landuse.png">
         <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
@@ -6616,18 +6679,18 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=farmyard" />
             <space />
             <key key="landuse" value="farmyard" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Farmyard -->
         <item name="Farmland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="farmland" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Farmland -->
         <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="meadow" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=orchard"
@@ -6637,13 +6700,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=orchard" />
             <space />
             <key key="landuse" value="orchard" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Orchard -->
         <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="vineyard" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=greenhouse_horticulture"
@@ -6652,9 +6715,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=greenhouse_horticulture" />
             <space />
             <key key="landuse" value="greenhouse_horticulture" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-        </item>
+            <reference ref="name_operator" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=plant_nursery"
@@ -6664,27 +6726,25 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=plant_nursery" />
             <space />
             <key key="landuse" value="plant_nursery" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-            <text key="genus" text="Genus" />
-            <text key="species" text="Species" />
-        </item>
+            <reference ref="name_operator" />
+            <reference ref="genus_species" />
+        </item> <!-- Plant Nursery -->
         <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="allotments" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Allotments -->
         <separator/>
         <item name="Garden" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="garden" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Garden -->
         <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="grass" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=village_green"
@@ -6695,21 +6755,21 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=village_green" />
             <space />
             <key key="landuse" value="village_green" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=common"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:leisure=common" />
             <space />
             <key key="leisure" value="common" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Common -->
         <item name="Park" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <space />
             <key key="leisure" value="park" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=recreation_ground"
@@ -6719,14 +6779,14 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=recreation_ground" />
             <space />
             <key key="landuse" value="recreation_ground" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Recreation Ground -->
         <separator/>
         <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">
             <space />
             <key key="landuse" value="residential" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=grave_yard"
@@ -6739,7 +6799,7 @@
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=cemetery"
@@ -6754,7 +6814,7 @@
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=religious"
@@ -6763,7 +6823,7 @@
             <space />
             <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=retail"
@@ -6773,8 +6833,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=retail" />
             <space />
             <key key="landuse" value="retail" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=commercial"
@@ -6784,8 +6844,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=commercial" />
             <space />
             <key key="landuse" value="commercial" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=industrial"
@@ -6796,8 +6856,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=industrial" />
             <space />
             <key key="landuse" value="industrial" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=garages"
@@ -6807,9 +6867,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=garages" />
             <space />
             <key key="landuse" value="garages" />
-            <text key="name" text="Name" />
-            <text key="operator" text="Operator" />
-        </item>
+            <reference ref="name_operator" />
+        </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"
@@ -6819,8 +6878,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=railway" />
             <space />
             <key key="landuse" value="railway" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=military"
@@ -6829,8 +6888,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=military" />
             <space />
             <key key="landuse" value="military" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </item> <!-- Military -->
         <separator/>
         <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"
@@ -6841,8 +6900,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=construction" />
             <space />
             <key key="landuse" value="construction" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=brownfield"
@@ -6852,8 +6911,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=brownfield" />
             <space />
             <key key="landuse" value="brownfield" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=greenfield"
@@ -6862,8 +6921,8 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:landuse=greenfield" />
             <space />
             <key key="landuse" value="greenfield" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=landfill"
@@ -6873,8 +6932,8 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:landuse=landfill" />
             <space />
             <key key="landuse" value="landfill" />
-            <text key="name" text="Name" />
-        </item>
+            <reference ref="name" />
+        </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=quarry"
@@ -6885,9 +6944,9 @@
             <space />
             <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">
             <link href="http://wiki.openstreetmap.org/wiki/Key:name"
@@ -6908,7 +6967,7 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:name"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:name" />
             <space />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
                 <text key="alt_name" text="Alternative name" match="key" />
                 <text key="old_name" text="Historical name" match="key" />
@@ -6919,7 +6978,7 @@
                 <text key="official_name" text="Official name" match="key" />
                 <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"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:addr"
@@ -6944,7 +7003,7 @@
                 <text key="addr:postcode" text="Post code" use_last_as_default="force" match="key" />
                 <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"
                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
@@ -6963,7 +7022,7 @@
             <optional>
                 <combo key="addr:inclusion" text="Accuracy" values="actual,estimate,potential" match="key" />
             </optional>
-        </item>
+        </item> <!-- Address Interpolation -->
         <item name="Contact (common schema)" icon="presets/contact.png" type="node,way,closedway,relation" preset_name_label="true">
             <space />
             <text key="phone" text="Phone Number" match="key" />
@@ -6972,9 +7031,9 @@
             <text key="website" text="Website" match="key" />
             <text key="email" text="Email Address" match="key" />
             <space />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia" />
             <text key="image" text="Image" />
-        </item>
+        </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"
@@ -6991,9 +7050,9 @@
             <text key="contact:website" text="Website" match="key" />
             <text key="contact:email" text="Email Address" match="key" />
             <space />
-            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="wikipedia" />
             <text key="image" text="Image" />
-        </item>
+        </item> <!-- Contact (schema with 'contact:*' prefix) -->
     </group> <!-- Annotation -->
     <group name="Relations" icon="presets/relations.png">
         <item name="Multipolygon" icon="presets/multipolygon.png" type="relation" preset_name_label="true">
@@ -7008,13 +7067,13 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:multipolygon" />
             <key key="type" value="multipolygon" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
             </optional>
             <roles>
                 <role key="outer" text="outer segment" requisite="required" type="way" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
@@ -7025,7 +7084,7 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:boundary" />
             <space />
             <key key="type" value="boundary" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
                 <combo key="boundary" text="Boundary type" values="administrative,national,civil,political" values_searchable="true" />
                 <combo key="admin_level" text="Administrative level" values="1,2,3,4,5,6,7,8,9,10" />
@@ -7037,7 +7096,7 @@
                 <role key="admin_centre" text="Administration centre" requisite="optional" type="node" count="1" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:site"
@@ -7052,7 +7111,7 @@
                 <role key="entrance" text="entrances to the site, on the perimeter" requisite="optional" type="node" />
                 <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">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
@@ -7068,14 +7127,14 @@
             <key key="type" value="restriction" />
             <combo key="restriction" text="Restriction" values="no_left_turn,no_right_turn,no_straight_on,no_u_turn,only_right_turn,only_left_turn,only_straight_on" values_searchable="true" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name" />
             </optional>
             <roles>
                 <role key="from" text="from way" requisite="required" count="1" type="way" />
                 <role key="via" text="via node or ways" requisite="required" type="way,node" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:enforcement"
@@ -7096,9 +7155,8 @@
                 <role key="to" text="where enforcement ends" requisite="optional" type="node" />
                 <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">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
@@ -7115,8 +7173,7 @@
                 <roles>
                     <role key="" text="route segment" requisite="required" type="way"/>
                 </roles>
-            </item>
-
+            </item> <!-- Bicycle route -->
             <item name="MTB 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"
@@ -7136,8 +7193,7 @@
                 <roles>
                     <role key="" text="route segment" requisite="required" type="way" member_expression="highway=path OR highway=track"/>
                 </roles>
-            </item>
-
+            </item> <!-- MTB 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"
@@ -7159,8 +7215,7 @@
                     <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
                     <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> <!-- 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"/>
@@ -7181,8 +7236,7 @@
                     <role key="variant" text="variant segment" requisite="optional" type="way" />
                     <role key="start" text="entry points" requisite="optional" type="node" />
                 </roles>
-            </item>
-
+            </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"/>
@@ -7203,8 +7257,7 @@
                     <role key="variant" text="variant segment" requisite="optional" type="way" />
                     <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">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"
@@ -7221,7 +7274,7 @@
                     <role key="" text="route segment" requisite="required" type="way"/>
                     <role key="fork" text="fork node for alternative routes" requisite="optional" type="node"/>
                 </roles>
-            </item>
+            </item> <!-- Detour route -->
             <item name="Power route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <space/>
                 <key key="type" value="route"/>
@@ -7230,7 +7283,7 @@
                 <roles>
                     <role key="" text="route segment" requisite="required" type="way" member_expression="power"/>
                 </roles>
-            </item>
+            </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"
@@ -7243,7 +7296,7 @@
                 <roles>
                     <role key="" text="route segment" requisite="required" type="way" member_expression="railway"/>
                 </roles>
-            </item>
+            </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"
@@ -7252,8 +7305,8 @@
                 <key key="type" value="route"/>
                 <key key="route" value="road"/>
                 <reference ref="name_ref"/>
-                <text key="network" text="Network" />
-                <text key="operator" text="Operator" />
+                <reference ref="network" />
+                <reference ref="operator" />
                 <text key="distance" text="Distance (km)"/>
                 <roles>
                     <role key="" text="route segment" requisite="optional" type="way" member_expression="highway"/>
@@ -7261,23 +7314,21 @@
                     <role key="backward" text="backward segment" requisite="optional" type="way" member_expression="highway"/>
                     <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">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
             <space />
             <key key="type" value="network" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
-                <text key="network" text="Network" />
-                <text key="operator" text="Operator" />
+                <reference ref="network" />
+                <reference ref="operator" />
             </optional>
             <roles>
                 <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">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
@@ -7294,20 +7345,20 @@
                 <role key="street" text="street" requisite="required" type="way,closedway" member_expression="highway" />
                 <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"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:street" />
             <space />
             <key key="type" value="street" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <roles>
                 <role key="street" text="ways being part of street" requisite="required" type="way" />
                 <role key="address" text="addresses belonging to the street" requisite="optional" type="node,way,closedway" />
                 <role key="house" text="houses belonging to the street" requisite="optional" type="node,way,closedway" />
                 <role key="associated" text="anything related to the street" requisite="optional" type="node,way,closedway" />
             </roles>
-        </item>
+        </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"
@@ -7330,23 +7381,23 @@
                 <role key="to" text="first way after junction" requisite="required" count="1" type="node,way" />
                 <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">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Waterway" />
             <space />
             <key key="type" value="waterway" />
             <combo key="waterway" text="Subtype of waterway (largest one of members)" values="river,stream,canal,drain,ditch" values_searchable="true" />
-            <text key="name" text="Name" />
+            <reference ref="name" />
             <optional>
                 <text key="destination" text="Name of river/sea/ocean" />
-                <text key="ref" text="Reference" />
+                <reference ref="ref" />
                 <text key="ref:sandre" text="Reference Sandre (FR)" />
                 <text key="ref:fgkz" text="Reference FGKZ (DE)" />
                 <text key="ref:regine" text="Reference REGINE (NO)" />
                 <text key="ref:gnis" text="Reference GNIS (USA)" />
                 <text key="ref:gnbc" text="Reference GNBC (CA)" />
-                <text key="wikipedia" text="Wikipedia" />
+                <reference ref="wikipedia" />
             </optional>
             <roles>
                 <role key="" text="waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
@@ -7354,7 +7405,7 @@
                 <role key="side_stream" text="branch waterways (no riverbank)" requisite="optional" type="way" member_expression="waterway -waterway:riverbank" />
                 <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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relations/Proposed/Bridges_and_Tunnels"
@@ -7362,31 +7413,31 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Relations/Proposed/Bridges_and_Tunnels" />
             <space />
             <key key="type" value="bridge" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <reference ref="layer" />
             <reference ref="name_ref" />
-            <text key="height" text="Height (meters)" />
-            <text key="length" text="Length (meters)" />
-            <text key="operator" text="Operator" />
+            <reference ref="height" />
+            <reference ref="length" />
+            <reference ref="operator" />
             <roles>
                 <role key="across" text="ways supported by (on top of) the bridge" requisite="optional" type="way" />
                 <role key="under" text="ways passing under the bridge" requisite="optional" type="way" />
                 <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
                 <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" />
             <space />
             <key key="type" value="tunnel" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
+            <reference ref="layer" />
             <reference ref="name_ref" />
-            <text key="length" text="Length (meters)" />
-            <text key="operator" text="Operator" />
+            <reference ref="length" />
+            <reference ref="operator" />
             <roles>
                 <role key="through" text="ways passing through the tunnel" requisite="required" type="way" />
                 <role key="outline" text="way forming the outline footprint" requisite="optional" count="1" type="closedway,relation" />
                 <role key="edge" text="edge ways parallel to 'through'" requisite="optional" type="way" />
             </roles>
-        </item>
+        </item> <!-- Tunnel -->
     </group> <!-- Relations -->
 </presets>