diff --git a/data/colors.txt b/data/colors.txt
index c73e35f58..7abdccabf 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -148,7 +148,6 @@
 6247213
 6272197
 6291544
-6315774
 6381914
 6381921
 6510384
@@ -164,6 +163,7 @@
 6967599
 7105644
 7224647
+7302655
 7353344
 7434609
 7542806
@@ -344,10 +344,10 @@
 441199131
 441272132
 441403975
-442523390
 442905727
 443115881
 443432263
+443510271
 446405263
 451800027
 452107824
@@ -397,11 +397,11 @@
 861690961
 861690972
 861885229
-861953790
 862076287
 862148400
 862348902
 862862663
+862940671
 863203947
 863664762
 863850275
@@ -424,6 +424,7 @@
 871811973
 872195170
 872215006
+872413941
 872414974
 872415231
 1074136576
@@ -560,11 +561,11 @@
 1717150383
 1717328977
 1717523245
-1717591806
 1717714303
 1717786416
 1717789532
 1718500679
+1718578687
 1719302778
 1719488291
 1720223880
@@ -605,10 +606,10 @@
 2153536593
 2153755845
 2153769774
-2153799422
 2153921919
 2153997148
 2154708295
+2154786303
 2154984050
 2155510394
 2155695907
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b3bdbb5df..cdbe5d39c 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 94f643b9b..1e3bc8083 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -24044,7 +24044,7 @@ cont {
     scale: 11
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24053,7 +24053,7 @@ cont {
     scale: 12
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24062,7 +24062,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24071,7 +24071,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -24080,7 +24080,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -24097,7 +24097,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24113,7 +24113,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24129,7 +24129,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24145,7 +24145,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24161,7 +24161,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24180,7 +24180,7 @@ cont {
     scale: 11
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24189,7 +24189,7 @@ cont {
     scale: 12
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24198,7 +24198,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24207,7 +24207,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -24222,7 +24222,7 @@ cont {
     }
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -24245,7 +24245,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24273,7 +24273,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24301,7 +24301,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24329,7 +24329,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24357,7 +24357,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -24376,7 +24376,7 @@ cont {
     scale: 11
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24385,7 +24385,7 @@ cont {
     scale: 12
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24394,7 +24394,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -24403,7 +24403,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -24412,7 +24412,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -24429,7 +24429,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -24445,7 +24445,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     lines {
@@ -24477,7 +24477,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -24509,7 +24509,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -24541,7 +24541,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -24990,19 +24990,19 @@ cont {
   element {
     scale: 11
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25017,19 +25017,19 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25044,19 +25044,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25071,19 +25071,19 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25098,19 +25098,19 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -25125,18 +25125,18 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
-      color: 861953790
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
-      priority: 220
+      width: 0.8
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 2.0
-      color: 587201269
-      priority: 219
+      color: 452983541
+      dashdot {
+        dd: 8.0
+        dd: 10.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -25150,18 +25150,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.4
-      color: 442523390
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
-      priority: 220
+      width: 1.1
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 2.4
-      color: 452983541
-      priority: 219
+      color: 16775925
+      dashdot {
+        dd: 10.0
+        dd: 11.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -25175,18 +25175,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 3.2
-      color: 6315774
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
-      priority: 220
+      width: 1.4
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 3.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 15.0
+        dd: 15.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -25200,18 +25200,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 4.2
-      color: 6315774
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      width: 2.0
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 4.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -25225,18 +25225,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 4.2
-      color: 6315774
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      width: 2.0
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 4.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -28880,7 +28880,7 @@ cont {
     scale: 11
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -28903,7 +28903,7 @@ cont {
     scale: 12
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -28926,7 +28926,7 @@ cont {
     scale: 13
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -28949,7 +28949,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -28972,7 +28972,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -29003,7 +29003,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       dashdot {
         dd: 7.5
         dd: 9.5
@@ -29032,7 +29032,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       dashdot {
         dd: 8.0
         dd: 9.4
@@ -29061,7 +29061,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 8.5
         dd: 9.3
@@ -29090,7 +29090,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 9.0
         dd: 9.2
@@ -29119,7 +29119,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 9.0
         dd: 9.2
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 36b79fc66..df219ffa3 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 7384b07a5..54902adb8 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -23341,19 +23341,19 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 862862663
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7224647
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 575358531
-      priority: 219
+      color: 860571203
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -23368,18 +23368,18 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
-      color: 862862663
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
-      priority: 220
+      width: 0.8
+      color: 7224647
+      priority: 219
     }
     lines {
       width: 2.0
-      color: 575358531
-      priority: 219
+      color: 441140803
+      dashdot {
+        dd: 8.0
+        dd: 10.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23393,18 +23393,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.4
-      color: 443432263
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
-      priority: 220
+      width: 1.1
+      color: 7224647
+      priority: 219
     }
     lines {
       width: 2.4
-      color: 441140803
-      priority: 219
+      color: 4933187
+      dashdot {
+        dd: 10.0
+        dd: 11.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23418,18 +23418,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 3.2
+      width: 1.4
       color: 7224647
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
-      priority: 220
+      priority: 219
     }
     lines {
       width: 3.2
       color: 4933187
-      priority: 219
+      dashdot {
+        dd: 15.0
+        dd: 15.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23443,18 +23443,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 4.2
+      width: 2.0
       color: 7224647
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      priority: 219
     }
     lines {
       width: 4.2
       color: 4933187
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23468,18 +23468,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 4.2
+      width: 2.0
       color: 7224647
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      priority: 219
     }
     lines {
       width: 4.2
       color: 4933187
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index febaf8de3..4f3c667c0 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index c2c2ce340..05e3acc25 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -22554,7 +22554,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -22563,7 +22563,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -22572,7 +22572,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -22589,7 +22589,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22605,7 +22605,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22621,7 +22621,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22637,7 +22637,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22653,7 +22653,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22672,7 +22672,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -22681,7 +22681,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -22696,7 +22696,7 @@ cont {
     }
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -22719,7 +22719,7 @@ cont {
     }
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22747,7 +22747,7 @@ cont {
     }
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22775,7 +22775,7 @@ cont {
     }
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22803,7 +22803,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22831,7 +22831,7 @@ cont {
     }
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     path_text {
@@ -22850,7 +22850,7 @@ cont {
     scale: 13
     lines {
       width: 1.0
-      color: 2153799422
+      color: 2154786303
       priority: 218
       cap: BUTTCAP
     }
@@ -22859,7 +22859,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       priority: 218
       cap: BUTTCAP
     }
@@ -22868,7 +22868,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       priority: 218
       cap: BUTTCAP
     }
@@ -22885,7 +22885,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     path_text {
@@ -22901,7 +22901,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       priority: 218
     }
     lines {
@@ -22933,7 +22933,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -22965,7 +22965,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -22997,7 +22997,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       priority: 218
     }
     lines {
@@ -23341,19 +23341,19 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 861953790
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
-      priority: 220
+      width: 0.7
+      color: 7302655
+      priority: 219
       cap: BUTTCAP
     }
     lines {
       width: 1.5
-      color: 587201269
-      priority: 219
+      color: 872413941
+      dashdot {
+        dd: 6.0
+        dd: 9.0
+      }
+      priority: 220
       cap: BUTTCAP
     }
     path_text {
@@ -23368,18 +23368,18 @@ cont {
   element {
     scale: 16
     lines {
-      width: 2.0
-      color: 861953790
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
-      priority: 220
+      width: 0.8
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 2.0
-      color: 587201269
-      priority: 219
+      color: 452983541
+      dashdot {
+        dd: 8.0
+        dd: 10.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23393,18 +23393,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.4
-      color: 442523390
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
-      priority: 220
+      width: 1.1
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 2.4
-      color: 452983541
-      priority: 219
+      color: 16775925
+      dashdot {
+        dd: 10.0
+        dd: 11.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23418,18 +23418,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 3.2
-      color: 6315774
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
-      priority: 220
+      width: 1.4
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 3.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 15.0
+        dd: 15.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23443,18 +23443,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 4.2
-      color: 6315774
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      width: 2.0
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 4.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -23468,18 +23468,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 4.2
-      color: 6315774
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
-      priority: 220
+      width: 2.0
+      color: 7302655
+      priority: 219
     }
     lines {
       width: 4.2
       color: 16775925
-      priority: 219
+      dashdot {
+        dd: 20.0
+        dd: 20.0
+      }
+      priority: 220
     }
     path_text {
       primary {
@@ -26876,7 +26876,7 @@ cont {
     scale: 14
     lines {
       width: 1.2
-      color: 1717591806
+      color: 1718578687
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -26899,7 +26899,7 @@ cont {
     scale: 15
     lines {
       width: 1.5
-      color: 861953790
+      color: 862940671
       dashdot {
         dd: 7.0
         dd: 9.6
@@ -26930,7 +26930,7 @@ cont {
     scale: 16
     lines {
       width: 2.0
-      color: 442523390
+      color: 443510271
       dashdot {
         dd: 7.5
         dd: 9.5
@@ -26959,7 +26959,7 @@ cont {
     scale: 17
     lines {
       width: 2.4
-      color: 442523390
+      color: 443510271
       dashdot {
         dd: 8.0
         dd: 9.4
@@ -26988,7 +26988,7 @@ cont {
     scale: 18
     lines {
       width: 3.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 8.5
         dd: 9.3
@@ -27017,7 +27017,7 @@ cont {
     scale: 19
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 9.0
         dd: 9.2
@@ -27046,7 +27046,7 @@ cont {
     scale: 20
     lines {
       width: 4.2
-      color: 6315774
+      color: 7302655
       dashdot {
         dd: 9.0
         dd: 9.2
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 8117c5cb7..a5e2bb5e6 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 514256648..1f737ed0c 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -24671,10 +24671,6 @@ cont {
     lines {
       width: 1.5
       color: 862862663
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
       priority: 170
       cap: BUTTCAP
     }
@@ -24702,10 +24698,6 @@ cont {
     lines {
       width: 1.7
       color: 862862663
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
       priority: 170
     }
     lines {
@@ -24731,10 +24723,6 @@ cont {
     lines {
       width: 2.0
       color: 862862663
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
       priority: 170
     }
     lines {
@@ -24760,10 +24748,6 @@ cont {
     lines {
       width: 2.4
       color: 862862663
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
       priority: 170
     }
     lines {
@@ -24789,10 +24773,6 @@ cont {
     lines {
       width: 2.4
       color: 862862663
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
       priority: 170
     }
     lines {
@@ -24818,10 +24798,6 @@ cont {
     lines {
       width: 2.4
       color: 862862663
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
       priority: 170
     }
     lines {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 8cba39370..a0af841fa 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 217dba025..c348309c8 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -24671,10 +24671,6 @@ cont {
     lines {
       width: 1.5
       color: 861097451
-      dashdot {
-        dd: 7.0
-        dd: 9.6
-      }
       priority: 170
       cap: BUTTCAP
     }
@@ -24702,10 +24698,6 @@ cont {
     lines {
       width: 1.7
       color: 861097451
-      dashdot {
-        dd: 7.5
-        dd: 9.5
-      }
       priority: 170
     }
     lines {
@@ -24731,10 +24723,6 @@ cont {
     lines {
       width: 2.0
       color: 861097451
-      dashdot {
-        dd: 8.0
-        dd: 9.4
-      }
       priority: 170
     }
     lines {
@@ -24760,10 +24748,6 @@ cont {
     lines {
       width: 2.4
       color: 861097451
-      dashdot {
-        dd: 8.5
-        dd: 9.3
-      }
       priority: 170
     }
     lines {
@@ -24789,10 +24773,6 @@ cont {
     lines {
       width: 2.4
       color: 861097451
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
       priority: 170
     }
     lines {
@@ -24818,10 +24798,6 @@ cont {
     lines {
       width: 2.4
       color: 861097451
-      dashdot {
-        dd: 9.0
-        dd: 9.2
-      }
       priority: 170
     }
     lines {
diff --git a/data/patterns.txt b/data/patterns.txt
index 8eda91dba..0328ce2ef 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -28,11 +28,11 @@
 6.0 1.8
 8.0 2.3
 10.0 2.7
-7.0 9.6
-7.5 9.5
-8.0 9.4
-8.5 9.3
-9.0 9.2
+6.0 9.0
+8.0 10.0
+10.0 11.0
+15.0 15.0
+20.0 20.0
 4.0 1.0
 6.0 1.3
 8.0 1.5
@@ -45,9 +45,14 @@
 4.0 2.5
 6.0 3.5
 8.0 4.5
+7.0 9.6
 3.5 2.7
+7.5 9.5
 4.0 3.2
+8.0 9.4
+8.5 9.3
 6.0 4.7
+9.0 9.2
 8.0 6.2
 1.0 2.0
 1.8 2.5