Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml	(revision 18225)
+++ resources/data/defaultpresets.xml	(working copy)
@@ -46,22 +46,13 @@
             <check key="tunnel" text="Tunnel" disable_off="true" />
             <check key="embankment" text="Embankment" disable_off="true" />
             <check key="cutting" text="Cutting" disable_off="true" />
+            <check key="lit" text="Lit" />
         </checkgroup>
-    </chunk>
-    <chunk id="highway_yesno_incline">
-        <reference ref="highway_yesno" />
         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+        <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width">
-        <checkgroup columns="4">
-            <check key="bridge" text="Bridge" disable_off="true" />
-            <check key="tunnel" text="Tunnel" disable_off="true" />
-            <check key="embankment" text="Embankment" disable_off="true" />
-            <check key="cutting" text="Cutting" disable_off="true" />
-            <check key="oneway" text="Oneway" />
-            <check key="lit" text="Lit" />
-        </checkgroup>
-        <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+        <reference ref="highway_yesno" />
         <text key="width" text="Width (meters)" />
     </chunk>
     <chunk id="highway_yesno_incline_oneway_lit_width_busbay_sidewalk">
@@ -591,6 +582,7 @@
         <preset_link preset_name="Road Restrictions" />
         <preset_link preset_name="Access Restrictions" />
     </chunk>
+
   <!-- Groups -->
   <group name="Highways" icon="presets/transport/way/way_secondary.svg">
     <group name="Streets" icon="presets/transport/way/way_secondary.svg">
@@ -603,6 +595,7 @@
             <optional>
                 <text key="name" text="Name" />
                 <check key="noname" text="Street has no name" disable_off="true" />
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
@@ -609,11 +602,6 @@
                 <text key="width" text="Width (meters)" />
                 <space />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
                 <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -624,6 +612,7 @@
             <optional>
                 <text key="ref" text="Reference" />
                 <check key="noref" text="Street has no reference" disable_off="true" />
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
@@ -631,11 +620,6 @@
                 <text key="width" text="Width (meters)" />
                 <space />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                </checkgroup>
                 <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -649,6 +633,7 @@
             <optional>
                 <text key="name" text="Name" />
                 <check key="noname" text="Street has no name" disable_off="true" />
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
@@ -655,12 +640,6 @@
                 <text key="width" text="Width (meters)" />
                 <space />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                    <check key="motorroad" text="Motorroad" default="on" />
-                </checkgroup>
                 <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -672,6 +651,7 @@
             <optional>
                 <text key="ref" text="Reference" />
                 <check key="noref" text="Street has no reference" disable_off="true" />
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
@@ -679,12 +659,6 @@
                 <text key="width" text="Width (meters)" />
                 <space />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" default="on" />
-                    <check key="lit" text="Lit" />
-                    <check key="toll" text="Toll" />
-                    <check key="motorroad" text="Motorroad" default="on" />
-                </checkgroup>
                 <reference ref="placement_shoulder" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -699,10 +673,11 @@
             <optional>
                 <text key="name" text="Name" />
                 <check key="noname" text="Street has no name" disable_off="true" />
+                <space/>
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
-                <checkgroup columns="4">
-                    <check key="motorroad" text="Motorroad" />
+                <checkgroup columns="2">
                     <check key="narrow" text="Narrow" disable_off="true" />
                     <check key="trolley_wire" text="Overhead trolley wires" />
                 </checkgroup>
@@ -714,11 +689,11 @@
             <link wiki="Highway_link" />
             <key key="highway" value="primary_link" />
             <optional>
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <text key="destination" text="Destination" />
                 <text key="destination:ref" text="Destination reference" />
                 <text key="junction:ref" text="Junction reference" />
-                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <space />
                 <reference ref="placement_shoulder" />
@@ -734,6 +709,8 @@
             <optional>
                 <text key="name" text="Name" />
                 <check key="noname" text="Street has no name" disable_off="true" />
+                <space/>
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <checkgroup columns="2">
@@ -766,6 +743,8 @@
             <optional>
                 <text key="name" text="Name" />
                 <check key="noname" text="Street has no name" disable_off="true" />
