diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index a5e2bb5e6..54911ff93 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 1f737ed0c..8793412b1 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -23564,7 +23564,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 1.1
       color: 1299070279
       priority: 330
       join: BEVELJOIN
@@ -23574,7 +23574,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.3
       color: 862862663
       priority: 330
       cap: BUTTCAP
@@ -23591,7 +23591,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.6
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -23608,7 +23608,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
+      width: 2.0
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -23625,7 +23625,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
+      width: 2.6
       color: 7224647
       priority: 330
     }
@@ -23641,7 +23641,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 3.3
       color: 7224647
       priority: 330
     }
@@ -23657,7 +23657,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
@@ -23673,7 +23673,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
@@ -23689,7 +23689,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
@@ -23718,7 +23718,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 1.1
       color: 1299070279
       priority: 330
       join: BEVELJOIN
@@ -23728,7 +23728,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.3
       color: 862862663
       priority: 330
       cap: BUTTCAP
@@ -23745,7 +23745,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.6
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -23762,13 +23762,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 4.0
+      width: 5.0
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
+      width: 2.0
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -23785,13 +23785,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 4.4
+      width: 6.2
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.7
+      width: 2.6
       color: 7224647
       priority: 330
     }
@@ -23807,19 +23807,19 @@ cont {
   element {
     scale: 17
     lines {
-      width: 7.0
+      width: 9.6
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 6.0
+      width: 8.6
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
+      width: 3.3
       color: 7224647
       priority: 330
     }
@@ -23835,19 +23835,19 @@ cont {
   element {
     scale: 18
     lines {
-      width: 9.8
+      width: 13.0
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.8
+      width: 12.0
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
@@ -23863,19 +23863,19 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 14.0
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
@@ -23891,19 +23891,19 @@ cont {
   element {
     scale: 20
     lines {
-      width: 10.8
+      width: 14.0
       color: 1297109072
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 858532890
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
@@ -23932,7 +23932,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 1.1
       color: 1299070279
       priority: 330
       join: BEVELJOIN
@@ -23942,7 +23942,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.3
       color: 862862663
       priority: 330
       cap: BUTTCAP
@@ -23959,7 +23959,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.6
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -23976,7 +23976,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
+      width: 2.0
       color: 7224647
       priority: 330
       cap: BUTTCAP
@@ -23993,7 +23993,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
+      width: 2.6
       color: 7224647
       priority: 330
     }
@@ -24009,18 +24009,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 3.3
       color: 7224647
       priority: 330
     }
     lines {
-      width: 6.0
+      width: 8.6
       color: 1294740506
       priority: 154
       cap: BUTTCAP
     }
     lines {
-      width: 7.0
+      width: 9.6
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -24041,18 +24041,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
     lines {
-      width: 8.8
+      width: 12.0
       color: 1294740506
       priority: 154
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -24073,18 +24073,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 1294740506
       priority: 154
       cap: BUTTCAP
     }
     lines {
-      width: 10.8
+      width: 14.0
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -24105,18 +24105,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       priority: 330
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 1294740506
       priority: 154
       cap: BUTTCAP
     }
     lines {
-      width: 10.8
+      width: 14.0
       color: 1297109072
       dashdot {
         dd: 2.0
@@ -24593,7 +24593,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 180
+      priority: 332
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -24604,10 +24604,10 @@ cont {
       width: 1.1
       color: 1296778819
       dashdot {
-        dd: 3.5
-        dd: 2.5
+        dd: 2.0
+        dd: 6.0
       }
-      priority: 180
+      priority: 332
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -24615,19 +24615,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
-      color: 862862663
-      priority: 170
+      width: 0.5
+      color: 7224647
+      priority: 331
       cap: BUTTCAP
     }
     lines {
       width: 1.3
       color: 860571203
       dashdot {
-        dd: 4.0
         dd: 3.0
+        dd: 7.0
       }
-      priority: 180
+      priority: 332
       cap: BUTTCAP
     }
     path_text {
@@ -24636,15 +24636,15 @@ cont {
         color: 6710886
         stroke_color: 856756480
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.3
-      color: 862862663
-      priority: 170
+      width: 0.6
+      color: 7224647
+      priority: 331
       cap: BUTTCAP
     }
     lines {
@@ -24652,9 +24652,9 @@ cont {
       color: 860571203
       dashdot {
         dd: 4.0
-        dd: 3.0
+        dd: 8.0
       }
-      priority: 180
+      priority: 332
       cap: BUTTCAP
     }
     path_text {
@@ -24663,15 +24663,15 @@ cont {
         color: 6710886
         stroke_color: 856756480
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 862862663
-      priority: 170
+      width: 0.7
+      color: 7224647
+      priority: 331
       cap: BUTTCAP
     }
     lines {
@@ -24679,9 +24679,9 @@ cont {
       color: 860571203
       dashdot {
         dd: 6.0
-        dd: 4.5
+        dd: 9.0
       }
-      priority: 180
+      priority: 332
       cap: BUTTCAP
     }
     path_text {
@@ -24690,24 +24690,24 @@ cont {
         color: 6710886
         stroke_color: 856756480
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.7
-      color: 862862663
-      priority: 170
+      width: 0.8
+      color: 7224647
+      priority: 331
     }
     lines {
       width: 2.6
-      color: 860571203
+      color: 441140803
       dashdot {
-        dd: 6.0
-        dd: 4.5
+        dd: 8.0
+        dd: 10.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24715,24 +24715,24 @@ cont {
         color: 7829367
         stroke_color: 856032768
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.0
-      color: 862862663
-      priority: 170
+      width: 1.1
+      color: 7224647
+      priority: 331
     }
     lines {
       width: 3.3
-      color: 860571203
+      color: 4933187
       dashdot {
-        dd: 8.0
-        dd: 6.0
+        dd: 10.0
+        dd: 11.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24740,24 +24740,24 @@ cont {
         color: 7829367
         stroke_color: 856032768
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.4
-      color: 862862663
-      priority: 170
+      width: 1.4
+      color: 7224647
+      priority: 331
     }
     lines {
       width: 4.0
       color: 4933187
       dashdot {
-        dd: 8.0
-        dd: 6.0
+        dd: 15.0
+        dd: 15.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24765,24 +24765,24 @@ cont {
         color: 7829367
         stroke_color: 856032768
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.4
-      color: 862862663
-      priority: 170
+      width: 2.0
+      color: 7224647
+      priority: 331
     }
     lines {
       width: 4.0
       color: 4933187
       dashdot {
-        dd: 8.0
-        dd: 6.0
+        dd: 20.0
+        dd: 20.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24790,24 +24790,24 @@ cont {
         color: 7829367
         stroke_color: 856032768
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 20
     lines {
-      width: 2.4
-      color: 862862663
-      priority: 170
+      width: 2.0
+      color: 7224647
+      priority: 331
     }
     lines {
       width: 4.0
       color: 4933187
       dashdot {
-        dd: 8.0
-        dd: 6.0
+        dd: 20.0
+        dd: 20.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24815,7 +24815,7 @@ cont {
         color: 7829367
         stroke_color: 856032768
       }
-      priority: 2950
+      priority: 2954
     }
   }
 }
@@ -28494,13 +28494,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.0
-      color: 1299070279
-      priority: 170
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
     lines {
       width: 1.1
       color: 1301563922
@@ -28516,7 +28509,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.3
       color: 862862663
       priority: 170
       cap: BUTTCAP
@@ -28543,7 +28536,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.6
       color: 7224647
       dashdot {
         dd: 7.0
@@ -28574,7 +28567,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
+      width: 2.0
       color: 7224647
       dashdot {
         dd: 7.0
@@ -28605,7 +28598,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
+      width: 2.6
       color: 7224647
       dashdot {
         dd: 7.5
@@ -28634,7 +28627,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 3.3
       color: 7224647
       dashdot {
         dd: 8.0
@@ -28663,7 +28656,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       dashdot {
         dd: 8.5
@@ -28692,7 +28685,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       dashdot {
         dd: 9.0
@@ -28721,7 +28714,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
+      width: 4.0
       color: 7224647
       dashdot {
         dd: 9.0
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index a0af841fa..a61fb5068 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 c348309c8..a419c6c1d 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -23564,7 +23564,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 1.1
       color: 1297305067
       priority: 330
       join: BEVELJOIN
@@ -23574,7 +23574,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.3
       color: 861097451
       priority: 330
       cap: BUTTCAP
@@ -23591,7 +23591,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.6
       color: 5459435
       priority: 330
       cap: BUTTCAP
@@ -23608,7 +23608,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
+      width: 2.0
       color: 5459435
       priority: 330
       cap: BUTTCAP
@@ -23625,7 +23625,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
+      width: 2.6
       color: 5459435
       priority: 330
     }
@@ -23641,7 +23641,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 3.3
       color: 5459435
       priority: 330
     }
@@ -23657,7 +23657,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
@@ -23673,7 +23673,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
@@ -23689,7 +23689,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
@@ -23718,7 +23718,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 1.1
       color: 1297305067
       priority: 330
       join: BEVELJOIN
@@ -23728,7 +23728,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.3
       color: 861097451
       priority: 330
       cap: BUTTCAP
@@ -23745,7 +23745,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.6
       color: 5459435
       priority: 330
       cap: BUTTCAP
@@ -23762,13 +23762,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 4.0
+      width: 5.0
       color: 872215006
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
+      width: 2.0
       color: 5459435
       priority: 330
       cap: BUTTCAP
@@ -23785,13 +23785,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 4.4
+      width: 6.2
       color: 872215006
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 1.7
+      width: 2.6
       color: 5459435
       priority: 330
     }
@@ -23807,19 +23807,19 @@ cont {
   element {
     scale: 17
     lines {
-      width: 7.0
+      width: 9.6
       color: 1306645694
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 6.0
+      width: 8.6
       color: 872215006
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.0
+      width: 3.3
       color: 5459435
       priority: 330
     }
@@ -23835,19 +23835,19 @@ cont {
   element {
     scale: 18
     lines {
-      width: 9.8
+      width: 13.0
       color: 1306645694
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 8.8
+      width: 12.0
       color: 872215006
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
@@ -23863,19 +23863,19 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 14.0
       color: 1306645694
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 872215006
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
@@ -23891,19 +23891,19 @@ cont {
   element {
     scale: 20
     lines {
-      width: 10.8
+      width: 14.0
       color: 1306645694
       priority: 140
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 872215006
       priority: 150
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
@@ -23932,7 +23932,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.0
+      width: 1.1
       color: 1297305067
       priority: 330
       join: BEVELJOIN
@@ -23942,7 +23942,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.3
       color: 861097451
       priority: 330
       cap: BUTTCAP
@@ -23959,7 +23959,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.6
       color: 5459435
       priority: 330
       cap: BUTTCAP
@@ -23976,7 +23976,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
+      width: 2.0
       color: 5459435
       priority: 330
       cap: BUTTCAP
@@ -23993,7 +23993,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
+      width: 2.6
       color: 5459435
       priority: 330
     }
@@ -24009,18 +24009,18 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 3.3
       color: 5459435
       priority: 330
     }
     lines {
-      width: 6.0
+      width: 8.6
       color: 1308422622
       priority: 154
       cap: BUTTCAP
     }
     lines {
-      width: 7.0
+      width: 9.6
       color: 1306645694
       dashdot {
         dd: 2.0
@@ -24041,18 +24041,18 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
     lines {
-      width: 8.8
+      width: 12.0
       color: 1308422622
       priority: 154
       cap: BUTTCAP
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 1306645694
       dashdot {
         dd: 2.0
@@ -24073,18 +24073,18 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 1308422622
       priority: 154
       cap: BUTTCAP
     }
     lines {
-      width: 10.8
+      width: 14.0
       color: 1306645694
       dashdot {
         dd: 2.0
@@ -24105,18 +24105,18 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       priority: 330
     }
     lines {
-      width: 9.8
+      width: 13.0
       color: 1308422622
       priority: 154
       cap: BUTTCAP
     }
     lines {
-      width: 10.8
+      width: 14.0
       color: 1306645694
       dashdot {
         dd: 2.0
@@ -24593,7 +24593,7 @@ cont {
         dd: 3.5
         dd: 2.0
       }
-      priority: 180
+      priority: 332
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -24604,10 +24604,10 @@ cont {
       width: 1.1
       color: 1308622847
       dashdot {
-        dd: 3.5
-        dd: 2.5
+        dd: 2.0
+        dd: 6.0
       }
-      priority: 180
+      priority: 332
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -24615,19 +24615,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
-      color: 861097451
-      priority: 170
+      width: 0.5
+      color: 5459435
+      priority: 331
       cap: BUTTCAP
     }
     lines {
       width: 1.3
       color: 872415231
       dashdot {
-        dd: 4.0
         dd: 3.0
+        dd: 7.0
       }
-      priority: 180
+      priority: 332
       cap: BUTTCAP
     }
     path_text {
@@ -24636,15 +24636,15 @@ cont {
         color: 4473924
         stroke_color: 871230427
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.3
-      color: 861097451
-      priority: 170
+      width: 0.6
+      color: 5459435
+      priority: 331
       cap: BUTTCAP
     }
     lines {
@@ -24652,9 +24652,9 @@ cont {
       color: 872415231
       dashdot {
         dd: 4.0
-        dd: 3.0
+        dd: 8.0
       }
-      priority: 180
+      priority: 332
       cap: BUTTCAP
     }
     path_text {
@@ -24663,15 +24663,15 @@ cont {
         color: 4473924
         stroke_color: 871230427
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.5
-      color: 861097451
-      priority: 170
+      width: 0.7
+      color: 5459435
+      priority: 331
       cap: BUTTCAP
     }
     lines {
@@ -24679,9 +24679,9 @@ cont {
       color: 872415231
       dashdot {
         dd: 6.0
-        dd: 4.5
+        dd: 9.0
       }
-      priority: 180
+      priority: 332
       cap: BUTTCAP
     }
     path_text {
@@ -24690,24 +24690,24 @@ cont {
         color: 4473924
         stroke_color: 871230427
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.7
-      color: 861097451
-      priority: 170
+      width: 0.8
+      color: 5459435
+      priority: 331
     }
     lines {
       width: 2.6
-      color: 872415231
+      color: 452984831
       dashdot {
-        dd: 6.0
-        dd: 4.5
+        dd: 8.0
+        dd: 10.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24715,24 +24715,24 @@ cont {
         color: 3355443
         stroke_color: 872415231
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.0
-      color: 861097451
-      priority: 170
+      width: 1.1
+      color: 5459435
+      priority: 331
     }
     lines {
       width: 3.3
-      color: 872415231
+      color: 16777215
       dashdot {
-        dd: 8.0
-        dd: 6.0
+        dd: 10.0
+        dd: 11.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24740,24 +24740,24 @@ cont {
         color: 3355443
         stroke_color: 872415231
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.4
-      color: 861097451
-      priority: 170
+      width: 1.4
+      color: 5459435
+      priority: 331
     }
     lines {
       width: 4.0
       color: 16777215
       dashdot {
-        dd: 8.0
-        dd: 6.0
+        dd: 15.0
+        dd: 15.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24765,24 +24765,24 @@ cont {
         color: 3355443
         stroke_color: 872415231
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.4
-      color: 861097451
-      priority: 170
+      width: 2.0
+      color: 5459435
+      priority: 331
     }
     lines {
       width: 4.0
       color: 16777215
       dashdot {
-        dd: 8.0
-        dd: 6.0
+        dd: 20.0
+        dd: 20.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24790,24 +24790,24 @@ cont {
         color: 3355443
         stroke_color: 872415231
       }
-      priority: 2950
+      priority: 2954
     }
   }
   element {
     scale: 20
     lines {
-      width: 2.4
-      color: 861097451
-      priority: 170
+      width: 2.0
+      color: 5459435
+      priority: 331
     }
     lines {
       width: 4.0
       color: 16777215
       dashdot {
-        dd: 8.0
-        dd: 6.0
+        dd: 20.0
+        dd: 20.0
       }
-      priority: 180
+      priority: 332
     }
     path_text {
       primary {
@@ -24815,7 +24815,7 @@ cont {
         color: 3355443
         stroke_color: 872415231
       }
-      priority: 2950
+      priority: 2954
     }
   }
 }
@@ -28428,13 +28428,6 @@ cont {
   }
   element {
     scale: 12
-    lines {
-      width: 1.0
-      color: 1297305067
-      priority: 170
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
     lines {
       width: 1.1
       color: 1301171741
@@ -28450,7 +28443,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.1
+      width: 1.3
       color: 861097451
       priority: 170
       cap: BUTTCAP
@@ -28477,7 +28470,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.3
+      width: 1.6
       color: 5459435
       dashdot {
         dd: 7.0
@@ -28508,7 +28501,7 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1.5
+      width: 2.0
       color: 5459435
       dashdot {
         dd: 7.0
@@ -28539,7 +28532,7 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1.7
+      width: 2.6
       color: 5459435
       dashdot {
         dd: 7.5
@@ -28568,7 +28561,7 @@ cont {
   element {
     scale: 17
     lines {
-      width: 2.0
+      width: 3.3
       color: 5459435
       dashdot {
         dd: 8.0
@@ -28597,7 +28590,7 @@ cont {
   element {
     scale: 18
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       dashdot {
         dd: 8.5
@@ -28626,7 +28619,7 @@ cont {
   element {
     scale: 19
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       dashdot {
         dd: 9.0
@@ -28655,7 +28648,7 @@ cont {
   element {
     scale: 20
     lines {
-      width: 2.4
+      width: 4.0
       color: 5459435
       dashdot {
         dd: 9.0
diff --git a/data/patterns.txt b/data/patterns.txt
index 0328ce2ef..3d59004ca 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -93,6 +93,9 @@
 7.0 1.2
 9.0 1.7
 12.0 2.2
+2.0 6.0
+3.0 7.0
+4.0 8.0
 3.5 2.5
 4.0 3.0
 6.0 4.5