Index: resources/styles/default/lines
===================================================================
--- resources/styles/default/lines	(revision 3796)
+++ resources/styles/default/lines	(working copy)
@@ -77,14 +77,15 @@
 highway=* {name '${name}' | '${ref}' }
 
 # Flag unpaved roads.
-highway=*
-& (surface=cobblestone | surface=compacted | surface=dirt |
-   surface=earth | surface=grass | surface=grass_paver |
-   surface=gravel | surface=grit | surface=ground | surface=mud |
-   surface=pebblestone | surface=sand | surface=unpaved |
+highway=* & 
+( (surface=* & surface!=asphalt & surface!=paved & surface!=sett & 
+    surface!=concrete & surface!=concrete:lanes & surface!=concrete:plates & 
+    surface!=paving_stones  &  surface!=paving_stones:30 & surface!=cobblestone  &
+   	surface!=cobblestone:flattened  & surface!=metal  & surface!=wood
+   ) |
    mtb:scale=* |
    tracktype ~ 'grade[2-6]' |
-   smoothness ~ '.*(bad|horrible|impassable)' |
+   smoothness ~ '.*(very_bad|horrible|impassable)' |
    sac_scale ~ '.*(mountain|alpine)_hiking' |
    sport=via_ferrata)
 { add mkgmap:unpaved=1 }
@@ -91,7 +92,10 @@
 (highway=bridleway | highway=path | highway=track | highway=unsurfaced)
 & surface!=* & tracktype!=* & smoothness!=* & sac_scale!=*
 { add mkgmap:unpaved=1 }
+highway=via_ferrata { add mkgmap:unpaved=1 }
 
+highway=* & mkgmap:unpaved!=1 & smoothness ~ '.*(bad|horrible|impassable)'  { add mkgmap:road-speed = '-2' } 
+
 # Convert generic path to most specific
 highway=footway & snowplowing!=no
 & (bicycle=yes|bicycle=designated|bicycle=permissive|bicycle=official)