Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6297)
+++ trunk/data/defaultpresets.xml	(revision 6298)
@@ -196,10 +196,13 @@
                 <text key="maxspeed" text="Max. speed (km/h)" />
                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="on" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <check key="lit" text="Lit" default="off" /> 
+                <checkgroup columns="4">
+                    <check key="oneway" text="Oneway" default="on" />
+                    <check key="bridge" text="Bridge" />
+                    <check key="tunnel" text="Tunnel" />
+                    <check key="cutting" text="Cutting" />
+                    <check key="embankment" text="Embankment" />
+                    <check key="lit" text="Lit" />
+                    <check key="toll" text="Toll" />
+                </checkgroup>
             </optional>
         </item>
@@ -223,11 +226,14 @@
                 <text key="maxspeed" text="Max. speed (km/h)" />
                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="on" />
-                <check key="motorroad" text="Motorroad" default="on" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <check key="lit" text="Lit" default="off" /> 
+                <checkgroup columns="4">
+                    <check key="oneway" text="Oneway" default="on" />
+                    <check key="motorroad" text="Motorroad" default="on" />
+                    <check key="bridge" text="Bridge" />
+                    <check key="tunnel" text="Tunnel" />
+                    <check key="cutting" text="Cutting" />
+                    <check key="embankment" text="Embankment" />
+                    <check key="lit" text="Lit" />
+                    <check key="toll" text="Toll" />
+                </checkgroup>
             </optional>
         </item>
@@ -249,11 +255,14 @@
                 <text key="maxspeed" text="Max. speed (km/h)" />
                 <combo key="surface" text="Surface" values="paved,unpaved,asphalt,concrete,metal,wood,paving_stones,cobblestone,gravel,pebblestone,compacted,grass_paver,grass,sand,ground" />
-                <check key="oneway" text="Oneway" default="on" />
-                <check key="motorroad" text="Motorroad" default="on" />
-                <check key="bridge" text="Bridge" default="off" />
-                <check key="tunnel" text="Tunnel" default="off" />
-                <check key="cutting" text="Cutting" default="off" />
-                <check key="embankment" text="Embankment" default="off" />
-                <check key="lit" text="Lit" default="off" /> 
+                <checkgroup columns="4">
+                    <check key="oneway" text="Oneway" default="on" />
+                    <check key="motorroad" text="Motorroad" default="on" />
+                    <check key="bridge" text="Bridge" />
+                    <check key="tunnel" text="Tunnel" />
+                    <check key="cutting" text="Cutting" />
+                    <check key="embankment" text="Embankment" />
+                    <check key="lit" text="Lit" />
+                    <check key="toll" text="Toll" />
+                </checkgroup> 
             </optional>
         </item>
@@ -748,4 +757,5 @@
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
                 <text key="width" text="Width (meters)" />
+                <check key="toll" text="Toll" />
             </optional>
         </item>
@@ -1567,4 +1577,5 @@
                 <text key="width" text="Width (meters)" />
                 <combo key="incline" text="Incline" values="10%,-10%,10°,-10°,up,down" />
+                <check key="toll" text="Toll" />
             </optional>
         </item>