+                <space/>
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <checkgroup columns="2">
@@ -797,6 +776,8 @@
                 <check key="noname" text="Street has no name" disable_off="true" />
                 <text key="ref" text="Reference" />
                 <check key="noref" text="Street has no reference" disable_off="true" />
+                <space/>
+                <check key="motorroad" text="Motorroad" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
                 <checkgroup columns="3">
@@ -818,11 +799,7 @@
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
                 <reference ref="highway_yesno" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" />
-                    <check key="oneway:bicycle" text="Oneway for bicycle" />
-                    <check key="lit" text="Lit" />
-                </checkgroup>
+                <check key="oneway:bicycle" text="Oneway for bicycle" />
                 <text key="width" text="Width (meters)" />
                 <combo key="bus_bay" text="Bus bay" values="both,left,right" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
@@ -847,12 +824,8 @@
                 <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
                 <reference ref="surface_smoothness" />
-                <reference ref="highway_yesno_incline" />
-                <checkgroup columns="4">
-                    <check key="oneway" text="Oneway" />
-                    <check key="oneway:bicycle" text="Oneway for bicycle" />
-                    <check key="lit" text="Lit" />
-                </checkgroup>
+                <reference ref="highway_yesno" />
+                <check key="oneway:bicycle" text="Oneway for bicycle" />
                 <text key="width" text="Width (meters)" />
                 <combo key="bus_bay" text="Bus bay" values="both,left,right" />
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
@@ -887,8 +860,7 @@
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
                 <reference ref="surface_smoothness" />
                 <check key="area" text="Area" />
-                <reference ref="highway_yesno_incline" />
-                <check key="lit" text="Lit" />
+                <reference ref="highway_yesno" />
                 <text key="width" text="Width (meters)" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -913,7 +885,6 @@
             <key key="service" value="parking_aisle" />
             <optional>
                 <reference ref="surface_smoothness" />
-                <check key="oneway" text="Oneway" />
                 <check key="lit" text="Lit" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -965,13 +936,14 @@
         <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway,multipolygon" preset_name_label="true" > <!-- There are links from MP relations to this preset -->
             <link wiki="Key:access" />
             <space />
-            <checkgroup columns="3" >
-                <check key="oneway" text="Oneway" />
+            <checkgroup columns="4" >
+                <check key="ice_road" text="Ice road" disable_off="true" />
+                <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
                 <check key="toll" text="Toll" />
-                <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
                 <check key="winter_road" text="Winter road" disable_off="true" />
-                <check key="ice_road" text="Ice road" disable_off="true" />
             </checkgroup>
+            <space/>
+            <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
             <text key="maxspeed" text="Max. speed (km/h)" />
             <text key="maxspeed:forward" text="Max. speed in way direction" />
             <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
@@ -1050,7 +1022,7 @@
                 <reference ref="name_layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
                 <reference ref="highway_yesno" />
-                <check key="oneway" text="Oneway" />
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
                 <text key="width" text="Width (meters)" />
             </optional>
             <reference ref="link_road_access_restrictions" />
@@ -1159,7 +1131,7 @@
             <space />
             <optional text="Edit Highway Attributes:">
                 <combo key="highway" text="Highway" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,unclassified,residential,living_street,service,bus_guideway,construction" values_context="Highway" values_sort="false" />
-                <check key="oneway" text="Oneway" />
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
             </optional>
         </item> <!-- Cycle Lane/Track -->
         <item name="Dedicated Cycleway" icon="presets/transport/way/dedicated_cycleway.svg" type="way,closedway" preset_name_label="true">
@@ -2342,7 +2314,7 @@
             <optional>
                 <text key="name" text="Name" />
                 <reference ref="highway_yesno" />
-                <check key="oneway" text="Oneway" />
+                <combo key="oneway" text="Oneway" values="yes,no,reversible,alternating" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" values_sort="false" />
                 <reference ref="surface_smoothness" />
                 <text key="maxspeed" text="Max. speed (km/h)" />