diff --git a/data/colors.txt b/data/colors.txt
index fe38dd183c..0f81ce0dc7 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -308,17 +308,19 @@
 16777215
 436602368
 437326080
+439885588
+441199131
 441925171
 442905727
 443432263
 451800027
+452764770
 452954029
 452968274
 452984831
 609045837
 654706176
 655629312
-657139751
 659106075
 659244611
 659375940
@@ -340,10 +342,12 @@
 857809179
 858466343
 858532890
+859315988
 859519289
 859519803
 860111940
 860571203
+860629531
 861355571
 861690961
 861690972
@@ -367,6 +371,7 @@
 870704341
 871230427
 871954680
+872195170
 872395302
 872415231
 1074136576
@@ -413,6 +418,7 @@
 1297041991
 1297109072
 1297438037
+1297563187
 1297691427
 1297898577
 1297898588
@@ -464,6 +470,7 @@
 1308595264
 1308601687
 1308604747
+1308606290
 1308622847
 1511594265
 1523897290
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0cb6a341d0..aed366cac3 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 b407731125..e619c2891a 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -25363,7 +25363,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 671088639
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -25389,7 +25389,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -25415,7 +25415,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -25441,7 +25441,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -25467,7 +25467,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -26238,7 +26238,7 @@ cont {
     }
     lines {
       width: 1.9
-      color: 1308402786
+      color: 452764770
       priority: 310
       join: BEVELJOIN
       cap: BUTTCAP
@@ -26261,18 +26261,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 1308402786
+      color: 872195170
       priority: 310
       cap: BUTTCAP
     }
@@ -26294,18 +26294,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 3.8
-      color: 1308402786
+      color: 872195170
       priority: 310
       cap: BUTTCAP
     }
@@ -26338,7 +26338,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 16742950
+      color: 1308402786
       priority: 310
       cap: BUTTCAP
     }
@@ -26371,7 +26371,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -26403,7 +26403,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -26435,7 +26435,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -26467,7 +26467,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -26499,7 +26499,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -27225,12 +27225,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1300267136
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 1308591910
@@ -27256,18 +27250,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1308402786
+      color: 872195170
       priority: 228
       cap: BUTTCAP
     }
@@ -27289,18 +27283,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 2.6
-      color: 1308402786
+      color: 872195170
       priority: 228
       cap: BUTTCAP
     }
@@ -27333,7 +27327,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 16746278
+      color: 1308402786
       priority: 228
       cap: BUTTCAP
     }
@@ -27366,7 +27360,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -27398,7 +27392,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -27430,7 +27424,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -27462,7 +27456,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -27494,7 +27488,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -30236,7 +30230,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 671088639
+      color: 1308622847
       dashdot {
         dd: 5.4
         dd: 2.7
@@ -30266,7 +30260,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 671088639
+      color: 1308622847
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -30296,7 +30290,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 7.0
         dd: 3.0
@@ -30326,7 +30320,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -30356,7 +30350,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -31125,18 +31119,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.8
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 289
       cap: BUTTCAP
     }
     lines {
       width: 3.2
-      color: 1308402786
+      color: 872195170
       priority: 290
       cap: BUTTCAP
     }
@@ -31169,7 +31163,7 @@ cont {
     }
     lines {
       width: 3.8
-      color: 16752972
+      color: 1308402786
       priority: 290
       cap: BUTTCAP
     }
@@ -31202,7 +31196,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -31234,7 +31228,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -31266,7 +31260,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -31298,7 +31292,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -31330,7 +31324,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -31969,18 +31963,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 225
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1308402786
+      color: 872195170
       priority: 226
       cap: BUTTCAP
     }
@@ -32013,7 +32007,7 @@ cont {
     }
     lines {
       width: 2.5
-      color: 16752972
+      color: 1308402786
       priority: 226
       cap: BUTTCAP
     }
@@ -32046,7 +32040,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -32078,7 +32072,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -32110,7 +32104,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -32142,7 +32136,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -32174,7 +32168,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -33001,7 +32995,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 671088639
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -33033,7 +33027,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -33065,7 +33059,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -33097,7 +33091,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -33129,7 +33123,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -34446,7 +34440,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16760658
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -34478,7 +34472,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16760658
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -34510,7 +34504,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16777215
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -34542,7 +34536,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -34574,7 +34568,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -34940,7 +34934,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 16760658
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -34966,7 +34960,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16760658
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -34992,7 +34986,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -35018,7 +35012,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -35044,7 +35038,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -37184,7 +37178,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 872415231
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -37216,7 +37210,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -37248,7 +37242,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -37280,7 +37274,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -37312,7 +37306,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -37619,7 +37613,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 872415231
+      color: 1308622847
       priority: 222
     }
   }
@@ -37637,7 +37631,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16777215
+      color: 1308622847
       priority: 222
     }
   }
@@ -37655,7 +37649,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 1308622847
       priority: 222
     }
     path_text {
@@ -37681,7 +37675,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 222
     }
     path_text {
@@ -37707,7 +37701,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 222
     }
     path_text {
@@ -40362,7 +40356,7 @@ cont {
     }
     lines {
       width: 1.9
-      color: 1308402786
+      color: 452764770
       priority: 310
       join: BEVELJOIN
       cap: BUTTCAP
@@ -40385,18 +40379,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 1308402786
+      color: 872195170
       priority: 310
       cap: BUTTCAP
     }
@@ -40418,18 +40412,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 3.8
-      color: 1308402786
+      color: 872195170
       priority: 310
       cap: BUTTCAP
     }
@@ -40462,7 +40456,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 16742950
+      color: 1308402786
       priority: 310
       cap: BUTTCAP
     }
@@ -40495,7 +40489,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -40527,7 +40521,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -40559,7 +40553,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -40591,7 +40585,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -40623,7 +40617,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -41286,12 +41280,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1300267136
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 1308591910
@@ -41317,18 +41305,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1308402786
+      color: 872195170
       priority: 228
       cap: BUTTCAP
     }
@@ -41350,18 +41338,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 2.6
-      color: 1308402786
+      color: 872195170
       priority: 228
       cap: BUTTCAP
     }
@@ -41394,7 +41382,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 16746278
+      color: 1308402786
       priority: 228
       cap: BUTTCAP
     }
@@ -41427,7 +41415,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -41459,7 +41447,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -41491,7 +41479,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -41523,7 +41511,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -41555,7 +41543,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -42207,7 +42195,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 872415231
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -42233,7 +42221,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -42259,7 +42247,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -42285,7 +42273,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -42311,7 +42299,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index a6604231f2..7120277cfe 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 0e36e08f2b..91ff86a5cd 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -24146,7 +24146,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 671088639
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -24172,7 +24172,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -24198,7 +24198,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -24224,7 +24224,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -24250,7 +24250,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -25021,7 +25021,7 @@ cont {
     }
     lines {
       width: 1.9
-      color: 1308402786
+      color: 452764770
       priority: 310
       join: BEVELJOIN
       cap: BUTTCAP
@@ -25044,18 +25044,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 1308402786
+      color: 872195170
       priority: 310
       cap: BUTTCAP
     }
@@ -25077,18 +25077,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 3.8
-      color: 1308402786
+      color: 872195170
       priority: 310
       cap: BUTTCAP
     }
@@ -25121,7 +25121,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 16742950
+      color: 1308402786
       priority: 310
       cap: BUTTCAP
     }
@@ -25154,7 +25154,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -25186,7 +25186,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -25218,7 +25218,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -25250,7 +25250,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -25282,7 +25282,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -26008,12 +26008,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1300267136
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 1308591910
@@ -26039,18 +26033,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1308402786
+      color: 872195170
       priority: 228
       cap: BUTTCAP
     }
@@ -26072,18 +26066,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 2.6
-      color: 1308402786
+      color: 872195170
       priority: 228
       cap: BUTTCAP
     }
