Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16709)
+++ trunk/resources/data/defaultpresets.xml	(revision 16710)
@@ -265,4 +265,5 @@
         <text key="symbol" text="Symbol description"/>
         <text key="description" text="Description"/>
+        <text key="website" text="Website" />
     </chunk>
     <chunk id="genus_species_taxon">
@@ -503,6 +504,9 @@
     <text key="description" text="Description" />
     <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
-    <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
-    <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
+    <reference ref="oh" />
+    <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
+    <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
+    <reference ref="fee" />
+    <text key="website" text="Website" />
   </chunk>
   <chunk id="climbing_styles">
@@ -1863,8 +1867,9 @@
             <optional>
                 <reference ref="name_ref_operator" />
-                <reference ref="oh_wheelchair" />
+                <reference ref="wheelchair" />
                 <space />
-                <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
-                <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
+                <reference ref="oh" />
+                <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
+                <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
                 <reference ref="fee" />
                 <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
@@ -2117,4 +2122,8 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
                 <check key="aerialway:heating" text="Has heating?" />
+                <space />
+                <text key="operator" text="Operator" />
+                <reference ref="oh" />
+                <reference ref="fee" />
             </optional>
         </item> <!-- Cable Car -->
@@ -2130,4 +2139,8 @@
                 <check key="aerialway:bubble" text="Has bubble?" />
                 <check key="aerialway:heating" text="Has heating?" />
+                <space />
+                <text key="operator" text="Operator" />
+                <reference ref="oh" />
+                <reference ref="fee" />
             </optional>
         </item> <!-- Chair Lift -->
@@ -2142,4 +2155,8 @@
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
                 <check key="aerialway:heating" text="Has heating?" />
+                <space />
+                <text key="operator" text="Operator" />
+                <reference ref="oh" />
+                <reference ref="fee" />
             </optional>
         </item> <!-- Gondola -->
@@ -2155,4 +2172,8 @@
                 <check key="aerialway:bubble" text="Has bubble?" />
                 <check key="aerialway:heating" text="Has heating?" />
+                <space />
+                <text key="operator" text="Operator" />
+                <reference ref="oh" />
+                <reference ref="fee" />
             </optional>
         </item> <!-- Mixed Lift -->
@@ -2165,4 +2186,8 @@
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <space />
+                <text key="operator" text="Operator" />
+                <reference ref="oh" />
+                <reference ref="fee" />
             </optional>
         </item> <!-- Drag Lift -->
@@ -2175,4 +2200,8 @@
                 <text key="aerialway:capacity" text="Number of people per hour" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
+                <space />
+                <text key="operator" text="Operator" />
+                <reference ref="oh" />
+                <reference ref="fee" />
             </optional>
         </item> <!-- Magic Carpet -->
@@ -2181,6 +2210,6 @@
             <space />
             <key key="aerialway" value="goods" />
-            <reference ref="name_ref" />
-            <optional>
+            <optional>
+                <reference ref="name_ref_operator" />
                 <text key="aerialway:duration" text="Typical journey time in minutes" />
             </optional>
@@ -2203,5 +2232,5 @@
             <space />
             <key key="aerialway" value="station" />
-            <text key="name" text="Name" />
+            <reference ref="name_ref_operator" />
         </item> <!-- Station -->
         <item name="Pylon" icon="presets/transport/aerialway/pylon.svg" type="node" preset_name_label="true">
@@ -2209,5 +2238,5 @@
             <space />
             <key key="aerialway" value="pylon" />
-            <text key="name" text="Name" />
+            <reference ref="name_ref" />
         </item> <!-- Pylon -->
     </group> <!-- Aerialway -->
@@ -2530,4 +2559,5 @@
             <optional>
                 <reference ref="public_transport_route_optionals" />
+                <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
             </optional>
             <roles>
@@ -2552,4 +2582,5 @@
                 <text key="network" text="Network" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
+                <text key="website" text="Website" />
             </optional>
             <roles>
@@ -2592,15 +2623,17 @@
             </optional>
             <space />
-            <check key="bus" text="Bus" icon="presets/transport/bus.svg" />
-            <check key="tram" text="Tram" icon="presets/transport/railway/tram.svg" />
-            <check key="train" text="Train" icon="presets/transport/train.svg" />
-            <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" />
-            <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" />
-            <check key="subway" text="Subway" icon="presets/transport/railway/subway.svg" />
-            <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" />
-            <check key="monorail" text="Monorail" icon="presets/transport/railway/monorail.svg" />
-            <check key="funicular" text="Funicular" icon="presets/transport/railway/funicular.svg" />
-            <check key="aerialway" text="Aerialway" icon="presets/transport/aerialway/station.svg" />
-            <check key="ferry" text="Ferry" icon="presets/nautical/ferry.svg" />
+            <checkgroup columns="3">
+                <check key="bus"        text="Bus" icon="presets/transport/bus.svg" />
+                <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" />
+                <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" />
+                <check key="train"      text="Train" icon="presets/transport/train.svg" />
+                <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" />
+                <check key="subway"     text="Subway" icon="presets/transport/railway/subway.svg" />
+                <check key="tram"       text="Tram" icon="presets/transport/railway/tram.svg" />
+                <check key="monorail"   text="Monorail" icon="presets/transport/railway/monorail.svg" />
+                <check key="funicular"  text="Funicular" icon="presets/transport/railway/funicular.svg" />
+                <check key="aerialway"  text="Aerialway" icon="presets/transport/aerialway/station.svg" />
+                <check key="ferry"      text="Ferry" icon="presets/nautical/ferry.svg" />
+            </checkgroup>
         </item> <!-- Stop Position -->
         <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/transport/platform.svg" preset_name_label="true">
@@ -2662,4 +2695,8 @@
                 <text key="description" text="Description" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
+                <reference ref="oh" />
+                <reference ref="fee" />
+                <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
+                <text key="website" text="Website" />
             </optional>
             <roles>