diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b2db1f6df1..472e155323 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 8a45b390dc..4df716ff80 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -22697,7 +22697,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22718,7 +22718,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22738,7 +22738,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -22758,7 +22758,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -22778,7 +22778,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22798,7 +22798,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23212,7 +23212,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23233,7 +23233,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23253,7 +23253,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23273,7 +23273,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23293,7 +23293,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23313,7 +23313,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23388,7 +23388,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23409,7 +23409,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23429,7 +23429,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23449,7 +23449,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23469,7 +23469,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23489,7 +23489,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23564,7 +23564,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23585,7 +23585,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23605,7 +23605,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23625,7 +23625,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23645,7 +23645,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23665,7 +23665,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23740,7 +23740,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23761,7 +23761,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23781,7 +23781,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23801,7 +23801,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23821,7 +23821,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23841,7 +23841,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23916,7 +23916,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23937,7 +23937,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23957,7 +23957,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23977,7 +23977,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23997,7 +23997,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -24017,7 +24017,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -71878,168 +71878,6 @@ cont {
     }
   }
 }
-cont {
-  name: "psurface-unpaved_bad"
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "psurface-unpaved_good"
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-}
 cont {
   name: "public_transport-platform"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 852cadabaf..067f4d96eb 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 664a4853f8..5792aa0531 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -22275,7 +22275,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22296,7 +22296,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22316,7 +22316,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -22336,7 +22336,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -22356,7 +22356,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22376,7 +22376,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22751,7 +22751,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22772,7 +22772,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22792,7 +22792,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -22812,7 +22812,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -22832,7 +22832,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22852,7 +22852,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22888,7 +22888,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22909,7 +22909,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22929,7 +22929,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -22949,7 +22949,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -22969,7 +22969,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22989,7 +22989,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23025,7 +23025,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23046,7 +23046,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23066,7 +23066,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23086,7 +23086,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23106,7 +23106,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23126,7 +23126,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23162,7 +23162,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23183,7 +23183,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23203,7 +23203,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23223,7 +23223,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23243,7 +23243,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23263,7 +23263,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23299,7 +23299,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23320,7 +23320,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23340,7 +23340,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1090058488
+      color: 1721782290
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23360,7 +23360,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23380,7 +23380,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23400,7 +23400,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 16316664
+      color: 10506258
       dashdot {
         dd: 10.0
         dd: 3.5
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 9fab0e2b20..ee36108fa0 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 82722e02d9..40ccf003f1 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -22275,7 +22275,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22296,7 +22296,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22316,7 +22316,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -22336,7 +22336,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -22356,7 +22356,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22376,7 +22376,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22751,7 +22751,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22772,7 +22772,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22792,7 +22792,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -22812,7 +22812,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -22832,7 +22832,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22852,7 +22852,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22888,7 +22888,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22909,7 +22909,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -22929,7 +22929,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -22949,7 +22949,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -22969,7 +22969,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -22989,7 +22989,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23025,7 +23025,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23046,7 +23046,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23066,7 +23066,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23086,7 +23086,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23106,7 +23106,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23126,7 +23126,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23162,7 +23162,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23183,7 +23183,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23203,7 +23203,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23223,7 +23223,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23243,7 +23243,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23263,7 +23263,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23299,7 +23299,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23320,7 +23320,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -23340,7 +23340,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 1078675011
+      color: 1720994322
       dashdot {
         dd: 6.0
         dd: 2.5
@@ -23360,7 +23360,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 8.0
         dd: 3.0
@@ -23380,7 +23380,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
@@ -23400,7 +23400,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 4933187
+      color: 9718290
       dashdot {
         dd: 10.0
         dd: 3.5
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index ae78461f10..f3fdc0d637 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 897d2e4e74..97863ea45d 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -42849,184 +42849,6 @@ cont {
     }
   }
 }
-cont {
-  name: "psurface-unpaved_bad"
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 1308425468
-      dashdot {
-        dd: 2.2
-        dd: 1.26
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 1308425468
-      dashdot {
-        dd: 3.3
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 1308425468
-      dashdot {
-        dd: 4.0
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 1308425468
-      dashdot {
-        dd: 4.0
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 1308425468
-      dashdot {
-        dd: 6.3
-        dd: 2.7
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 1308425468
-      dashdot {
-        dd: 6.3
-        dd: 2.7
-      }
-      priority: 120
-    }
-  }
-}
-cont {
-  name: "psurface-unpaved_good"
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 1308425468
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 1308425468
-      dashdot {
-        dd: 2.2
-        dd: 1.26
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 1308425468
-      dashdot {
-        dd: 3.3
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 1308425468
-      dashdot {
-        dd: 4.0
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 1308425468
-      dashdot {
-        dd: 4.0
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 1308425468
-      dashdot {
-        dd: 6.3
-        dd: 2.7
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 1308425468
-      dashdot {
-        dd: 6.3
-        dd: 2.7
-      }
-      priority: 120
-    }
-  }
-}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index c2e28a76f5..ef4f90eb5b 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 05444a9fa2..2d05d17929 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -43389,184 +43389,6 @@ cont {
     }
   }
 }
-cont {
-  name: "psurface-unpaved_bad"
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 1296910148
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 1296910148
-      dashdot {
-        dd: 2.2
-        dd: 1.26
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 1296910148
-      dashdot {
-        dd: 3.3
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 1296910148
-      dashdot {
-        dd: 4.0
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 1296910148
-      dashdot {
-        dd: 4.0
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 1296910148
-      dashdot {
-        dd: 6.3
-        dd: 2.7
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 1296910148
-      dashdot {
-        dd: 6.3
-        dd: 2.7
-      }
-      priority: 120
-    }
-  }
-}
-cont {
-  name: "psurface-unpaved_good"
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 1296910148
-      dashdot {
-        dd: 2.0
-        dd: 1.35
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 1296910148
-      dashdot {
-        dd: 2.2
-        dd: 1.26
-      }
-      priority: 120
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 1296910148
-      dashdot {
-        dd: 3.3
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 1296910148
-      dashdot {
-        dd: 4.0
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 1296910148
-      dashdot {
-        dd: 4.0
-        dd: 1.8
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 1296910148
-      dashdot {
-        dd: 6.3
-        dd: 2.7
-      }
-      priority: 120
-    }
-  }
-  element {
-    scale: 20
-    lines {
-      width: 4.0
-      color: 1296910148
-      dashdot {
-        dd: 6.3
-        dd: 2.7
-      }
-      priority: 120
-    }
-  }
-}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/patterns.txt b/data/patterns.txt
index 5a17fe041e..e45c61f6aa 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -75,9 +75,6 @@
 3.5 3.5
 2.0 1.35
 2.2 1.26
-3.3 1.8
-4.0 1.8
-6.3 2.7
 10.1 10.1
 0.8 12.0
 1.15 14.0
diff --git a/data/visibility.txt b/data/visibility.txt
index e04b52dd67..bb2e6a4eee 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -865,8 +865,8 @@ world  000000000000000000000  +
     psurface  000000000000000000000  +
         paved_bad  000000000000000000000  -
         paved_good  000000000000000000000  -
-        unpaved_bad  000000000000001111111  -
-        unpaved_good  000000000000001111111  -
+        unpaved_bad  000000000000000000000  -
+        unpaved_good  000000000000000000000  -
         {}
     public_transport  000000000000000000000  +
         platform  000000000000000000000  -