@@ -26116,7 +26110,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 16746278
+      color: 1308402786
       priority: 228
       cap: BUTTCAP
     }
@@ -26149,7 +26143,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -26181,7 +26175,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -26213,7 +26207,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -26245,7 +26239,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -26277,7 +26271,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -28590,7 +28584,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 671088639
+      color: 1308622847
       dashdot {
         dd: 5.4
         dd: 2.7
@@ -28620,7 +28614,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 671088639
+      color: 1308622847
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -28650,7 +28644,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 7.0
         dd: 3.0
@@ -28680,7 +28674,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -28710,7 +28704,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -29479,18 +29473,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.8
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 289
       cap: BUTTCAP
     }
     lines {
       width: 3.2
-      color: 1308402786
+      color: 872195170
       priority: 290
       cap: BUTTCAP
     }
@@ -29523,7 +29517,7 @@ cont {
     }
     lines {
       width: 3.8
-      color: 16752972
+      color: 1308402786
       priority: 290
       cap: BUTTCAP
     }
@@ -29556,7 +29550,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -29588,7 +29582,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -29620,7 +29614,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -29652,7 +29646,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -29684,7 +29678,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16752972
+      color: 1308402786
       priority: 290
     }
     path_text {
@@ -30323,18 +30317,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 225
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1308402786
+      color: 872195170
       priority: 226
       cap: BUTTCAP
     }
@@ -30367,7 +30361,7 @@ cont {
     }
     lines {
       width: 2.5
-      color: 16752972
+      color: 1308402786
       priority: 226
       cap: BUTTCAP
     }
@@ -30400,7 +30394,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -30432,7 +30426,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -30464,7 +30458,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -30496,7 +30490,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -30528,7 +30522,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16752972
+      color: 1308402786
       priority: 226
     }
     path_text {
@@ -31355,7 +31349,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 671088639
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -31387,7 +31381,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -31419,7 +31413,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -31451,7 +31445,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -31483,7 +31477,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 230
     }
     path_text {
@@ -32783,7 +32777,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16760658
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -32815,7 +32809,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16760658
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -32847,7 +32841,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16777215
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -32879,7 +32873,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -32911,7 +32905,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308606290
       priority: 270
     }
     path_text {
@@ -33277,7 +33271,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 16760658
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -33303,7 +33297,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16760658
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -33329,7 +33323,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -33355,7 +33349,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -33381,7 +33375,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308606290
       priority: 224
     }
     path_text {
@@ -35203,7 +35197,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 872415231
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -35235,7 +35229,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -35267,7 +35261,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -35299,7 +35293,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -35331,7 +35325,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -35638,7 +35632,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 872415231
+      color: 1308622847
       priority: 222
     }
   }
@@ -35656,7 +35650,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16777215
+      color: 1308622847
       priority: 222
     }
   }
@@ -35674,7 +35668,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 1308622847
       priority: 222
     }
     path_text {
@@ -35700,7 +35694,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 222
     }
     path_text {
@@ -35726,7 +35720,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 1308622847
       priority: 222
     }
     path_text {
@@ -37991,7 +37985,7 @@ cont {
     }
     lines {
       width: 1.9
-      color: 1308402786
+      color: 452764770
       priority: 310
       join: BEVELJOIN
       cap: BUTTCAP
@@ -38014,18 +38008,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 1308402786
+      color: 872195170
       priority: 310
       cap: BUTTCAP
     }
@@ -38047,18 +38041,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 3.8
-      color: 1308402786
+      color: 872195170
       priority: 310
       cap: BUTTCAP
     }
@@ -38091,7 +38085,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 16742950
+      color: 1308402786
       priority: 310
       cap: BUTTCAP
     }
@@ -38124,7 +38118,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -38156,7 +38150,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -38188,7 +38182,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -38220,7 +38214,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -38252,7 +38246,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 1308402786
       priority: 310
     }
     path_text {
@@ -38915,12 +38909,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1300267136
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 1308591910
@@ -38946,18 +38934,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1308402786
+      color: 872195170
       priority: 228
       cap: BUTTCAP
     }
@@ -38979,18 +38967,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 2.6
-      color: 1308402786
+      color: 872195170
       priority: 228
       cap: BUTTCAP
     }
@@ -39023,7 +39011,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 16746278
+      color: 1308402786
       priority: 228
       cap: BUTTCAP
     }
@@ -39056,7 +39044,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -39088,7 +39076,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -39120,7 +39108,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -39152,7 +39140,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -39184,7 +39172,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 1308402786
       priority: 228
     }
     path_text {
@@ -39836,7 +39824,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 872415231
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -39862,7 +39850,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -39888,7 +39876,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -39914,7 +39902,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
@@ -39940,7 +39928,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 1308622847
       priority: 250
     }
     path_text {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 0b3f3faac0..52bccbcb1f 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 c949c3923c..b2d64bfe2f 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -24146,7 +24146,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 657139751
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -24172,7 +24172,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 2828327
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -24198,7 +24198,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 2828327
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -24224,7 +24224,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -24250,7 +24250,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -25045,7 +25045,7 @@ cont {
     }
     lines {
       width: 1.9
-      color: 1295523604
+      color: 439885588
       priority: 310
       join: BEVELJOIN
       cap: BUTTCAP
@@ -25069,18 +25069,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 1295523604
+      color: 859315988
       priority: 310
       cap: BUTTCAP
     }
@@ -25103,18 +25103,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 3.8
-      color: 1295523604
+      color: 859315988
       priority: 310
       cap: BUTTCAP
     }
@@ -25148,7 +25148,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 4794651
+      color: 1295523604
       priority: 310
       cap: BUTTCAP
     }
@@ -25182,7 +25182,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -25215,7 +25215,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -25248,7 +25248,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -25281,7 +25281,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -25314,7 +25314,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -26065,12 +26065,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1291845632
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 1297691427
@@ -26097,18 +26091,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1295523604
+      color: 859315988
       priority: 228
       cap: BUTTCAP
     }
@@ -26131,18 +26125,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 2.6
-      color: 1295523604
+      color: 859315988
       priority: 228
       cap: BUTTCAP
     }
@@ -26176,7 +26170,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 5845795
+      color: 1295523604
       priority: 228
       cap: BUTTCAP
     }
@@ -26210,7 +26204,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -26243,7 +26237,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -26276,7 +26270,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -26309,7 +26303,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -26342,7 +26336,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -28656,7 +28650,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 657139751
+      color: 1294673959
       dashdot {
         dd: 5.4
         dd: 2.7
@@ -28686,7 +28680,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 657139751
+      color: 1294673959
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -28716,7 +28710,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 2828327
+      color: 1294673959
       dashdot {
         dd: 7.0
         dd: 3.0
@@ -28746,7 +28740,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 2828327
+      color: 1294673959
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -28776,7 +28770,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 2828327
+      color: 1294673959
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -29571,18 +29565,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.8
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 289
       cap: BUTTCAP
     }
     lines {
       width: 3.2
-      color: 1296837147
+      color: 860629531
       priority: 290
       cap: BUTTCAP
     }
@@ -29616,7 +29610,7 @@ cont {
     }
     lines {
       width: 3.8
-      color: 5845795
+      color: 1296837147
       priority: 290
       cap: BUTTCAP
     }
@@ -29650,7 +29644,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 5845795
+      color: 1296837147
       priority: 290
     }
     path_text {
@@ -29683,7 +29677,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 5845795
+      color: 1296837147
       priority: 290
     }
     path_text {
@@ -29716,7 +29710,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 5845795
+      color: 1296837147
       priority: 290
     }
     path_text {
@@ -29749,7 +29743,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 1296837147
       priority: 290
     }
     path_text {
@@ -29782,7 +29776,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 1296837147
       priority: 290
     }
     path_text {
@@ -30445,18 +30439,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 3.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 225
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1296837147
+      color: 860629531
       priority: 226
       cap: BUTTCAP
     }
