Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15073)
+++ trunk/data/defaultpresets.xml	(revision 15074)
@@ -46,21 +46,20 @@
         <reference ref="surface_smoothness" />
     </chunk>
+    <chunk id="highway_yesno">
+        <checkgroup columns="2">
+            <check key="bridge" text="Bridge" disable_off="true" />
+            <check key="embankment" text="Embankment" disable_off="true" />
+            <check key="tunnel" text="Tunnel" disable_off="true" />
+            <check key="cutting" text="Cutting" disable_off="true" />
+        </checkgroup>
+    </chunk>
     <chunk id="highway_yesno_incline">
-        <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="highway_yesno" />
         <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down"/>
     </chunk>
-    <chunk id="highway_yesno_incline_oneway">
+    <chunk id="highway_yesno_incline_oneway_lit_width">
         <check key="oneway" text="Oneway" />
         <reference ref="highway_yesno_incline" />
-    </chunk>
-    <chunk id="highway_yesno_incline_oneway_lit">
-        <reference ref="highway_yesno_incline_oneway" />
         <check key="lit" text="Lit" />
-    </chunk>
-    <chunk id="highway_yesno_incline_oneway_lit_width">
-        <reference ref="highway_yesno_incline_oneway_lit" />
         <text key="width" text="Width (meters)" />
     </chunk>
@@ -72,14 +71,15 @@
         <combo key="service" text="Service type" values="yard,siding,spur,crossover" />
     </chunk>
-    <chunk id="railway_electrified">
+    <chunk id="railway_electrified_yesno">
         <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" />
         <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
         <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
+        <reference ref="highway_yesno" />
     </chunk>
-    <chunk id="railway_service_gauge_electrified">
+    <chunk id="railway_service_gauge_electrified_yesno">
         <reference ref="railway_service" />
         <combo key="tracks" text="Tracks" text_context="railway" values="1,2,3,4" length="4" />
         <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" />
+        <reference ref="railway_electrified_yesno" />
     </chunk>
     <chunk id="barrier_5">
@@ -887,5 +887,5 @@
                 <reference ref="name_layer" />
                 <combo key="lanes" text="Lanes" values="1,2,3" length="3" />
-                <reference ref="highway_yesno_incline_oneway" />
+                <reference ref="highway_yesno" />
                 <text key="width" text="Width (meters)" />
             </optional>
@@ -1817,5 +1817,5 @@
             <optional>
                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
-                <reference ref="railway_service_gauge_electrified" />
+                <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Rail -->
@@ -1825,5 +1825,5 @@
             <optional>
                 <combo key="usage" text="Usage" values="main,branch,industrial,military,tourism,freight" />
-                <reference ref="railway_service_gauge_electrified" />
+                <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Narrow Gauge Rail -->
@@ -1833,5 +1833,5 @@
             <optional>
                 <reference ref="railway_service" />
-                <reference ref="railway_electrified" />
+                <reference ref="railway_electrified_yesno" />
             </optional>
         </item> <!-- Monorail -->
@@ -1840,5 +1840,5 @@
             <key key="railway" value="preserved" />
             <optional>
-                <reference ref="railway_service_gauge_electrified" />
+                <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Preserved -->
@@ -1847,5 +1847,5 @@
             <key key="railway" value="light_rail" />
             <optional>
-                <reference ref="railway_service_gauge_electrified" />
+                <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Light Rail -->
@@ -1854,5 +1854,5 @@
             <key key="railway" value="subway" />
             <optional>
-                <reference ref="railway_service_gauge_electrified" />
+                <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Subway -->
@@ -1861,5 +1861,5 @@
             <key key="railway" value="tram" />
             <optional>
-                <reference ref="railway_service_gauge_electrified" />
+                <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Tram -->
@@ -1868,5 +1868,5 @@
             <key key="railway" value="funicular" />
             <optional>
-                <reference ref="railway_service_gauge_electrified" />
+                <reference ref="railway_service_gauge_electrified_yesno" />
             </optional>
         </item> <!-- Funicular -->
@@ -1876,5 +1876,6 @@
             <optional>
                 <text key="name" text="Name" />
-                <reference ref="highway_yesno_incline_oneway" />
+                <reference ref="highway_yesno" />
+                <check key="oneway" text="Oneway" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
                 <reference ref="surface_smoothness" />
@@ -1889,4 +1890,5 @@
             <optional>
                 <reference ref="railway_service" />
+                <reference ref="highway_yesno" />
             </optional>
         </item> <!-- Disused Rail -->
@@ -1896,4 +1898,5 @@
             <optional>
                 <reference ref="railway_service" />
+                <reference ref="highway_yesno" />
             </optional>
         </item> <!-- Abandoned Rail -->