@@ -30490,7 +30484,7 @@ cont {
     }
     lines {
       width: 2.5
-      color: 5845795
+      color: 1296837147
       priority: 226
       cap: BUTTCAP
     }
@@ -30524,7 +30518,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 5845795
+      color: 1296837147
       priority: 226
     }
     path_text {
@@ -30557,7 +30551,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 5845795
+      color: 1296837147
       priority: 226
     }
     path_text {
@@ -30590,7 +30584,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 5845795
+      color: 1296837147
       priority: 226
     }
     path_text {
@@ -30623,7 +30617,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 5845795
+      color: 1296837147
       priority: 226
     }
     path_text {
@@ -30656,7 +30650,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 5845795
+      color: 1296837147
       priority: 226
     }
     path_text {
@@ -31503,7 +31497,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 657139751
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -31536,7 +31530,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 2828327
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -31569,7 +31563,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 2828327
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -31602,7 +31596,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -31635,7 +31629,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 1294673959
       priority: 230
     }
     path_text {
@@ -32958,7 +32952,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 5717555
+      color: 1297563187
       priority: 270
     }
     path_text {
@@ -32991,7 +32985,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 5717555
+      color: 1297563187
       priority: 270
     }
     path_text {
@@ -33024,7 +33018,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 2828327
+      color: 1297563187
       priority: 270
     }
     path_text {
@@ -33057,7 +33051,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 2828327
+      color: 1297563187
       priority: 270
     }
     path_text {
@@ -33090,7 +33084,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 2828327
+      color: 1297563187
       priority: 270
     }
     path_text {
@@ -33457,7 +33451,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 5717555
+      color: 1297563187
       priority: 224
     }
     path_text {
@@ -33483,7 +33477,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 5717555
+      color: 1297563187
       priority: 224
     }
     path_text {
@@ -33509,7 +33503,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 2828327
+      color: 1297563187
       priority: 224
     }
     path_text {
@@ -33535,7 +33529,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 1297563187
       priority: 224
     }
     path_text {
@@ -33561,7 +33555,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 1297563187
       priority: 224
     }
     path_text {
@@ -35402,7 +35396,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 858466343
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -35435,7 +35429,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 2828327
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -35468,7 +35462,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 2828327
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -35501,7 +35495,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 2828327
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -35534,7 +35528,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 2828327
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -35842,7 +35836,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 858466343
+      color: 1294673959
       priority: 222
     }
   }
@@ -35860,7 +35854,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 2828327
+      color: 1294673959
       priority: 222
     }
   }
@@ -35878,7 +35872,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 2828327
+      color: 1294673959
       priority: 222
     }
     path_text {
@@ -35904,7 +35898,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 1294673959
       priority: 222
     }
     path_text {
@@ -35930,7 +35924,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 1294673959
       priority: 222
     }
     path_text {
@@ -38219,7 +38213,7 @@ cont {
     }
     lines {
       width: 1.9
-      color: 1295523604
+      color: 439885588
       priority: 310
       join: BEVELJOIN
       cap: BUTTCAP
@@ -38243,18 +38237,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 1295523604
+      color: 859315988
       priority: 310
       cap: BUTTCAP
     }
@@ -38277,18 +38271,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
     }
     lines {
       width: 3.8
-      color: 1295523604
+      color: 859315988
       priority: 310
       cap: BUTTCAP
     }
@@ -38322,7 +38316,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 4794651
+      color: 1295523604
       priority: 310
       cap: BUTTCAP
     }
@@ -38356,7 +38350,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -38389,7 +38383,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -38422,7 +38416,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -38455,7 +38449,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -38488,7 +38482,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 4794651
+      color: 1295523604
       priority: 310
     }
     path_text {
@@ -39176,12 +39170,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1291845632
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 1297691427
@@ -39208,18 +39196,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 1.8
-      color: 1295523604
+      color: 859315988
       priority: 228
       cap: BUTTCAP
     }
@@ -39242,18 +39230,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
     }
     lines {
       width: 2.6
-      color: 1295523604
+      color: 859315988
       priority: 228
       cap: BUTTCAP
     }
@@ -39287,7 +39275,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 5845795
+      color: 1295523604
       priority: 228
       cap: BUTTCAP
     }
@@ -39321,7 +39309,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -39354,7 +39342,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -39387,7 +39375,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -39420,7 +39408,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -39453,7 +39441,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 1295523604
       priority: 228
     }
     path_text {
@@ -40106,7 +40094,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 858466343
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -40132,7 +40120,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 2828327
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -40158,7 +40146,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 2828327
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -40184,7 +40172,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 2828327
+      color: 1294673959
       priority: 250
     }
     path_text {
@@ -40210,7 +40198,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 2828327
+      color: 1294673959
       priority: 250
     }
     path_text {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index 1381fd2135..e4f58b6a96 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index bc31c88f46..f28df8ddee 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -26406,11 +26406,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
@@ -26439,11 +26439,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
@@ -26483,7 +26483,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 16742950
+      color: 16557154
       priority: 310
       cap: BUTTCAP
     }
@@ -26516,7 +26516,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -26548,7 +26548,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -26580,7 +26580,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -26612,7 +26612,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -26644,7 +26644,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -27370,12 +27370,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1300267136
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 16746278
@@ -27401,11 +27395,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
@@ -27434,11 +27428,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
@@ -27478,7 +27472,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 16746278
+      color: 16557154
       priority: 228
       cap: BUTTCAP
     }
@@ -27511,7 +27505,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -27543,7 +27537,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -27575,7 +27569,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -27607,7 +27601,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -27639,7 +27633,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -30579,7 +30573,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 671088639
+      color: 1308622847
       dashdot {
         dd: 5.4
         dd: 2.7
@@ -30609,7 +30603,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 671088639
+      color: 1308622847
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -30639,7 +30633,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 7.0
         dd: 3.0
@@ -30669,7 +30663,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -30699,7 +30693,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16777215
+      color: 1308622847
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -31468,11 +31462,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.8
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 289
       cap: BUTTCAP
@@ -31512,7 +31506,7 @@ cont {
     }
     lines {
       width: 3.8
-      color: 16752972
+      color: 16557154
       priority: 290
       cap: BUTTCAP
     }
@@ -31545,7 +31539,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16752972
+      color: 16557154
       priority: 290
     }
     path_text {
@@ -31577,7 +31571,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16752972
+      color: 16557154
       priority: 290
     }
     path_text {
@@ -31609,7 +31603,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16752972
+      color: 16557154
       priority: 290
     }
     path_text {
@@ -31641,7 +31635,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16752972
+      color: 16557154
       priority: 290
     }
     path_text {
@@ -31673,7 +31667,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16752972
+      color: 16557154
       priority: 290
     }
     path_text {
@@ -32312,11 +32306,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 225
       cap: BUTTCAP
@@ -32356,7 +32350,7 @@ cont {
     }
     lines {
       width: 2.5
-      color: 16752972
+      color: 16557154
       priority: 226
       cap: BUTTCAP
     }
@@ -32389,7 +32383,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 16752972
+      color: 16557154
       priority: 226
     }
     path_text {
@@ -32421,7 +32415,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 16752972
+      color: 16557154
       priority: 226
     }
     path_text {
@@ -32453,7 +32447,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16752972
+      color: 16557154
       priority: 226
     }
     path_text {
@@ -32485,7 +32479,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16752972
+      color: 16557154
       priority: 226
     }
     path_text {
@@ -32517,7 +32511,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16752972
+      color: 16557154
       priority: 226
     }
     path_text {
@@ -34843,7 +34837,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16777215
+      color: 16760658
       priority: 270
     }
     path_text {
@@ -34875,7 +34869,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 16760658
       priority: 270
     }
     path_text {
@@ -34907,7 +34901,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16777215
+      color: 16760658
       priority: 270
     }
     path_text {
@@ -35325,7 +35319,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 16777215
+      color: 16760658
       priority: 224
     }
     path_text {
@@ -35351,7 +35345,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 16760658
       priority: 224
     }
     path_text {
@@ -35377,7 +35371,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16777215
+      color: 16760658
       priority: 224
     }
     path_text {
@@ -40844,11 +40838,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
@@ -40877,11 +40871,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
@@ -40921,7 +40915,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 16742950
+      color: 16557154
       priority: 310
       cap: BUTTCAP
     }
@@ -40954,7 +40948,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -40986,7 +40980,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -41018,7 +41012,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -41050,7 +41044,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -41082,7 +41076,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 16742950
+      color: 16557154
       priority: 310
     }
     path_text {
@@ -41745,12 +41739,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1300267136
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 16746278
@@ -41776,11 +41764,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
@@ -41809,11 +41797,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
@@ -41853,7 +41841,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 16746278
+      color: 16557154
       priority: 228
       cap: BUTTCAP
     }
@@ -41886,7 +41874,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -41918,7 +41906,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -41950,7 +41938,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -41982,7 +41970,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
@@ -42014,7 +42002,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 16746278
+      color: 16557154
       priority: 228
     }
     path_text {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 96cc4ce9ff..41ca4cf6d7 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 635fe6c875..158823a38a 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -26431,11 +26431,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
@@ -26465,11 +26465,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
@@ -26510,7 +26510,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 4794651
+      color: 3677972
       priority: 310
       cap: BUTTCAP
     }
@@ -26544,7 +26544,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -26577,7 +26577,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -26610,7 +26610,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -26643,7 +26643,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -26676,7 +26676,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -27427,12 +27427,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1291845632
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 5845795
@@ -27459,11 +27453,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
@@ -27493,11 +27487,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
@@ -27538,7 +27532,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 5845795
+      color: 3677972
       priority: 228
       cap: BUTTCAP
     }
@@ -27572,7 +27566,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -27605,7 +27599,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -27638,7 +27632,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -27671,7 +27665,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -27704,7 +27698,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -30645,7 +30639,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 657139751
+      color: 1294673959
       dashdot {
         dd: 5.4
         dd: 2.7
@@ -30675,7 +30669,7 @@ cont {
     }
     lines {
       width: 3.0
-      color: 657139751
+      color: 1294673959
       dashdot {
         dd: 5.0
         dd: 2.0
@@ -30705,7 +30699,7 @@ cont {
     }
     lines {
       width: 4.0
-      color: 2828327
+      color: 1294673959
       dashdot {
         dd: 7.0
         dd: 3.0
@@ -30735,7 +30729,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 2828327
+      color: 1294673959
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -30765,7 +30759,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 2828327
+      color: 1294673959
       dashdot {
         dd: 16.2
         dd: 8.1
@@ -31560,11 +31554,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.8
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 289
       cap: BUTTCAP
@@ -31605,7 +31599,7 @@ cont {
     }
     lines {
       width: 3.8
-      color: 5845795
+      color: 4991515
       priority: 290
       cap: BUTTCAP
     }
@@ -31639,7 +31633,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 5845795
+      color: 4991515
       priority: 290
     }
     path_text {
@@ -31672,7 +31666,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 5845795
+      color: 4991515
       priority: 290
     }
     path_text {
@@ -31705,7 +31699,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 5845795
+      color: 4991515
       priority: 290
     }
     path_text {
@@ -31738,7 +31732,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 4991515
       priority: 290
     }
     path_text {
@@ -31771,7 +31765,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 4991515
       priority: 290
     }
     path_text {
@@ -32434,11 +32428,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 3.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 225
       cap: BUTTCAP
@@ -32479,7 +32473,7 @@ cont {
     }
     lines {
       width: 2.5
-      color: 5845795
+      color: 4991515
       priority: 226
       cap: BUTTCAP
     }
@@ -32513,7 +32507,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 5845795
+      color: 4991515
       priority: 226
     }
     path_text {
@@ -32546,7 +32540,7 @@ cont {
     }
     lines {
       width: 4.7
-      color: 5845795
+      color: 4991515
       priority: 226
     }
     path_text {
@@ -32579,7 +32573,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 5845795
+      color: 4991515
       priority: 226
     }
     path_text {
@@ -32612,7 +32606,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 5845795
+      color: 4991515
       priority: 226
     }
     path_text {
@@ -32645,7 +32639,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 5845795
+      color: 4991515
       priority: 226
     }
     path_text {
@@ -35020,7 +35014,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 2828327
+      color: 5717555
       priority: 270
     }
     path_text {
@@ -35053,7 +35047,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 2828327
+      color: 5717555
       priority: 270
     }
     path_text {
@@ -35086,7 +35080,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 2828327
+      color: 5717555
       priority: 270
     }
     path_text {
@@ -35505,7 +35499,7 @@ cont {
     }
     lines {
       width: 6.4
-      color: 2828327
+      color: 5717555
       priority: 224
     }
     path_text {
@@ -35531,7 +35525,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 5717555
       priority: 224
     }
     path_text {
@@ -35557,7 +35551,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 2828327
+      color: 5717555
       priority: 224
     }
     path_text {
@@ -41073,11 +41067,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
@@ -41107,11 +41101,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.8
+      width: 5.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 309
       cap: BUTTCAP
@@ -41152,7 +41146,7 @@ cont {
     }
     lines {
       width: 4.4
-      color: 4794651
+      color: 3677972
       priority: 310
       cap: BUTTCAP
     }
@@ -41186,7 +41180,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -41219,7 +41213,7 @@ cont {
     }
     lines {
       width: 8.2
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -41252,7 +41246,7 @@ cont {
     }
     lines {
       width: 11.0
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -41285,7 +41279,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -41318,7 +41312,7 @@ cont {
     }
     lines {
       width: 13.5
-      color: 4794651
+      color: 3677972
       priority: 310
     }
     path_text {
@@ -42006,12 +42000,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 3.3
-      color: 1291845632
-      priority: 227
-      cap: BUTTCAP
-    }
     lines {
       width: 1.3
       color: 5845795
@@ -42038,11 +42026,11 @@ cont {
   element {
     scale: 13
     lines {
-      width: 3.8
+      width: 3.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
@@ -42072,11 +42060,11 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.6
+      width: 4.2
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 227
       cap: BUTTCAP
@@ -42117,7 +42105,7 @@ cont {
     }
     lines {
       width: 3.6
-      color: 5845795
+      color: 3677972
       priority: 228
       cap: BUTTCAP
     }
@@ -42151,7 +42139,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -42184,7 +42172,7 @@ cont {
     }
     lines {
       width: 6.6
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -42217,7 +42205,7 @@ cont {
     }
     lines {
       width: 9.4
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -42250,7 +42238,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
@@ -42283,7 +42271,7 @@ cont {
     }
     lines {
       width: 11.6
-      color: 5845795
+      color: 3677972
       priority: 228
     }
     path_text {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 6f36a6f53c..fb660787a0 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 a8e65070f7..d5f5cc6f90 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -9853,7 +9853,7 @@ cont {
     }
     lines {
       width: 5.1
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -9879,7 +9879,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -9905,7 +9905,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -9931,7 +9931,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -9957,7 +9957,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -10812,7 +10812,7 @@ cont {
     }
     lines {
       width: 3.7
-      color: 1308402786
+      color: 16557154
       priority: 250
       join: BEVELJOIN
       cap: BUTTCAP
@@ -10835,18 +10835,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 6.6
+      width: 6.2
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 249
       cap: BUTTCAP
     }
     lines {
       width: 4.6
-      color: 16557154
+      color: 452764770
       priority: 250
       cap: BUTTCAP
     }
@@ -10868,18 +10868,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 6.4
+      width: 6.5
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 249
       cap: BUTTCAP
     }
     lines {
       width: 4.9
-      color: 16557154
+      color: 452764770
       priority: 250
       cap: BUTTCAP
     }
@@ -10901,7 +10901,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.7
+      width: 8.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -10912,7 +10912,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16748864
+      color: 872195170
       priority: 250
       cap: BUTTCAP
     }
@@ -10934,7 +10934,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 11.2
+      width: 11.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -10945,7 +10945,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -10966,7 +10966,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 17.2
+      width: 17.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -10977,7 +10977,7 @@ cont {
     }
     lines {
       width: 15.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -10998,7 +10998,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27.7
+      width: 27.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -11009,7 +11009,7 @@ cont {
     }
     lines {
       width: 25.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -11030,7 +11030,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 37.0
+      width: 36.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -11041,7 +11041,7 @@ cont {
     }
     lines {
       width: 34.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -11062,7 +11062,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 37.0
+      width: 36.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -11073,7 +11073,7 @@ cont {
     }
     lines {
       width: 34.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -11883,12 +11883,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 4.5
-      color: 1300267136
-      priority: 167
-      cap: BUTTCAP
-    }
     lines {
       width: 2.5
       color: 1308594496
@@ -11914,18 +11908,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 167
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 16557154
+      color: 452764770
       priority: 168
       cap: BUTTCAP
     }
@@ -11947,18 +11941,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.27
+      width: 4.97
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 167
       cap: BUTTCAP
     }
     lines {
       width: 3.37
-      color: 16557154
+      color: 452764770
       priority: 168
       cap: BUTTCAP
     }
@@ -11980,7 +11974,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 6.1
+      width: 7.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -11991,7 +11985,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16748864
+      color: 872195170
       priority: 168
       cap: BUTTCAP
     }
@@ -12013,7 +12007,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8.8
+      width: 9.2
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -12024,7 +12018,7 @@ cont {
     }
     lines {
       width: 7.2
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -12056,7 +12050,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -12077,7 +12071,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 20.3
+      width: 20.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -12088,7 +12082,7 @@ cont {
     }
     lines {
       width: 18.0
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -12109,7 +12103,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 26.5
+      width: 26.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -12120,7 +12114,7 @@ cont {
     }
     lines {
       width: 24.0
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -12141,7 +12135,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 26.5
+      width: 26.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -12152,7 +12146,7 @@ cont {
     }
     lines {
       width: 24.0
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -13634,18 +13628,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.2
+      width: 5.1
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 229
       cap: BUTTCAP
     }
     lines {
       width: 3.5
-      color: 1308402786
+      color: 452764770
       priority: 230
       cap: BUTTCAP
     }
@@ -13667,7 +13661,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 5.3
+      width: 6.2
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -13678,7 +13672,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 16756055
+      color: 872195170
       priority: 230
       cap: BUTTCAP
     }
@@ -13700,7 +13694,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8.1
+      width: 8.5
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -13711,7 +13705,7 @@ cont {
     }
     lines {
       width: 6.5
-      color: 16756055
+      color: 872195170
       priority: 230
     }
     path_text {
@@ -13732,7 +13726,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 14.8
+      width: 15.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -13743,7 +13737,7 @@ cont {
     }
     lines {
       width: 13.0
-      color: 16756055
+      color: 872195170
       priority: 230
     }
     path_text {
@@ -13764,7 +13758,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 24.2
+      width: 24.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -13775,7 +13769,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 16756055
+      color: 872195170
       priority: 230
     }
     path_text {
@@ -13796,7 +13790,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 29.6
+      width: 29.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -13807,7 +13801,7 @@ cont {
     }
     lines {
       width: 27.0
-      color: 16756055
+      color: 872195170
       priority: 230
     }
     path_text {
@@ -13828,7 +13822,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 29.6
+      width: 29.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -13839,7 +13833,7 @@ cont {
     }
     lines {
       width: 27.0
-      color: 16756055
+      color: 872195170
       priority: 230
     }
     path_text {
@@ -14562,18 +14556,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.2
+      width: 5.1
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 165
       cap: BUTTCAP
     }
     lines {
       width: 3.5
-      color: 1308402786
+      color: 452764770
       priority: 166
       cap: BUTTCAP
     }
@@ -14595,7 +14589,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 5.3
+      width: 6.2
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -14606,7 +14600,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 16756055
+      color: 872195170
       priority: 166
       cap: BUTTCAP
     }
@@ -14628,7 +14622,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8.1
+      width: 8.5
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -14639,7 +14633,7 @@ cont {
     }
     lines {
       width: 6.5
-      color: 16756055
+      color: 872195170
       priority: 166
     }
     path_text {
@@ -14660,7 +14654,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 14.8
+      width: 15.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -14671,7 +14665,7 @@ cont {
     }
     lines {
       width: 13.0
-      color: 16756055
+      color: 872195170
       priority: 166
     }
     path_text {
@@ -14692,7 +14686,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 24.2
+      width: 24.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -14703,7 +14697,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 16756055
+      color: 872195170
       priority: 166
     }
     path_text {
@@ -14724,7 +14718,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 29.6
+      width: 29.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -14735,7 +14729,7 @@ cont {
     }
     lines {
       width: 27.0
-      color: 16756055
+      color: 872195170
       priority: 166
     }
     path_text {
@@ -14756,7 +14750,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 29.6
+      width: 29.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -14767,7 +14761,7 @@ cont {
     }
     lines {
       width: 27.0
-      color: 16756055
+      color: 872195170
       priority: 166
     }
     path_text {
@@ -15628,7 +15622,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6.1
+      width: 7.1
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -15639,7 +15633,7 @@ cont {
     }
     lines {
       width: 5.1
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -15660,7 +15654,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 9.4
+      width: 10.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -15671,7 +15665,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -15692,7 +15686,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 13.6
+      width: 14.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -15703,7 +15697,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -15735,7 +15729,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -15767,7 +15761,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 16777215
+      color: 872415231
       priority: 170
     }
     path_text {
@@ -17108,7 +17102,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 7.6
+      width: 8.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17119,7 +17113,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16777215
+      color: 872415231
       priority: 210
     }
     path_text {
@@ -17140,7 +17134,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 11.4
+      width: 11.6
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17151,7 +17145,7 @@ cont {
     }
     lines {
       width: 9.6
-      color: 16777215
+      color: 872415231
       priority: 210
     }
     path_text {
@@ -17172,7 +17166,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 17.2
+      width: 17.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17183,7 +17177,7 @@ cont {
     }
     lines {
       width: 15.0
-      color: 16777215
+      color: 872415231
       priority: 210
     }
     path_text {
@@ -17204,7 +17198,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 24.6
+      width: 24.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17215,7 +17209,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 16777215
+      color: 872415231
       priority: 210
     }
     path_text {
@@ -17236,7 +17230,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 24.6
+      width: 24.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17247,7 +17241,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 16777215
+      color: 872415231
       priority: 210
     }
     path_text {
@@ -17698,7 +17692,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 7.6
+      width: 8.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17709,7 +17703,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16777215
+      color: 872415231
       priority: 164
     }
     path_text {
@@ -17724,7 +17718,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 11.4
+      width: 11.6
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17735,7 +17729,7 @@ cont {
     }
     lines {
       width: 9.6
-      color: 16777215
+      color: 872415231
       priority: 164
     }
     path_text {
@@ -17750,7 +17744,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 17.2
+      width: 17.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17761,7 +17755,7 @@ cont {
     }
     lines {
       width: 15.0
-      color: 16777215
+      color: 872415231
       priority: 164
     }
     path_text {
@@ -17776,7 +17770,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 24.6
+      width: 24.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17787,7 +17781,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 16777215
+      color: 872415231
       priority: 164
     }
     path_text {
@@ -17802,7 +17796,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 24.6
+      width: 24.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -17813,7 +17807,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 16777215
+      color: 872415231
       priority: 164
     }
     path_text {
@@ -19387,7 +19381,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6.5
+      width: 7.4
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19398,7 +19392,7 @@ cont {
     }
     lines {
       width: 5.4
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -19419,7 +19413,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 9.9
+      width: 10.4
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19430,7 +19424,7 @@ cont {
     }
     lines {
       width: 8.4
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -19451,7 +19445,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 15.8
+      width: 16.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19462,7 +19456,7 @@ cont {
     }
     lines {
       width: 14.0
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -19483,7 +19477,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 22.2
+      width: 22.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19494,7 +19488,7 @@ cont {
     }
     lines {
       width: 20.0
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -19515,7 +19509,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 22.2
+      width: 22.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19526,7 +19520,7 @@ cont {
     }
     lines {
       width: 20.0
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -19900,7 +19894,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6.5
+      width: 7.4
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19911,14 +19905,14 @@ cont {
     }
     lines {
       width: 5.4
-      color: 16777215
+      color: 872415231
       priority: 162
     }
   }
   element {
     scale: 17
     lines {
-      width: 9.9
+      width: 10.4
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19929,14 +19923,14 @@ cont {
     }
     lines {
       width: 8.4
-      color: 16777215
+      color: 872415231
       priority: 162
     }
   }
   element {
     scale: 18
     lines {
-      width: 15.8
+      width: 16.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19947,7 +19941,7 @@ cont {
     }
     lines {
       width: 14.0
-      color: 16777215
+      color: 872415231
       priority: 162
     }
     path_text {
@@ -19962,7 +19956,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 22.2
+      width: 22.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19973,7 +19967,7 @@ cont {
     }
     lines {
       width: 20.0
-      color: 16777215
+      color: 872415231
       priority: 162
     }
     path_text {
@@ -19988,7 +19982,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 22.2
+      width: 22.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -19999,7 +19993,7 @@ cont {
     }
     lines {
       width: 20.0
-      color: 16777215
+      color: 872415231
       priority: 162
     }
     path_text {
@@ -21447,7 +21441,7 @@ cont {
     }
     lines {
       width: 3.7
-      color: 1308402786
+      color: 16557154
       priority: 250
       join: BEVELJOIN
       cap: BUTTCAP
@@ -21470,18 +21464,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 6.6
+      width: 6.2
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 249
       cap: BUTTCAP
     }
     lines {
       width: 4.6
-      color: 16557154
+      color: 452764770
       priority: 250
       cap: BUTTCAP
     }
@@ -21503,18 +21497,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 6.4
+      width: 6.5
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 249
       cap: BUTTCAP
     }
     lines {
       width: 4.9
-      color: 16557154
+      color: 452764770
       priority: 250
       cap: BUTTCAP
     }
@@ -21536,7 +21530,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.7
+      width: 8.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -21547,7 +21541,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 16748864
+      color: 872195170
       priority: 250
       cap: BUTTCAP
     }
@@ -21569,7 +21563,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 11.2
+      width: 11.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -21580,7 +21574,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -21601,7 +21595,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 17.2
+      width: 17.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -21612,7 +21606,7 @@ cont {
     }
     lines {
       width: 15.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -21633,7 +21627,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27.7
+      width: 27.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -21644,7 +21638,7 @@ cont {
     }
     lines {
       width: 25.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -21665,7 +21659,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 37.0
+      width: 36.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -21676,7 +21670,7 @@ cont {
     }
     lines {
       width: 34.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -21697,7 +21691,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 37.0
+      width: 36.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -21708,7 +21702,7 @@ cont {
     }
     lines {
       width: 34.0
-      color: 16748864
+      color: 872195170
       priority: 250
     }
     path_text {
@@ -22455,12 +22449,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 4.5
-      color: 1300267136
-      priority: 167
-      cap: BUTTCAP
-    }
     lines {
       width: 2.5
       color: 1308594496
@@ -22486,18 +22474,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 167
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 16557154
+      color: 452764770
       priority: 168
       cap: BUTTCAP
     }
@@ -22519,18 +22507,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.27
+      width: 4.97
       color: 1300267136
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 167
       cap: BUTTCAP
     }
     lines {
       width: 3.37
-      color: 16557154
+      color: 452764770
       priority: 168
       cap: BUTTCAP
     }
@@ -22552,7 +22540,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 6.1
+      width: 7.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -22563,7 +22551,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 16748864
+      color: 872195170
       priority: 168
       cap: BUTTCAP
     }
@@ -22585,7 +22573,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8.8
+      width: 9.2
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -22596,7 +22584,7 @@ cont {
     }
     lines {
       width: 7.2
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -22628,7 +22616,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -22649,7 +22637,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 20.3
+      width: 20.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -22660,7 +22648,7 @@ cont {
     }
     lines {
       width: 18.0
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -22681,7 +22669,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 26.5
+      width: 26.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -22692,7 +22680,7 @@ cont {
     }
     lines {
       width: 24.0
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -22713,7 +22701,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 26.5
+      width: 26.0
       color: 1300267136
       dashdot {
         dd: 5.0
@@ -22724,7 +22712,7 @@ cont {
     }
     lines {
       width: 24.0
-      color: 16748864
+      color: 872195170
       priority: 168
     }
     path_text {
@@ -23344,7 +23332,7 @@ cont {
     }
     lines {
       width: 5.1
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -23370,7 +23358,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -23396,7 +23384,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -23422,7 +23410,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
@@ -23448,7 +23436,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 16777215
+      color: 872415231
       priority: 190
     }
     path_text {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 87ad4c9411..82c3e07702 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 cbd2172817..35d40817a9 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -9853,7 +9853,7 @@ cont {
     }
     lines {
       width: 5.1
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -9879,7 +9879,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -9905,7 +9905,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -9931,7 +9931,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -9957,7 +9957,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -10860,7 +10860,7 @@ cont {
     }
     lines {
       width: 3.7
-      color: 1295523604
+      color: 3677972
       priority: 250
       join: BEVELJOIN
       cap: BUTTCAP
@@ -10885,18 +10885,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 6.6
+      width: 6.2
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 249
       cap: BUTTCAP
     }
     lines {
       width: 4.6
-      color: 3677972
+      color: 439885588
       priority: 250
       cap: BUTTCAP
     }
@@ -10920,18 +10920,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 6.4
+      width: 6.5
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 249
       cap: BUTTCAP
     }
     lines {
       width: 4.9
-      color: 3677972
+      color: 439885588
       priority: 250
       cap: BUTTCAP
     }
@@ -10955,7 +10955,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.7
+      width: 8.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -10966,7 +10966,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 4991513
+      color: 859315988
       priority: 250
       cap: BUTTCAP
     }
@@ -10990,7 +10990,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 11.2
+      width: 11.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -11001,7 +11001,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -11024,7 +11024,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 17.2
+      width: 17.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -11035,7 +11035,7 @@ cont {
     }
     lines {
       width: 15.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -11058,7 +11058,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27.7
+      width: 27.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -11069,7 +11069,7 @@ cont {
     }
     lines {
       width: 25.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -11092,7 +11092,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 37.0
+      width: 36.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -11103,7 +11103,7 @@ cont {
     }
     lines {
       width: 34.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -11126,7 +11126,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 37.0
+      width: 36.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -11137,7 +11137,7 @@ cont {
     }
     lines {
       width: 34.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -11997,12 +11997,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 4.5
-      color: 1291845632
-      priority: 167
-      cap: BUTTCAP
-    }
     lines {
       width: 2.5
       color: 1296837145
@@ -12030,18 +12024,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 167
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 3677972
+      color: 439885588
       priority: 168
       cap: BUTTCAP
     }
@@ -12065,18 +12059,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.27
+      width: 4.97
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 167
       cap: BUTTCAP
     }
     lines {
       width: 3.37
-      color: 3677972
+      color: 439885588
       priority: 168
       cap: BUTTCAP
     }
@@ -12100,7 +12094,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 6.1
+      width: 7.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -12111,7 +12105,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 4991513
+      color: 859315988
       priority: 168
       cap: BUTTCAP
     }
@@ -12135,7 +12129,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8.8
+      width: 9.2
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -12146,7 +12140,7 @@ cont {
     }
     lines {
       width: 7.2
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -12180,7 +12174,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -12203,7 +12197,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 20.3
+      width: 20.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -12214,7 +12208,7 @@ cont {
     }
     lines {
       width: 18.0
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -12237,7 +12231,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 26.5
+      width: 26.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -12248,7 +12242,7 @@ cont {
     }
     lines {
       width: 24.0
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -12271,7 +12265,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 26.5
+      width: 26.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -12282,7 +12276,7 @@ cont {
     }
     lines {
       width: 24.0
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -13818,18 +13812,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.2
+      width: 5.1
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 229
       cap: BUTTCAP
     }
     lines {
       width: 3.5
-      color: 1296837147
+      color: 441199131
       priority: 230
       cap: BUTTCAP
     }
@@ -13853,7 +13847,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 5.3
+      width: 6.2
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -13864,7 +13858,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6173981
+      color: 860629531
       priority: 230
       cap: BUTTCAP
     }
@@ -13888,7 +13882,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8.1
+      width: 8.5
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -13899,7 +13893,7 @@ cont {
     }
     lines {
       width: 6.5
-      color: 6173981
+      color: 860629531
       priority: 230
     }
     path_text {
@@ -13922,7 +13916,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 14.8
+      width: 15.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -13933,7 +13927,7 @@ cont {
     }
     lines {
       width: 13.0
-      color: 6173981
+      color: 860629531
       priority: 230
     }
     path_text {
@@ -13956,7 +13950,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 24.2
+      width: 24.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -13967,7 +13961,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 6173981
+      color: 860629531
       priority: 230
     }
     path_text {
@@ -13990,7 +13984,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 29.6
+      width: 29.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -14001,7 +13995,7 @@ cont {
     }
     lines {
       width: 27.0
-      color: 6173981
+      color: 860629531
       priority: 230
     }
     path_text {
@@ -14024,7 +14018,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 29.6
+      width: 29.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -14035,7 +14029,7 @@ cont {
     }
     lines {
       width: 27.0
-      color: 6173981
+      color: 860629531
       priority: 230
     }
     path_text {
@@ -14806,18 +14800,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.2
+      width: 5.1
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 165
       cap: BUTTCAP
     }
     lines {
       width: 3.5
-      color: 1296837147
+      color: 441199131
       priority: 166
       cap: BUTTCAP
     }
@@ -14841,7 +14835,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 5.3
+      width: 6.2
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -14852,7 +14846,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6173981
+      color: 860629531
       priority: 166
       cap: BUTTCAP
     }
@@ -14876,7 +14870,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8.1
+      width: 8.5
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -14887,7 +14881,7 @@ cont {
     }
     lines {
       width: 6.5
-      color: 6173981
+      color: 860629531
       priority: 166
     }
     path_text {
@@ -14910,7 +14904,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 14.8
+      width: 15.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -14921,7 +14915,7 @@ cont {
     }
     lines {
       width: 13.0
-      color: 6173981
+      color: 860629531
       priority: 166
     }
     path_text {
@@ -14944,7 +14938,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 24.2
+      width: 24.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -14955,7 +14949,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 6173981
+      color: 860629531
       priority: 166
     }
     path_text {
@@ -14978,7 +14972,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 29.6
+      width: 29.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -14989,7 +14983,7 @@ cont {
     }
     lines {
       width: 27.0
-      color: 6173981
+      color: 860629531
       priority: 166
     }
     path_text {
@@ -15012,7 +15006,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 29.6
+      width: 29.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -15023,7 +15017,7 @@ cont {
     }
     lines {
       width: 27.0
-      color: 6173981
+      color: 860629531
       priority: 166
     }
     path_text {
@@ -15924,7 +15918,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6.1
+      width: 7.1
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -15935,7 +15929,7 @@ cont {
     }
     lines {
       width: 5.1
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -15958,7 +15952,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 9.4
+      width: 10.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -15969,7 +15963,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -15992,7 +15986,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 13.6
+      width: 14.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -16003,7 +15997,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -16037,7 +16031,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -16071,7 +16065,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 2828327
+      color: 858466343
       priority: 170
     }
     path_text {
@@ -17458,7 +17452,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 7.6
+      width: 8.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -17469,7 +17463,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 3881273
+      color: 858466343
       priority: 210
     }
     path_text {
@@ -17492,7 +17486,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 11.4
+      width: 11.6
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -17503,7 +17497,7 @@ cont {
     }
     lines {
       width: 9.6
-      color: 3881273
+      color: 858466343
       priority: 210
     }
     path_text {
@@ -17526,7 +17520,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 17.2
+      width: 17.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -17537,7 +17531,7 @@ cont {
     }
     lines {
       width: 15.0
-      color: 2828327
+      color: 858466343
       priority: 210
     }
     path_text {
@@ -17560,7 +17554,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 24.6
+      width: 24.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -17571,7 +17565,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 2828327
+      color: 858466343
       priority: 210
     }
     path_text {
@@ -17594,7 +17588,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 24.6
+      width: 24.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -17605,7 +17599,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 2828327
+      color: 858466343
       priority: 210
     }
     path_text {
@@ -18058,7 +18052,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 7.6
+      width: 8.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -18069,7 +18063,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 3881273
+      color: 858466343
       priority: 164
     }
     path_text {
@@ -18084,7 +18078,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 11.4
+      width: 11.6
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -18095,7 +18089,7 @@ cont {
     }
     lines {
       width: 9.6
-      color: 3881273
+      color: 858466343
       priority: 164
     }
     path_text {
@@ -18110,7 +18104,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 17.2
+      width: 17.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -18121,7 +18115,7 @@ cont {
     }
     lines {
       width: 15.0
-      color: 2828327
+      color: 858466343
       priority: 164
     }
     path_text {
@@ -18136,7 +18130,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 24.6
+      width: 24.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -18147,7 +18141,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 2828327
+      color: 858466343
       priority: 164
     }
     path_text {
@@ -18162,7 +18156,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 24.6
+      width: 24.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -18173,7 +18167,7 @@ cont {
     }
     lines {
       width: 22.0
-      color: 2828327
+      color: 858466343
       priority: 164
     }
     path_text {
@@ -19785,7 +19779,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6.5
+      width: 7.4
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -19796,7 +19790,7 @@ cont {
     }
     lines {
       width: 5.4
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -19819,7 +19813,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 9.9
+      width: 10.4
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -19830,7 +19824,7 @@ cont {
     }
     lines {
       width: 8.4
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -19853,7 +19847,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 15.8
+      width: 16.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -19864,7 +19858,7 @@ cont {
     }
     lines {
       width: 14.0
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -19887,7 +19881,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 22.2
+      width: 22.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -19898,7 +19892,7 @@ cont {
     }
     lines {
       width: 20.0
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -19921,7 +19915,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 22.2
+      width: 22.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -19932,7 +19926,7 @@ cont {
     }
     lines {
       width: 20.0
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -20308,7 +20302,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6.5
+      width: 7.4
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -20319,14 +20313,14 @@ cont {
     }
     lines {
       width: 5.4
-      color: 2828327
+      color: 858466343
       priority: 162
     }
   }
   element {
     scale: 17
     lines {
-      width: 9.9
+      width: 10.4
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -20337,14 +20331,14 @@ cont {
     }
     lines {
       width: 8.4
-      color: 2828327
+      color: 858466343
       priority: 162
     }
   }
   element {
     scale: 18
     lines {
-      width: 15.8
+      width: 16.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -20355,7 +20349,7 @@ cont {
     }
     lines {
       width: 14.0
-      color: 2828327
+      color: 858466343
       priority: 162
     }
     path_text {
@@ -20370,7 +20364,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 22.2
+      width: 22.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -20381,7 +20375,7 @@ cont {
     }
     lines {
       width: 20.0
-      color: 2828327
+      color: 858466343
       priority: 162
     }
     path_text {
@@ -20396,7 +20390,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 22.2
+      width: 22.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -20407,7 +20401,7 @@ cont {
     }
     lines {
       width: 20.0
-      color: 2828327
+      color: 858466343
       priority: 162
     }
     path_text {
@@ -21903,7 +21897,7 @@ cont {
     }
     lines {
       width: 3.7
-      color: 1295523604
+      color: 3677972
       priority: 250
       join: BEVELJOIN
       cap: BUTTCAP
@@ -21928,18 +21922,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 6.6
+      width: 6.2
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 249
       cap: BUTTCAP
     }
     lines {
       width: 4.6
-      color: 3677972
+      color: 439885588
       priority: 250
       cap: BUTTCAP
     }
@@ -21963,18 +21957,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 6.4
+      width: 6.5
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 249
       cap: BUTTCAP
     }
     lines {
       width: 4.9
-      color: 3677972
+      color: 439885588
       priority: 250
       cap: BUTTCAP
     }
@@ -21998,7 +21992,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.7
+      width: 8.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -22009,7 +22003,7 @@ cont {
     }
     lines {
       width: 6.0
-      color: 4991513
+      color: 859315988
       priority: 250
       cap: BUTTCAP
     }
@@ -22033,7 +22027,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 11.2
+      width: 11.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -22044,7 +22038,7 @@ cont {
     }
     lines {
       width: 9.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -22067,7 +22061,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 17.2
+      width: 17.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -22078,7 +22072,7 @@ cont {
     }
     lines {
       width: 15.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -22101,7 +22095,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27.7
+      width: 27.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -22112,7 +22106,7 @@ cont {
     }
     lines {
       width: 25.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -22135,7 +22129,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 37.0
+      width: 36.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -22146,7 +22140,7 @@ cont {
     }
     lines {
       width: 34.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -22169,7 +22163,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 37.0
+      width: 36.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -22180,7 +22174,7 @@ cont {
     }
     lines {
       width: 34.0
-      color: 4991513
+      color: 859315988
       priority: 250
     }
     path_text {
@@ -22977,12 +22971,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 4.5
-      color: 1291845632
-      priority: 167
-      cap: BUTTCAP
-    }
     lines {
       width: 2.5
       color: 1296837145
@@ -23010,18 +22998,18 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.8
+      width: 4.4
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 167
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 3677972
+      color: 439885588
       priority: 168
       cap: BUTTCAP
     }
@@ -23045,18 +23033,18 @@ cont {
   element {
     scale: 14
     lines {
-      width: 4.27
+      width: 4.97
       color: 1291845632
       dashdot {
-        dd: 5.0
-        dd: 5.0
+        dd: 4.0
+        dd: 4.0
       }
       priority: 167
       cap: BUTTCAP
     }
     lines {
       width: 3.37
-      color: 3677972
+      color: 439885588
       priority: 168
       cap: BUTTCAP
     }
@@ -23080,7 +23068,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 6.1
+      width: 7.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -23091,7 +23079,7 @@ cont {
     }
     lines {
       width: 5.0
-      color: 4991513
+      color: 859315988
       priority: 168
       cap: BUTTCAP
     }
@@ -23115,7 +23103,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8.8
+      width: 9.2
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -23126,7 +23114,7 @@ cont {
     }
     lines {
       width: 7.2
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -23160,7 +23148,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -23183,7 +23171,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 20.3
+      width: 20.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -23194,7 +23182,7 @@ cont {
     }
     lines {
       width: 18.0
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -23217,7 +23205,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 26.5
+      width: 26.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -23228,7 +23216,7 @@ cont {
     }
     lines {
       width: 24.0
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -23251,7 +23239,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 26.5
+      width: 26.0
       color: 1291845632
       dashdot {
         dd: 5.0
@@ -23262,7 +23250,7 @@ cont {
     }
     lines {
       width: 24.0
-      color: 4991513
+      color: 859315988
       priority: 168
     }
     path_text {
@@ -23884,7 +23872,7 @@ cont {
     }
     lines {
       width: 5.1
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -23910,7 +23898,7 @@ cont {
     }
     lines {
       width: 8.0
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -23936,7 +23924,7 @@ cont {
     }
     lines {
       width: 12.0
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -23962,7 +23950,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
@@ -23988,7 +23976,7 @@ cont {
     }
     lines {
       width: 17.0
-      color: 2828327
+      color: 858466343
       priority: 190
     }
     path_text {
diff --git a/data/patterns.txt b/data/patterns.txt
index f79fb71652..fdf033e8f1 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -36,6 +36,7 @@
 7.0 3.0
 16.2 8.1
 5.0 5.0
+4.0 4.0
 4.0 2.5
 6.0 3.5
 8.0 4.5
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index bcbc347e85..ad70614ea5 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -167,14 +167,14 @@ highway-road-tunnel                                 # line z12- (also has pathte
 
 highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
 highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228
 
-# highway-motorway_link-tunnel                      # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 227
 
 highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index efdfb2b03b..cbb9725dfa 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -260,18 +260,18 @@ route-ferry                                         # pathtext z10- (also has li
 
 highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
 highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z12-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
 highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z12-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 6150
 
 highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
 highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z12-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
 highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z12-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 6140
 
 highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index 97ee44f854..a90d77befd 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -167,14 +167,14 @@ highway-road-tunnel                                 # line z12- (also has pathte
 
 highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
 highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 228
 
-# highway-motorway_link-tunnel                      # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 227
 
 highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 123ebaf465..ea4ed07e79 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -260,18 +260,18 @@ route-ferry                                         # pathtext z10- (also has li
 
 highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-)
 highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z12-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-)
 highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z12-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 6150
 
 highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-)
 highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z12-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-)
 highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z12-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 6140
 
 highway-primary_link                                # pathtext z11- (also has shield::shield z11-, line z11-)
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index 74f97eaadb..d680d5e56f 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -148,18 +148,18 @@ highway-road-tunnel                                 # line z12- (also has pathte
 
 highway-motorway_link                               # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 highway-trunk_link                                  # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z13-, pathtext z10-, shield::shield z10-)
 === 168
 
 # highway-motorway_link                             # line(casing) z14- (also has line z10-, pathtext z10-, shield::shield z10-)
 # highway-motorway_link-bridge                      # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-# highway-motorway_link-tunnel                      # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
 # highway-trunk_link                                # line(casing) z14- (also has line z10-, pathtext z10-, shield::shield z10-)
 # highway-trunk_link-bridge                         # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z13- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 167
 
 highway-primary_link                                # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 2c5400961a..4ee01e4b4e 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -44,18 +44,18 @@ highway-primary-tunnel::shield                      # shield::shield z10- (also
 
 highway-motorway_link                               # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z14-)
 highway-motorway_link-bridge                        # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-)
-highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z12-)
+highway-motorway_link-tunnel                        # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 highway-trunk_link                                  # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z14-)
 highway-trunk_link-bridge                           # pathtext z10- (also has shield::shield z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-)
-highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z12-)
+highway-trunk_link-tunnel                           # pathtext z10- (also has shield::shield z10-, line z10-, line(casing) z13-)
 === 4250
 
 highway-motorway_link::shield                       # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z14-)
 highway-motorway_link-bridge::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-)
-highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z12-)
+highway-motorway_link-tunnel::shield                # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 highway-trunk_link::shield                          # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z14-)
 highway-trunk_link-bridge::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-)
-highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z12-)
+highway-trunk_link-tunnel::shield                   # shield::shield z10- (also has pathtext z10-, line z10-, line(casing) z13-)
 === 4240
 
 highway-motorway_junction                           # caption z15-