Merge pull request #5926 from rokuz/vehicle-style-fixbeta-783

Vehicle style fix

12 files changed, 2047 insertions, 1369 deletions

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index bec7f549ca..053b4a8865 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index ebbc7e1606..3be6b19957 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -47687,6 +47687,152 @@ cont {
   }
 }
 cont {
+  name: "psurface-unpaved_bad"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+}
+cont {
+  name: "psurface-unpaved_good"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+}
+cont {
   name: "public_transport-platform"
   element {
     scale: 16
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 0a4b6de1e0..3a5ae96282 100644
--- a/data/drules_proto_vehicle_clear.bin
+++ b/data/drules_proto_vehicle_clear.bin
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index e6b2cb000b..7f17bb9710 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -177,13 +177,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 1308622847
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 1308622847
         offset_y: 20
@@ -204,13 +204,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 1308622847
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 1308622847
         offset_y: 20
@@ -231,13 +231,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 1308622847
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 1308622847
         offset_y: 20
@@ -436,13 +436,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 1308622847
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 1308622847
         offset_y: 20
@@ -463,13 +463,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 1308622847
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 1308622847
         offset_y: 20
@@ -490,13 +490,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 1308622847
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 1308622847
         offset_y: 20
@@ -621,7 +621,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -637,7 +637,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -653,7 +653,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -704,7 +704,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -720,7 +720,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -736,7 +736,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -754,7 +754,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -769,7 +769,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -787,7 +787,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -802,7 +802,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -821,7 +821,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 8
       }
@@ -837,7 +837,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -853,7 +853,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -919,7 +919,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 8
       }
@@ -934,7 +934,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -949,7 +949,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -968,7 +968,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -984,7 +984,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -1000,7 +1000,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -1098,7 +1098,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 8
       }
@@ -1113,7 +1113,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -1128,7 +1128,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -1272,7 +1272,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -1288,7 +1288,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -1304,7 +1304,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2376,7 +2376,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2392,7 +2392,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2408,7 +2408,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2435,7 +2435,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2451,7 +2451,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2467,7 +2467,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2494,7 +2494,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2510,7 +2510,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2526,7 +2526,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2553,7 +2553,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2569,7 +2569,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2585,7 +2585,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2612,7 +2612,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2628,7 +2628,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2644,7 +2644,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2671,7 +2671,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2687,7 +2687,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2703,7 +2703,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2730,7 +2730,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2746,7 +2746,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2762,7 +2762,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2789,7 +2789,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2805,7 +2805,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2821,7 +2821,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2856,7 +2856,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2872,7 +2872,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2888,7 +2888,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -2965,7 +2965,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -2994,7 +2994,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -3022,7 +3022,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 10
       }
@@ -3156,7 +3156,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -3172,7 +3172,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -3188,7 +3188,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 10
       }
@@ -3579,7 +3579,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "toll_booth-s"
+      name: "toll_booth-m"
       priority: 16868
       min_distance: 8
     }
@@ -3587,7 +3587,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "toll_booth-s"
+      name: "toll_booth-m"
       priority: 16868
       min_distance: 8
     }
@@ -3595,7 +3595,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "toll_booth-s"
+      name: "toll_booth-m"
       priority: 16868
       min_distance: 8
     }
@@ -4466,7 +4466,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3832097
         stroke_color: 452984831
         offset_y: 10
@@ -4482,7 +4482,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3832097
         stroke_color: 452984831
         offset_y: 10
@@ -4498,7 +4498,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3832097
         stroke_color: 452984831
         offset_y: 10
@@ -4543,7 +4543,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 15
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4562,7 +4562,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 16
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4581,7 +4581,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 17
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4611,11 +4611,11 @@ cont {
     scale: 17
     caption {
       primary {
-        height: 13
+        height: 15
         color: 6381914
       }
       secondary {
-        height: 12
+        height: 14
         color: 6381914
         offset_y: 20
         text: "int_name"
@@ -4627,11 +4627,11 @@ cont {
     scale: 18
     caption {
       primary {
-        height: 14
+        height: 16
         color: 6381914
       }
       secondary {
-        height: 13
+        height: 15
         color: 6381914
         offset_y: 20
         text: "int_name"
@@ -4643,11 +4643,11 @@ cont {
     scale: 19
     caption {
       primary {
-        height: 14
+        height: 17
         color: 6381914
       }
       secondary {
-        height: 14
+        height: 17
         color: 6381914
         offset_y: 20
         text: "int_name"
@@ -4692,7 +4692,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 15
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4711,7 +4711,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 16
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4730,7 +4730,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 17
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4774,7 +4774,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 15
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4793,7 +4793,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 16
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4812,7 +4812,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 17
         color: 6381914
         text: "addr:housenumber"
       }
@@ -4955,7 +4955,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 872415231
         offset_y: 8
@@ -4987,7 +4987,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 15
         color: 6381914
         stroke_color: 452984831
         offset_y: 8
@@ -5020,7 +5020,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 16
         color: 6381914
         stroke_color: 452984831
         offset_y: 8
@@ -5053,7 +5053,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 17
         color: 6381914
         stroke_color: 452984831
         offset_y: 8
@@ -5251,7 +5251,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -5269,7 +5269,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -5287,7 +5287,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -5305,7 +5305,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -5323,7 +5323,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -5341,7 +5341,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -5382,7 +5382,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -5400,7 +5400,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -5418,7 +5418,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -5436,7 +5436,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -5454,7 +5454,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -5472,7 +5472,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -5513,7 +5513,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -5531,7 +5531,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -5560,7 +5560,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -5589,7 +5589,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -5618,7 +5618,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -5647,7 +5647,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -5698,7 +5698,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -5724,7 +5724,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -5750,7 +5750,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -5776,7 +5776,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -5809,7 +5809,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -5842,7 +5842,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -5875,7 +5875,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 452984831
       }
@@ -5908,7 +5908,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 67108863
       }
@@ -5941,7 +5941,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -5974,7 +5974,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -6033,7 +6033,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -6059,7 +6059,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -6085,7 +6085,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -6125,7 +6125,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -6172,7 +6172,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -6219,7 +6219,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -6266,7 +6266,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 452984831
       }
@@ -6313,7 +6313,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 67108863
       }
@@ -6360,7 +6360,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -6407,7 +6407,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -6466,7 +6466,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -6492,7 +6492,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -6529,7 +6529,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -6566,7 +6566,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -6603,7 +6603,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -6640,7 +6640,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -6677,7 +6677,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 452984831
       }
@@ -6714,7 +6714,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 67108863
       }
@@ -6751,7 +6751,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -6788,7 +6788,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -6863,7 +6863,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -6874,7 +6874,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -6885,7 +6885,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -6903,7 +6903,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -6936,7 +6936,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 451800027
       }
@@ -6969,7 +6969,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -7002,7 +7002,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -7035,7 +7035,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 67108863
       }
@@ -7068,7 +7068,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -7101,7 +7101,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -7123,7 +7123,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -7134,7 +7134,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -7145,7 +7145,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -7163,7 +7163,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -7210,7 +7210,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 451800027
       }
@@ -7257,7 +7257,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -7304,7 +7304,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -7351,7 +7351,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 67108863
       }
@@ -7398,7 +7398,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -7445,7 +7445,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -7467,7 +7467,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -7478,7 +7478,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -7489,7 +7489,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -7518,7 +7518,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -7555,7 +7555,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 451800027
       }
@@ -7592,7 +7592,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -7629,7 +7629,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -7666,7 +7666,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 67108863
       }
@@ -7703,7 +7703,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -7740,7 +7740,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -7762,7 +7762,7 @@ cont {
     scale: 14
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -7773,7 +7773,7 @@ cont {
     scale: 15
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -7784,7 +7784,7 @@ cont {
     scale: 16
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -7795,7 +7795,7 @@ cont {
     scale: 17
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -7806,7 +7806,7 @@ cont {
     scale: 18
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -7817,7 +7817,7 @@ cont {
     scale: 19
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -7831,7 +7831,7 @@ cont {
     scale: 14
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -7842,7 +7842,7 @@ cont {
     scale: 15
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -7853,7 +7853,7 @@ cont {
     scale: 16
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -7864,7 +7864,7 @@ cont {
     scale: 17
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -7875,7 +7875,7 @@ cont {
     scale: 18
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -7886,7 +7886,7 @@ cont {
     scale: 19
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -7900,7 +7900,7 @@ cont {
     scale: 14
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -7911,7 +7911,7 @@ cont {
     scale: 15
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -7922,7 +7922,7 @@ cont {
     scale: 16
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -7933,7 +7933,7 @@ cont {
     scale: 17
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -7944,7 +7944,7 @@ cont {
     scale: 18
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -7955,7 +7955,7 @@ cont {
     scale: 19
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -7969,7 +7969,7 @@ cont {
     scale: 14
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -7980,7 +7980,7 @@ cont {
     scale: 15
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -7991,7 +7991,7 @@ cont {
     scale: 16
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -8002,7 +8002,7 @@ cont {
     scale: 17
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -8013,7 +8013,7 @@ cont {
     scale: 18
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -8024,7 +8024,7 @@ cont {
     scale: 19
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -8065,7 +8065,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -8091,7 +8091,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -8117,7 +8117,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -8143,7 +8143,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -8176,7 +8176,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -8209,7 +8209,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -8242,7 +8242,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -8275,7 +8275,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 872415231
       }
@@ -8308,7 +8308,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 872415231
       }
@@ -8341,7 +8341,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 872415231
       }
@@ -8390,7 +8390,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -8416,7 +8416,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -8442,7 +8442,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -8468,7 +8468,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -8515,7 +8515,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -8562,7 +8562,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -8609,7 +8609,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -8656,7 +8656,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 872415231
       }
@@ -8703,7 +8703,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 872415231
       }
@@ -8750,7 +8750,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 872415231
       }
@@ -8799,7 +8799,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -8825,7 +8825,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -8851,7 +8851,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -8877,7 +8877,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -8914,7 +8914,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -8951,7 +8951,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -8988,7 +8988,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -9025,7 +9025,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 872415231
       }
@@ -9062,7 +9062,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 872415231
       }
@@ -9099,7 +9099,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 872415231
       }
@@ -9121,7 +9121,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -9132,7 +9132,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9143,7 +9143,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -9154,7 +9154,7 @@ cont {
     scale: 13
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -9179,7 +9179,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9212,7 +9212,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9245,7 +9245,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -9278,7 +9278,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -9311,7 +9311,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -9344,7 +9344,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -9366,7 +9366,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -9377,7 +9377,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9388,7 +9388,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -9399,7 +9399,7 @@ cont {
     scale: 13
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -9438,7 +9438,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9485,7 +9485,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9532,7 +9532,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -9579,7 +9579,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -9626,7 +9626,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -9673,7 +9673,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -9695,7 +9695,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -9706,7 +9706,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9717,7 +9717,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -9728,7 +9728,7 @@ cont {
     scale: 13
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -9757,7 +9757,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9794,7 +9794,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -9831,7 +9831,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -9868,7 +9868,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -9905,7 +9905,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -9942,7 +9942,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -10082,7 +10082,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -10108,7 +10108,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -10134,7 +10134,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -10167,7 +10167,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -10200,7 +10200,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -10233,7 +10233,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 872415231
       }
@@ -10266,7 +10266,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -10299,7 +10299,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -10338,7 +10338,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -10364,7 +10364,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -10390,7 +10390,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -10423,7 +10423,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -10456,7 +10456,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -10489,7 +10489,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 872415231
       }
@@ -10522,7 +10522,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -10555,7 +10555,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -10594,7 +10594,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -10620,7 +10620,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -10660,7 +10660,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -10707,7 +10707,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -10754,7 +10754,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -10801,7 +10801,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 872415231
       }
@@ -10848,7 +10848,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -10895,7 +10895,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -10934,7 +10934,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -10960,7 +10960,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -10986,7 +10986,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -11019,7 +11019,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -11056,7 +11056,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -11093,7 +11093,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 872415231
       }
@@ -11130,7 +11130,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -11167,7 +11167,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -11216,7 +11216,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -11234,7 +11234,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -11252,7 +11252,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -11270,7 +11270,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -11288,7 +11288,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -11306,7 +11306,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -11347,7 +11347,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -11365,7 +11365,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -11383,7 +11383,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -11401,7 +11401,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -11419,7 +11419,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -11437,7 +11437,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -11478,7 +11478,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -11496,7 +11496,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -11514,7 +11514,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -11532,7 +11532,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -11550,7 +11550,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -11568,7 +11568,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -11589,7 +11589,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         stroke_color: 871230427
       }
@@ -11607,7 +11607,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         stroke_color: 871230427
       }
@@ -11625,7 +11625,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 4473924
         stroke_color: 452984831
       }
@@ -11651,7 +11651,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 4473924
         stroke_color: 452984831
       }
@@ -11684,7 +11684,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -11717,7 +11717,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 871230427
       }
@@ -11750,7 +11750,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -11783,7 +11783,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -11816,7 +11816,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -11849,7 +11849,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -11878,7 +11878,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         stroke_color: 871230427
       }
@@ -11896,7 +11896,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         stroke_color: 871230427
       }
@@ -11914,7 +11914,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 4473924
         stroke_color: 452984831
       }
@@ -11940,7 +11940,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 4473924
         stroke_color: 452984831
       }
@@ -11987,7 +11987,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -12034,7 +12034,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 871230427
       }
@@ -12081,7 +12081,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12128,7 +12128,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12175,7 +12175,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -12222,7 +12222,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -12251,7 +12251,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         stroke_color: 871230427
       }
@@ -12269,7 +12269,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 4473924
         stroke_color: 871230427
       }
@@ -12287,7 +12287,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 4473924
         stroke_color: 452984831
       }
@@ -12313,7 +12313,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 4473924
         stroke_color: 452984831
       }
@@ -12346,7 +12346,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -12379,7 +12379,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 871230427
       }
@@ -12416,7 +12416,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12453,7 +12453,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12490,7 +12490,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -12527,7 +12527,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -12597,7 +12597,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12622,7 +12622,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12647,7 +12647,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -12672,7 +12672,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -12776,7 +12776,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12815,7 +12815,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12854,7 +12854,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -12893,7 +12893,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -12959,7 +12959,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -12988,7 +12988,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 872415231
       }
@@ -13017,7 +13017,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -13046,7 +13046,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 16777215
       }
@@ -13087,7 +13087,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13105,7 +13105,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13123,7 +13123,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13141,7 +13141,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13182,7 +13182,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13200,7 +13200,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13218,7 +13218,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13236,7 +13236,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13277,7 +13277,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13295,7 +13295,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13313,7 +13313,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13331,7 +13331,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13362,7 +13362,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13380,7 +13380,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13398,7 +13398,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13416,7 +13416,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13447,7 +13447,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13465,7 +13465,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13483,7 +13483,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13501,7 +13501,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13532,7 +13532,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13550,7 +13550,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13568,7 +13568,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13586,7 +13586,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13617,7 +13617,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13635,7 +13635,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13653,7 +13653,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13671,7 +13671,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13712,7 +13712,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13730,7 +13730,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13748,7 +13748,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13766,7 +13766,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13807,7 +13807,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13825,7 +13825,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -13843,7 +13843,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13861,7 +13861,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -13951,7 +13951,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -13977,7 +13977,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -14003,7 +14003,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -14036,7 +14036,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -14069,7 +14069,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -14102,7 +14102,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 872415231
       }
@@ -14135,7 +14135,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -14168,7 +14168,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -14207,7 +14207,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -14233,7 +14233,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -14273,7 +14273,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -14320,7 +14320,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -14367,7 +14367,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -14414,7 +14414,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 872415231
       }
@@ -14461,7 +14461,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -14508,7 +14508,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -14547,7 +14547,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -14573,7 +14573,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 4473924
         stroke_color: 452984831
       }
@@ -14599,7 +14599,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -14632,7 +14632,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 871230427
       }
@@ -14669,7 +14669,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 872415231
       }
@@ -14706,7 +14706,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 872415231
       }
@@ -14743,7 +14743,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -14780,7 +14780,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -14867,7 +14867,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -14892,7 +14892,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -15027,7 +15027,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -15066,7 +15066,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -15157,7 +15157,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -15186,7 +15186,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 3355443
         stroke_color: 16777215
       }
@@ -15195,6 +15195,93 @@ cont {
   }
 }
 cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 16579836
+      dashdot {
+        dd: 3.3
+        dd: 1.8
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.0
+      color: 16579836
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 16579836
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 16579836
+      dashdot {
+        dd: 6.3
+        dd: 2.7
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+}
+cont {
   name: "highway-trunk"
   element {
     scale: 7
@@ -15237,7 +15324,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -15263,7 +15350,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -15289,7 +15376,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -15315,7 +15402,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -15348,7 +15435,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -15381,7 +15468,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -15414,7 +15501,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 452984831
       }
@@ -15447,7 +15534,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 67108863
       }
@@ -15480,7 +15567,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -15513,7 +15600,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -15572,7 +15659,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -15598,7 +15685,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -15624,7 +15711,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -15664,7 +15751,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -15711,7 +15798,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -15758,7 +15845,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -15805,7 +15892,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 452984831
       }
@@ -15852,7 +15939,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 67108863
       }
@@ -15899,7 +15986,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -15946,7 +16033,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -16005,7 +16092,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -16031,7 +16118,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -16068,7 +16155,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -16105,7 +16192,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -16142,7 +16229,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -16179,7 +16266,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 452984831
       }
@@ -16216,7 +16303,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 3355443
         stroke_color: 452984831
       }
@@ -16253,7 +16340,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 3355443
         stroke_color: 67108863
       }
@@ -16290,7 +16377,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -16327,7 +16414,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 3355443
         stroke_color: 16777215
       }
@@ -16349,7 +16436,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -16360,7 +16447,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -16371,7 +16458,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -16389,7 +16476,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -16422,7 +16509,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 451800027
       }
@@ -16455,7 +16542,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -16488,7 +16575,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -16521,7 +16608,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 67108863
       }
@@ -16554,7 +16641,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -16587,7 +16674,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -16609,7 +16696,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -16620,7 +16707,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -16631,7 +16718,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -16649,7 +16736,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -16696,7 +16783,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 451800027
       }
@@ -16743,7 +16830,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -16790,7 +16877,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -16837,7 +16924,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 67108863
       }
@@ -16884,7 +16971,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -16931,7 +17018,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -16953,7 +17040,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -16964,7 +17051,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
       }
@@ -16975,7 +17062,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -17004,7 +17091,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -17041,7 +17128,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 451800027
       }
@@ -17078,7 +17165,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 451800027
       }
@@ -17115,7 +17202,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 452984831
       }
@@ -17152,7 +17239,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 67108863
       }
@@ -17189,7 +17276,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -17226,7 +17313,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 3355443
         stroke_color: 16777215
       }
@@ -17275,7 +17362,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -17293,7 +17380,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -17311,7 +17398,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -17329,7 +17416,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -17347,7 +17434,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -17365,7 +17452,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -17406,7 +17493,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -17424,7 +17511,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -17442,7 +17529,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -17460,7 +17547,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -17478,7 +17565,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -17496,7 +17583,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -17551,7 +17638,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -17583,7 +17670,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -17615,7 +17702,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -17647,7 +17734,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -17679,7 +17766,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -17711,7 +17798,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -17752,7 +17839,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 871230427
       }
@@ -17770,7 +17857,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 3355443
         stroke_color: 871230427
       }
@@ -17799,7 +17886,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -17828,7 +17915,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 3355443
         stroke_color: 872415231
       }
@@ -17857,7 +17944,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -17886,7 +17973,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 3355443
         stroke_color: 16777215
       }
@@ -20437,7 +20524,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3832097
         stroke_color: 452984831
         offset_y: 10
@@ -20457,7 +20544,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3832097
         stroke_color: 452984831
         offset_y: 10
@@ -20477,7 +20564,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3832097
         stroke_color: 452984831
         offset_y: 10
@@ -29660,6 +29747,180 @@ cont {
   }
 }
 cont {
+  name: "psurface-unpaved_bad"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 16579836
+      dashdot {
+        dd: 3.3
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.0
+      color: 16579836
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 16579836
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 16579836
+      dashdot {
+        dd: 6.3
+        dd: 2.7
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+}
+cont {
+  name: "psurface-unpaved_good"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 16579836
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 16579836
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 16579836
+      dashdot {
+        dd: 3.3
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.0
+      color: 16579836
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 16579836
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 16579836
+      dashdot {
+        dd: 6.3
+        dd: 2.7
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+}
+cont {
   name: "railway-abandoned"
   element {
     scale: 16
@@ -30041,7 +30302,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 872415231
         offset_y: 8
@@ -30065,7 +30326,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -30089,7 +30350,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -30113,7 +30374,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -31979,7 +32240,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 872415231
         offset_y: 8
@@ -32003,7 +32264,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -32027,7 +32288,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -32044,7 +32305,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -32136,7 +32397,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 872415231
         offset_y: 8
@@ -32160,7 +32421,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -32184,7 +32445,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -32201,7 +32462,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -32293,7 +32554,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 872415231
         offset_y: 8
@@ -32317,7 +32578,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -32341,7 +32602,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -32358,7 +32619,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -34033,7 +34294,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4286545791
         offset_y: 8
       }
@@ -34055,7 +34316,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4286545791
         offset_y: 8
       }
@@ -34077,7 +34338,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4286545791
         offset_y: 8
       }
@@ -34890,7 +35151,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4286545791
         offset_y: 8
       }
@@ -34912,7 +35173,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4286545791
         offset_y: 8
       }
@@ -34934,7 +35195,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4286545791
         offset_y: 8
       }
@@ -36750,13 +37011,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -36774,13 +37035,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -36798,13 +37059,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -36843,13 +37104,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -36867,13 +37128,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -36891,13 +37152,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -36936,13 +37197,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -36960,13 +37221,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -36984,13 +37245,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37029,13 +37290,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37053,13 +37314,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37077,13 +37338,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37122,13 +37383,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37146,13 +37407,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37170,13 +37431,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37215,13 +37476,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37239,13 +37500,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37263,13 +37524,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37308,13 +37569,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 872415231
         offset_y: 6
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37332,13 +37593,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 872415231
         offset_y: 6
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37356,13 +37617,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 872415231
         offset_y: 6
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37407,13 +37668,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 452984831
         offset_y: 10
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 25
@@ -37431,13 +37692,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 10
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 25
@@ -37455,13 +37716,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 10
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 25
@@ -37500,13 +37761,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37524,13 +37785,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37548,13 +37809,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37593,13 +37854,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37617,13 +37878,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37641,13 +37902,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37686,13 +37947,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37710,13 +37971,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37734,13 +37995,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 452984831
         offset_y: 8
@@ -37785,13 +38046,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 872415231
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 872415231
         offset_y: 25
@@ -37809,13 +38070,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 872415231
         offset_y: 8
       }
       secondary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 872415231
         offset_y: 25
@@ -37833,13 +38094,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 3355443
         stroke_color: 872415231
         offset_y: 8
       }
       secondary {
-        height: 12
+        height: 13
         color: 3355443
         stroke_color: 872415231
         offset_y: 25
@@ -38120,13 +38381,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4281545523
         stroke_color: 4294967295
         offset_y: 8
       }
       secondary {
-        height: 10
+        height: 11
         color: 4281545523
         stroke_color: 4294967295
         offset_y: 8
@@ -38143,13 +38404,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4281545523
         stroke_color: 4294967295
         offset_y: 8
       }
       secondary {
-        height: 10
+        height: 11
         color: 4281545523
         stroke_color: 4294967295
         offset_y: 8
@@ -38166,13 +38427,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4281545523
         stroke_color: 4294967295
         offset_y: 8
       }
       secondary {
-        height: 10
+        height: 11
         color: 4281545523
         stroke_color: 4294967295
         offset_y: 8
@@ -38846,7 +39107,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 8
       }
@@ -38861,7 +39122,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -38876,7 +39137,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -38927,7 +39188,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 8
       }
@@ -38943,7 +39204,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 8
       }
@@ -38959,7 +39220,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -38975,7 +39236,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -39026,7 +39287,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 8
       }
@@ -39042,7 +39303,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4473924
         offset_y: 8
       }
@@ -39058,7 +39319,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 8
       }
@@ -39074,7 +39335,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
         offset_y: 8
       }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index cd6f06143b..c059bf6512 100644
--- a/data/drules_proto_vehicle_dark.bin
+++ b/data/drules_proto_vehicle_dark.bin
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 0e321da351..edb14fbf32 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -177,13 +177,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 1292964096
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 1292964096
         offset_y: 20
@@ -204,13 +204,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 1292964096
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 1292964096
         offset_y: 20
@@ -231,13 +231,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 1292964096
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 1292964096
         offset_y: 20
@@ -436,13 +436,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 1292964096
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 1292964096
         offset_y: 20
@@ -463,13 +463,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 1292964096
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 1292964096
         offset_y: 20
@@ -490,13 +490,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 1292964096
         offset_y: 7
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 1292964096
         offset_y: 20
@@ -621,7 +621,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -637,7 +637,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -653,7 +653,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -704,7 +704,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -720,7 +720,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -736,7 +736,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -754,7 +754,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -769,7 +769,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -787,7 +787,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -802,7 +802,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -821,7 +821,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 8
       }
@@ -837,7 +837,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -853,7 +853,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -919,7 +919,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 8
       }
@@ -934,7 +934,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -949,7 +949,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -968,7 +968,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -984,7 +984,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -1000,7 +1000,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -1098,7 +1098,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 8
       }
@@ -1113,7 +1113,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -1128,7 +1128,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -1272,7 +1272,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -1288,7 +1288,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -1304,7 +1304,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2376,7 +2376,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2392,7 +2392,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2408,7 +2408,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2435,7 +2435,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2451,7 +2451,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2467,7 +2467,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2494,7 +2494,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2510,7 +2510,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2526,7 +2526,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2553,7 +2553,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2569,7 +2569,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2585,7 +2585,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2612,7 +2612,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2628,7 +2628,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2644,7 +2644,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2671,7 +2671,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2687,7 +2687,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2703,7 +2703,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2730,7 +2730,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2746,7 +2746,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2762,7 +2762,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2789,7 +2789,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2805,7 +2805,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2821,7 +2821,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2856,7 +2856,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2872,7 +2872,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2888,7 +2888,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -2965,7 +2965,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -2994,7 +2994,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -3022,7 +3022,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 10
       }
@@ -3156,7 +3156,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -3172,7 +3172,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -3188,7 +3188,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 10
       }
@@ -3579,7 +3579,7 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "toll_booth-s"
+      name: "toll_booth-m"
       priority: 16868
       min_distance: 8
     }
@@ -3587,7 +3587,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "toll_booth-s"
+      name: "toll_booth-m"
       priority: 16868
       min_distance: 8
     }
@@ -3595,7 +3595,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "toll_booth-s"
+      name: "toll_booth-m"
       priority: 16868
       min_distance: 8
     }
@@ -4466,7 +4466,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 2836760
         stroke_color: 437326080
         offset_y: 10
@@ -4482,7 +4482,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 2836760
         stroke_color: 437326080
         offset_y: 10
@@ -4498,7 +4498,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 2836760
         stroke_color: 437326080
         offset_y: 10
@@ -4543,7 +4543,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 15
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4562,7 +4562,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 16
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4581,7 +4581,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 17
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4611,11 +4611,11 @@ cont {
     scale: 17
     caption {
       primary {
-        height: 13
+        height: 15
         color: 7566195
       }
       secondary {
-        height: 12
+        height: 14
         color: 7566195
         offset_y: 20
         text: "int_name"
@@ -4627,11 +4627,11 @@ cont {
     scale: 18
     caption {
       primary {
-        height: 14
+        height: 16
         color: 7566195
       }
       secondary {
-        height: 13
+        height: 15
         color: 7566195
         offset_y: 20
         text: "int_name"
@@ -4643,11 +4643,11 @@ cont {
     scale: 19
     caption {
       primary {
-        height: 14
+        height: 17
         color: 7566195
       }
       secondary {
-        height: 14
+        height: 17
         color: 7566195
         offset_y: 20
         text: "int_name"
@@ -4692,7 +4692,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 15
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4711,7 +4711,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 16
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4730,7 +4730,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 17
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4774,7 +4774,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 15
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4793,7 +4793,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 16
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4812,7 +4812,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 17
         color: 7566195
         text: "addr:housenumber"
       }
@@ -4955,7 +4955,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 856756480
         offset_y: 8
@@ -4987,7 +4987,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 15
         color: 7566195
         stroke_color: 440681540
         offset_y: 8
@@ -5020,7 +5020,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 16
         color: 7566195
         stroke_color: 440681540
         offset_y: 8
@@ -5053,7 +5053,7 @@ cont {
     }
     caption {
       primary {
-        height: 14
+        height: 17
         color: 7566195
         stroke_color: 440681540
         offset_y: 8
@@ -5251,7 +5251,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -5269,7 +5269,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -5287,7 +5287,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -5305,7 +5305,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -5323,7 +5323,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -5341,7 +5341,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -5382,7 +5382,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -5400,7 +5400,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -5418,7 +5418,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -5436,7 +5436,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -5454,7 +5454,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -5472,7 +5472,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -5513,7 +5513,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -5531,7 +5531,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -5560,7 +5560,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -5589,7 +5589,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -5618,7 +5618,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -5647,7 +5647,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -5698,7 +5698,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -5724,7 +5724,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -5750,7 +5750,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -5776,7 +5776,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -5809,7 +5809,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -5842,7 +5842,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -5875,7 +5875,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 437326080
       }
@@ -5908,7 +5908,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 51450112
       }
@@ -5941,7 +5941,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -5974,7 +5974,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -6033,7 +6033,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -6059,7 +6059,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -6085,7 +6085,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -6125,7 +6125,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -6172,7 +6172,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -6219,7 +6219,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -6266,7 +6266,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 437326080
       }
@@ -6313,7 +6313,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 51450112
       }
@@ -6360,7 +6360,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -6407,7 +6407,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -6466,7 +6466,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -6492,7 +6492,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -6529,7 +6529,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -6566,7 +6566,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -6603,7 +6603,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -6640,7 +6640,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -6677,7 +6677,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 437326080
       }
@@ -6714,7 +6714,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 51450112
       }
@@ -6751,7 +6751,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -6788,7 +6788,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -6863,7 +6863,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -6874,7 +6874,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -6885,7 +6885,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -6903,7 +6903,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -6936,7 +6936,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -6969,7 +6969,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -7002,7 +7002,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -7035,7 +7035,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 51450112
       }
@@ -7068,7 +7068,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -7101,7 +7101,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -7123,7 +7123,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -7134,7 +7134,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -7145,7 +7145,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -7163,7 +7163,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -7210,7 +7210,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -7257,7 +7257,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -7304,7 +7304,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -7351,7 +7351,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 51450112
       }
@@ -7398,7 +7398,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -7445,7 +7445,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -7467,7 +7467,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -7478,7 +7478,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -7489,7 +7489,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -7518,7 +7518,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -7555,7 +7555,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -7592,7 +7592,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -7629,7 +7629,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -7666,7 +7666,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 51450112
       }
@@ -7703,7 +7703,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -7740,7 +7740,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -7762,7 +7762,7 @@ cont {
     scale: 14
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -7773,7 +7773,7 @@ cont {
     scale: 15
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -7784,7 +7784,7 @@ cont {
     scale: 16
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -7795,7 +7795,7 @@ cont {
     scale: 17
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -7806,7 +7806,7 @@ cont {
     scale: 18
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -7817,7 +7817,7 @@ cont {
     scale: 19
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -7831,7 +7831,7 @@ cont {
     scale: 14
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -7842,7 +7842,7 @@ cont {
     scale: 15
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -7853,7 +7853,7 @@ cont {
     scale: 16
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -7864,7 +7864,7 @@ cont {
     scale: 17
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -7875,7 +7875,7 @@ cont {
     scale: 18
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -7886,7 +7886,7 @@ cont {
     scale: 19
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -7900,7 +7900,7 @@ cont {
     scale: 14
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -7911,7 +7911,7 @@ cont {
     scale: 15
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -7922,7 +7922,7 @@ cont {
     scale: 16
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -7933,7 +7933,7 @@ cont {
     scale: 17
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -7944,7 +7944,7 @@ cont {
     scale: 18
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -7955,7 +7955,7 @@ cont {
     scale: 19
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -7969,7 +7969,7 @@ cont {
     scale: 14
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -7980,7 +7980,7 @@ cont {
     scale: 15
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -7991,7 +7991,7 @@ cont {
     scale: 16
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -8002,7 +8002,7 @@ cont {
     scale: 17
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -8013,7 +8013,7 @@ cont {
     scale: 18
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -8024,7 +8024,7 @@ cont {
     scale: 19
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -8065,7 +8065,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -8091,7 +8091,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -8117,7 +8117,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -8143,7 +8143,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -8176,7 +8176,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 8947848
         stroke_color: 856756480
       }
@@ -8209,7 +8209,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 8947848
         stroke_color: 856756480
       }
@@ -8242,7 +8242,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -8275,7 +8275,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 856756480
       }
@@ -8308,7 +8308,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 856756480
       }
@@ -8341,7 +8341,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 856756480
       }
@@ -8390,7 +8390,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -8416,7 +8416,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -8442,7 +8442,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -8468,7 +8468,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -8515,7 +8515,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 8947848
         stroke_color: 856756480
       }
@@ -8562,7 +8562,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 8947848
         stroke_color: 856756480
       }
@@ -8609,7 +8609,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -8656,7 +8656,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 856756480
       }
@@ -8703,7 +8703,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 856756480
       }
@@ -8750,7 +8750,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 856756480
       }
@@ -8799,7 +8799,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -8825,7 +8825,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -8851,7 +8851,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -8877,7 +8877,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -8914,7 +8914,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 8947848
         stroke_color: 856756480
       }
@@ -8951,7 +8951,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 8947848
         stroke_color: 856756480
       }
@@ -8988,7 +8988,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -9025,7 +9025,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 856756480
       }
@@ -9062,7 +9062,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 856756480
       }
@@ -9099,7 +9099,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 856756480
       }
@@ -9121,7 +9121,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -9132,7 +9132,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9143,7 +9143,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -9154,7 +9154,7 @@ cont {
     scale: 13
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -9179,7 +9179,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9212,7 +9212,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9245,7 +9245,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -9278,7 +9278,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -9311,7 +9311,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -9344,7 +9344,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -9366,7 +9366,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -9377,7 +9377,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9388,7 +9388,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -9399,7 +9399,7 @@ cont {
     scale: 13
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -9438,7 +9438,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9485,7 +9485,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9532,7 +9532,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -9579,7 +9579,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -9626,7 +9626,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -9673,7 +9673,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -9695,7 +9695,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -9706,7 +9706,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9717,7 +9717,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -9728,7 +9728,7 @@ cont {
     scale: 13
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -9757,7 +9757,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9794,7 +9794,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -9831,7 +9831,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -9868,7 +9868,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -9905,7 +9905,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -9942,7 +9942,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -10082,7 +10082,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -10108,7 +10108,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -10134,7 +10134,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -10167,7 +10167,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -10200,7 +10200,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -10233,7 +10233,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 856756480
       }
@@ -10266,7 +10266,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -10299,7 +10299,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -10338,7 +10338,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -10364,7 +10364,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -10390,7 +10390,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -10423,7 +10423,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -10456,7 +10456,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -10489,7 +10489,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 856756480
       }
@@ -10522,7 +10522,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -10555,7 +10555,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -10594,7 +10594,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -10620,7 +10620,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -10660,7 +10660,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -10707,7 +10707,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -10754,7 +10754,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -10801,7 +10801,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 856756480
       }
@@ -10848,7 +10848,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -10895,7 +10895,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -10934,7 +10934,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -10960,7 +10960,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -10986,7 +10986,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -11019,7 +11019,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -11056,7 +11056,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -11093,7 +11093,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 856756480
       }
@@ -11130,7 +11130,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -11167,7 +11167,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -11216,7 +11216,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -11234,7 +11234,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -11252,7 +11252,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -11270,7 +11270,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -11288,7 +11288,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -11306,7 +11306,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -11347,7 +11347,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -11365,7 +11365,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -11383,7 +11383,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -11401,7 +11401,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -11419,7 +11419,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -11437,7 +11437,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -11478,7 +11478,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -11496,7 +11496,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -11514,7 +11514,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -11532,7 +11532,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -11550,7 +11550,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -11568,7 +11568,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -11589,7 +11589,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 6710886
         stroke_color: 856756480
       }
@@ -11607,7 +11607,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 6710886
         stroke_color: 856756480
       }
@@ -11625,7 +11625,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 6710886
         stroke_color: 436207616
       }
@@ -11651,7 +11651,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 6710886
         stroke_color: 436207616
       }
@@ -11684,7 +11684,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -11717,7 +11717,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -11750,7 +11750,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -11783,7 +11783,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -11816,7 +11816,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -11849,7 +11849,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -11878,7 +11878,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 6710886
         stroke_color: 856756480
       }
@@ -11896,7 +11896,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 6710886
         stroke_color: 856756480
       }
@@ -11914,7 +11914,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 6710886
         stroke_color: 436207616
       }
@@ -11940,7 +11940,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 6710886
         stroke_color: 436207616
       }
@@ -11987,7 +11987,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -12034,7 +12034,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -12081,7 +12081,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12128,7 +12128,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12175,7 +12175,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -12222,7 +12222,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -12251,7 +12251,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 6710886
         stroke_color: 856756480
       }
@@ -12269,7 +12269,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 12
         color: 6710886
         stroke_color: 856756480
       }
@@ -12287,7 +12287,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 6710886
         stroke_color: 436207616
       }
@@ -12313,7 +12313,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 6710886
         stroke_color: 436207616
       }
@@ -12346,7 +12346,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -12379,7 +12379,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -12416,7 +12416,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12453,7 +12453,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12490,7 +12490,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -12527,7 +12527,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -12597,7 +12597,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12622,7 +12622,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12647,7 +12647,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -12672,7 +12672,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -12776,7 +12776,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12815,7 +12815,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12854,7 +12854,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -12893,7 +12893,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -12959,7 +12959,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -12988,7 +12988,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 8947848
         stroke_color: 856756480
       }
@@ -13017,7 +13017,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -13046,7 +13046,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 1118464
       }
@@ -13087,7 +13087,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13105,7 +13105,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13123,7 +13123,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13141,7 +13141,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13182,7 +13182,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13200,7 +13200,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13218,7 +13218,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13236,7 +13236,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13277,7 +13277,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13295,7 +13295,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13313,7 +13313,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13331,7 +13331,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13362,7 +13362,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13380,7 +13380,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13398,7 +13398,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13416,7 +13416,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13447,7 +13447,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13465,7 +13465,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13483,7 +13483,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13501,7 +13501,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13532,7 +13532,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13550,7 +13550,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13568,7 +13568,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13586,7 +13586,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13617,7 +13617,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13635,7 +13635,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13653,7 +13653,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13671,7 +13671,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13712,7 +13712,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13730,7 +13730,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13748,7 +13748,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13766,7 +13766,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13807,7 +13807,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13825,7 +13825,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -13843,7 +13843,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13861,7 +13861,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -13951,7 +13951,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -13977,7 +13977,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -14003,7 +14003,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -14036,7 +14036,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -14069,7 +14069,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -14102,7 +14102,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 856756480
       }
@@ -14135,7 +14135,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -14168,7 +14168,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -14207,7 +14207,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -14233,7 +14233,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -14273,7 +14273,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -14320,7 +14320,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -14367,7 +14367,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -14414,7 +14414,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 856756480
       }
@@ -14461,7 +14461,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -14508,7 +14508,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -14547,7 +14547,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -14573,7 +14573,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 6710886
         stroke_color: 436207616
       }
@@ -14599,7 +14599,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -14632,7 +14632,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -14669,7 +14669,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 856756480
       }
@@ -14706,7 +14706,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 856756480
       }
@@ -14743,7 +14743,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -14780,7 +14780,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -14867,7 +14867,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -14892,7 +14892,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -15027,7 +15027,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -15066,7 +15066,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -15157,7 +15157,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -15186,7 +15186,7 @@ cont {
     }
     path_text {
       primary {
-        height: 15
+        height: 17
         color: 9211020
         stroke_color: 1118464
       }
@@ -15195,6 +15195,93 @@ cont {
   }
 }
 cont {
+  name: "highway-track-grade1"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 5064516
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 5064516
+      dashdot {
+        dd: 3.3
+        dd: 1.8
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.0
+      color: 5064516
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 5064516
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 5064516
+      dashdot {
+        dd: 6.3
+        dd: 2.7
+      }
+      priority: 1381
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+}
+cont {
   name: "highway-trunk"
   element {
     scale: 7
@@ -15237,7 +15324,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -15263,7 +15350,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -15289,7 +15376,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -15315,7 +15402,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -15348,7 +15435,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -15381,7 +15468,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -15414,7 +15501,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 437326080
       }
@@ -15447,7 +15534,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 51450112
       }
@@ -15480,7 +15567,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -15513,7 +15600,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -15572,7 +15659,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -15598,7 +15685,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -15624,7 +15711,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -15664,7 +15751,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -15711,7 +15798,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -15758,7 +15845,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -15805,7 +15892,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 437326080
       }
@@ -15852,7 +15939,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 51450112
       }
@@ -15899,7 +15986,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -15946,7 +16033,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -16005,7 +16092,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16031,7 +16118,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16068,7 +16155,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -16105,7 +16192,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -16142,7 +16229,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -16179,7 +16266,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 8947848
         stroke_color: 437326080
       }
@@ -16216,7 +16303,7 @@ cont {
     }
     path_text {
       primary {
-        height: 16
+        height: 18
         color: 8947848
         stroke_color: 437326080
       }
@@ -16253,7 +16340,7 @@ cont {
     }
     path_text {
       primary {
-        height: 17
+        height: 19
         color: 8947848
         stroke_color: 51450112
       }
@@ -16290,7 +16377,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -16327,7 +16414,7 @@ cont {
     }
     path_text {
       primary {
-        height: 18
+        height: 20
         color: 8947848
         stroke_color: 1118464
       }
@@ -16349,7 +16436,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16360,7 +16447,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16371,7 +16458,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -16389,7 +16476,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -16422,7 +16509,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16455,7 +16542,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -16488,7 +16575,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -16521,7 +16608,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 51450112
       }
@@ -16554,7 +16641,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -16587,7 +16674,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -16609,7 +16696,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16620,7 +16707,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16631,7 +16718,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -16649,7 +16736,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -16696,7 +16783,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16743,7 +16830,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -16790,7 +16877,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -16837,7 +16924,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 51450112
       }
@@ -16884,7 +16971,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -16931,7 +17018,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -16953,7 +17040,7 @@ cont {
     scale: 10
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16964,7 +17051,7 @@ cont {
     scale: 11
     path_text {
       primary {
-        height: 12
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -16975,7 +17062,7 @@ cont {
     scale: 12
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -17004,7 +17091,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -17041,7 +17128,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 437326080
       }
@@ -17078,7 +17165,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 437326080
       }
@@ -17115,7 +17202,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 437326080
       }
@@ -17152,7 +17239,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 51450112
       }
@@ -17189,7 +17276,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -17226,7 +17313,7 @@ cont {
     }
     path_text {
       primary {
-        height: 14
+        height: 16
         color: 9211020
         stroke_color: 1118464
       }
@@ -17275,7 +17362,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -17293,7 +17380,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -17311,7 +17398,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -17329,7 +17416,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -17347,7 +17434,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -17365,7 +17452,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -17406,7 +17493,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -17424,7 +17511,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -17442,7 +17529,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -17460,7 +17547,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -17478,7 +17565,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -17496,7 +17583,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -17551,7 +17638,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -17583,7 +17670,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -17615,7 +17702,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -17647,7 +17734,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -17679,7 +17766,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -17711,7 +17798,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -17752,7 +17839,7 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -17770,7 +17857,7 @@ cont {
     }
     path_text {
       primary {
-        height: 11
+        height: 13
         color: 9211020
         stroke_color: 856756480
       }
@@ -17799,7 +17886,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -17828,7 +17915,7 @@ cont {
     }
     path_text {
       primary {
-        height: 12
+        height: 14
         color: 9211020
         stroke_color: 856756480
       }
@@ -17857,7 +17944,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -17886,7 +17973,7 @@ cont {
     }
     path_text {
       primary {
-        height: 13
+        height: 15
         color: 9211020
         stroke_color: 1118464
       }
@@ -20437,7 +20524,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 2836760
         stroke_color: 437326080
         offset_y: 10
@@ -20457,7 +20544,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 2836760
         stroke_color: 437326080
         offset_y: 10
@@ -20477,7 +20564,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 2836760
         stroke_color: 437326080
         offset_y: 10
@@ -29660,6 +29747,180 @@ cont {
   }
 }
 cont {
+  name: "psurface-unpaved_bad"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 5064516
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 5064516
+      dashdot {
+        dd: 3.3
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.0
+      color: 5064516
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 5064516
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 5064516
+      dashdot {
+        dd: 6.3
+        dd: 2.7
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+}
+cont {
+  name: "psurface-unpaved_good"
+  element {
+    scale: 14
+    lines {
+      width: 1.4
+      color: 5064516
+      dashdot {
+        dd: 2.0
+        dd: 1.35
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2.0
+      color: 5064516
+      dashdot {
+        dd: 2.2
+        dd: 1.26
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2.6
+      color: 5064516
+      dashdot {
+        dd: 3.3
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 3.0
+      color: 5064516
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 3.0
+      color: 5064516
+      dashdot {
+        dd: 4.0
+        dd: 1.8
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 4.0
+      color: 5064516
+      dashdot {
+        dd: 6.3
+        dd: 2.7
+      }
+      priority: 1000
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+}
+cont {
   name: "railway-abandoned"
   element {
     scale: 16
@@ -30041,7 +30302,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 856756480
         offset_y: 8
@@ -30065,7 +30326,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -30089,7 +30350,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -30113,7 +30374,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -31979,7 +32240,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 856756480
         offset_y: 8
@@ -32003,7 +32264,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -32027,7 +32288,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -32044,7 +32305,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -32136,7 +32397,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 856756480
         offset_y: 8
@@ -32160,7 +32421,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -32184,7 +32445,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -32201,7 +32462,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -32293,7 +32554,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 856756480
         offset_y: 8
@@ -32317,7 +32578,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -32341,7 +32602,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -32358,7 +32619,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -34033,7 +34294,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4283782485
         offset_y: 8
       }
@@ -34055,7 +34316,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4283782485
         offset_y: 8
       }
@@ -34077,7 +34338,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4283782485
         offset_y: 8
       }
@@ -34890,7 +35151,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4283782485
         offset_y: 8
       }
@@ -34912,7 +35173,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4283782485
         offset_y: 8
       }
@@ -34934,7 +35195,7 @@ cont {
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4283782485
         offset_y: 8
       }
@@ -36750,13 +37011,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -36774,13 +37035,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -36798,13 +37059,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -36843,13 +37104,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -36867,13 +37128,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -36891,13 +37152,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -36936,13 +37197,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -36960,13 +37221,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -36984,13 +37245,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37029,13 +37290,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37053,13 +37314,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37077,13 +37338,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37122,13 +37383,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37146,13 +37407,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37170,13 +37431,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37215,13 +37476,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37239,13 +37500,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37263,13 +37524,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37308,13 +37569,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 856756480
         offset_y: 6
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37332,13 +37593,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 856756480
         offset_y: 6
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37356,13 +37617,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 856756480
         offset_y: 6
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37407,13 +37668,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 437326080
         offset_y: 10
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 25
@@ -37431,13 +37692,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 10
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 25
@@ -37455,13 +37716,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 10
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 25
@@ -37500,13 +37761,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37524,13 +37785,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37548,13 +37809,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37593,13 +37854,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37617,13 +37878,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37641,13 +37902,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37686,13 +37947,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37710,13 +37971,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37734,13 +37995,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 437326080
         offset_y: 8
@@ -37785,13 +38046,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 856756480
         offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 8947848
         stroke_color: 856756480
         offset_y: 25
@@ -37809,13 +38070,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 856756480
         offset_y: 8
       }
       secondary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 856756480
         offset_y: 25
@@ -37833,13 +38094,13 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 8947848
         stroke_color: 856756480
         offset_y: 8
       }
       secondary {
-        height: 12
+        height: 13
         color: 8947848
         stroke_color: 856756480
         offset_y: 25
@@ -38120,13 +38381,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4287137928
         stroke_color: 4279308544
         offset_y: 8
       }
       secondary {
-        height: 10
+        height: 11
         color: 4287137928
         stroke_color: 4279308544
         offset_y: 8
@@ -38143,13 +38404,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4287137928
         stroke_color: 4279308544
         offset_y: 8
       }
       secondary {
-        height: 10
+        height: 11
         color: 4287137928
         stroke_color: 4279308544
         offset_y: 8
@@ -38166,13 +38427,13 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 4287137928
         stroke_color: 4279308544
         offset_y: 8
       }
       secondary {
-        height: 10
+        height: 11
         color: 4287137928
         stroke_color: 4279308544
         offset_y: 8
@@ -38846,7 +39107,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 8
       }
@@ -38861,7 +39122,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -38876,7 +39137,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -38927,7 +39188,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 8
       }
@@ -38943,7 +39204,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 8
       }
@@ -38959,7 +39220,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -38975,7 +39236,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -39026,7 +39287,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 8
       }
@@ -39042,7 +39303,7 @@ cont {
     }
     caption {
       primary {
-        height: 12
+        height: 13
         color: 6710886
         offset_y: 8
       }
@@ -39058,7 +39319,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 8
       }
@@ -39074,7 +39335,7 @@ cont {
     }
     caption {
       primary {
-        height: 13
+        height: 14
         color: 6710886
         offset_y: 8
       }
diff --git a/data/patterns.txt b/data/patterns.txt
index 731be161ad..3a93a4e9c5 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -31,6 +31,11 @@
 8.1 8.1
 2.7 2.7
 4.95 4.95
+2.0 1.35
+2.2 1.26
+3.3 1.8
+4.0 1.8
+6.3 2.7
 10.1 10.1
 1.0 12.0
 1.15 14.0
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index cca86523fb..16a3277918 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -602,34 +602,34 @@ area|z17[building],
 node|z17[building],
 area|z17[addr:housenumber][addr:street],
 node|z17[addr:housenumber][addr:street]
-{font-size: 13;}
+{font-size: 15;}
 area|z17[building]::int_name,
 node|z17[building]::int_name,
 area|z17[addr:housenumber][addr:street]::int_name,
 node|z17[addr:housenumber][addr:street]::int_name
-{font-size: 12.5;}
+{font-size: 14.5;}
 
 area|z18[building],
 node|z18[building],
 area|z18[addr:housenumber][addr:street],
 node|z18[addr:housenumber][addr:street]
-{font-size: 14;}
+{font-size: 16;}
 area|z18[building]::int_name,
 node|z18[building]::int_name,
 area|z18[addr:housenumber][addr:street]::int_name,
 node|z18[addr:housenumber][addr:street]::int_name
-{font-size: 13;}
+{font-size: 15;}
 
 area|z19[building],
 node|z19[building],
 area|z19[addr:housenumber][addr:street],
 node|z19[addr:housenumber][addr:street]
-{font-size: 14.5;}
+{font-size: 17.5;}
 area|z19[building]::int_name,
 node|z19[building]::int_name,
 area|z19[addr:housenumber][addr:street]::int_name,
 node|z19[addr:housenumber][addr:street]::int_name
-{font-size: 14;}
+{font-size: 17;}
 
 
 
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 442613d95a..f0eb6e5b29 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -185,7 +185,7 @@ node|z17-[boundary=national_park],
 area|z17-[boundary=national_park],
 node|z17-[leisure=nature_reserve],
 area|z17-[leisure=nature_reserve]
-{icon-image: nparkf-l.svg;text-offset: 10;font-size: 12.75;text-halo-opacity: 0.9;}
+{icon-image: nparkf-l.svg;text-offset: 10;font-size: 13.75;text-halo-opacity: 0.9;}
 
 
 
@@ -300,7 +300,7 @@ area|z15[building=train_station]::int_name,
 node|z16[railway=station],
 node|z16[railway=halt],
 area|z16[building=train_station],
-{icon-image: train-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;}
+{icon-image: train-l.svg;text-offset: 8;font-size: 13.75;text-halo-opacity: 0.8;}
 node|z16[railway=station]::int_name,
 node|z16[railway=halt]::int_name,
 area|z16[building=train_station]::int_name,
@@ -308,7 +308,7 @@ area|z16[building=train_station]::int_name,
 node|z17-[railway=station],
 node|z17-[railway=halt],
 area|z17-[building=train_station],
-{icon-image: train-l.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.9;}
+{icon-image: train-l.svg;text-offset: 8;font-size: 14;text-halo-opacity: 0.9;}
 node|z17-[railway=station]::int_name,
 node|z17-[railway=halt]::int_name,
 area|z17-[building=train_station]::int_name,
@@ -333,9 +333,9 @@ node|z16-[railway=station][transport=subway]::int_name
 
 
 node|z17-[railway=subway_entrance]
-{icon-image: subway-entrance-l.svg;text-offset: 8;font-size: 13.25;text-halo-opacity: 0.9;}
+{icon-image: subway-entrance-l.svg;text-offset: 8;font-size: 14.25;text-halo-opacity: 0.9;}
 node|z17-[railway=subway_entrance]::int_name
-{text-offset: 8;font-size: 11;text-halo-opacity: 0.9;} /*check*/
+{text-offset: 8;font-size: 12;text-halo-opacity: 0.9;} /*check*/
 
 /* 3.2.1 Moscow Subway Station */
 
@@ -371,13 +371,13 @@ node|z16[railway=subway_entrance][city=moscow]
 node|z16[railway=subway_entrance][city=moscow]::int_name
 {text-offset: 25;font-size: 10;}
 node|z17[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 12.75;}
+{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 13.75;}
 node|z17[railway=subway_entrance][city=moscow]::int_name
-{text-offset: 25;font-size: 11;}
+{text-offset: 25;font-size: 12;}
 node|z18-[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 14.5;}
 node|z18-[railway=subway_entrance][city=moscow]::int_name
-{text-offset: 25;font-size: 11;}
+{text-offset: 25;font-size: 12;}
 
 /* 3.2.2 Saint Petersburg Subway Station */
 
@@ -408,30 +408,30 @@ node|z16[railway=subway_entrance][city=spb]
 node|z16[railway=subway_entrance][city=spb]::int_name
 {text-offset: 25;font-size: 11;text-halo-opacity: 0.8;}
 node|z17[railway=subway_entrance][city=spb]
-{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13.75;text-halo-opacity: 0.8;}
 node|z17[railway=subway_entrance][city=spb]::int_name
-{text-offset: 25;font-size: 11;text-halo-opacity: 0.8;}
+{text-offset: 25;font-size: 12;text-halo-opacity: 0.8;}
 node|z18-[railway=subway_entrance][city=spb]
-{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13.5;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 14.5;text-halo-opacity: 0.8;}
 node|z18-[railway=subway_entrance][city=spb]::int_name
-{text-offset: 25;font-size: 12;text-halo-opacity: 0.8;}
+{text-offset: 25;font-size: 13;text-halo-opacity: 0.8;}
 
 /* 3.2.3 Minsk Subway Station */
 node|z13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 4;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 5;}
 node|z15[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 5;}
 node|z16[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;text-offset: 6;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
-node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 13;}
-node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 13;}
+node|z17-[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 11;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
+node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;text-offset: 6;font-size: 13;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
+node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 14;}
+node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 14;}
 
 /* 3.2.4 Kiev Subway Station */
 node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;text-offset: 8;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;}
 node|z15-16[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;}
-node|z17-[railway=station][transport=subway][city=kiev] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-l.svg;font-size: 13;}
+node|z17-[railway=station][transport=subway][city=kiev] {icon-image: zero-icon.svg;font-size: 11;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
+node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-l.svg;font-size: 14;}
 
 /* 3.2.5 London Subway Station */
 node|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;icon-min-distance: 1;}
@@ -493,13 +493,13 @@ node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-l.s
 
 node|z17[railway=tram_stop],
 area|z17[railway=tram_stop]
-{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0;text-halo-opacity: 0;}
+{icon-image: tram-l.svg;text-offset: 8;font-size: 13;text-opacity: 0;text-halo-opacity: 0;}
 node|z17-[railway=tram_stop]::int_name,
 area|z17-[railway=tram_stop]::int_name
-{text-offset: 8;font-size: 10;text-opacity: 0; text-halo-opacity: 0;} /*check*/
+{text-offset: 8;font-size: 11;text-opacity: 0; text-halo-opacity: 0;} /*check*/
 node|z18-[railway=tram_stop],
 area|z18-[railway=tram_stop]
-{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0; text-halo-opacity: 0;}
+{icon-image: tram-l.svg;text-offset: 8;font-size: 13;text-opacity: 0; text-halo-opacity: 0;}
 
 /* 3.4 Bus Station */
 
@@ -544,19 +544,19 @@ area|z17-[aeroway=airport],
 node|z17-[aeroway=airport],
 area|z17-[aeroway=aerodrome],
 node|z17-[aeroway=aerodrome],
-{icon-image: airport-l.svg;text-offset: 7;font-size: 12;}
+{icon-image: airport-l.svg;text-offset: 7;font-size: 13;}
 area|z17-[aeroway=airport]::int_name,
 node|z17-[aeroway=airport]::int_name,
 area|z17-[aeroway=aerodrome]::int_name,
 node|z17-[aeroway=aerodrome]::int_name,
-{font-size: 11;}
+{font-size: 12;}
 
 
 
 
 area|z17-[aeroway=heliport],
 node|z17-[aeroway=heliport],
-{icon-image: helipad-l.svg;text-offset: 10;font-size: 10;text: name;text-color: @poi_label;}
+{icon-image: helipad-l.svg;text-offset: 10;font-size: 11;text: name;text-color: @poi_label;}
 
 /* 3.7 Aerialway */
 
@@ -598,40 +598,40 @@ area|z16[amenity=restaurant]
 {icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;}
 node|z17[amenity=cafe],
 area|z17[amenity=cafe]
-{icon-image: cafe-l.svg;icon-min-distance: 20;font-size: 12.75;}
+{icon-image: cafe-l.svg;icon-min-distance: 20;font-size: 13.75;}
 node|z17[amenity=restaurant],
 area|z17[amenity=restaurant]
-{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;}
+{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 13.75;}
 node|z17[amenity=fast_food],
 area|z17[amenity=fast_food]
-{icon-image: fastfood-l.svg;icon-min-distance: 25;font-size: 12.75;}
+{icon-image: fastfood-l.svg;icon-min-distance: 25;font-size: 13.75;}
 
 
 node|z18[amenity=cafe],
 area|z18[amenity=cafe]
-{icon-image: cafe-xl.svg;icon-min-distance: 25;font-size: 13.5;}
+{icon-image: cafe-xl.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=restaurant],
 area|z18[amenity=restaurant]
-{icon-image: restaurant-xl.svg;icon-min-distance: 25;font-size: 13.5;}
+{icon-image: restaurant-xl.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=fast_food],
 area|z18[amenity=fast_food]
-{icon-image: fastfood-xl.svg;icon-min-distance: 25;font-size: 13.5;}
+{icon-image: fastfood-xl.svg;icon-min-distance: 25;font-size: 14.5;}
 
 node|z19[amenity=cafe],
 area|z19[amenity=cafe]
-{icon-image: cafe-xl.svg;icon-min-distance: 35;font-size: 13.5;}
+{icon-image: cafe-xl.svg;icon-min-distance: 35;font-size: 14.5;}
 node|z19[amenity=restaurant],
 area|z19[amenity=restaurant]
-{icon-image: restaurant-xl.svg;icon-min-distance: 40;font-size: 13.5;}
+{icon-image: restaurant-xl.svg;icon-min-distance: 40;font-size: 14.5;}
 node|z19[amenity=fast_food],
 area|z19[amenity=fast_food]
-{icon-image: fastfood-xl.svg;icon-min-distance: 45;font-size: 13.5;}
+{icon-image: fastfood-xl.svg;icon-min-distance: 45;font-size: 14.5;}
 
 
 /* 5.AMENITY (infrastructure) */
 node|z17-[amenity=place_of_worship],
 area|z17-[amenity=place_of_worship],
-{text: name;text-color: @poi_label;text-offset: 10;font-size: 9;}
+{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;}
 
 /*node|z13-[leisure=stadium],
 area|z13-[leisure=stadium],*/
@@ -672,11 +672,11 @@ area|z16[building=hospital]
 node|z17[amenity=hospital],
 node|z17[building=hospital],
 area|z17[building=hospital]
-{icon-image: hospital-l.svg;icon-min-distance: 14;font-size: 12.75;}
+{icon-image: hospital-l.svg;icon-min-distance: 14;font-size: 13.75;}
 node|z18-[amenity=hospital],
 node|z18-[building=hospital],
 area|z18-[building=hospital],
-{icon-image: hospital-xl.svg;font-size: 13.5;}
+{icon-image: hospital-xl.svg;font-size: 14.5;}
 
 
 
@@ -694,19 +694,19 @@ node|z16[amenity=university][!name]
 {}
 node|z17[amenity=university][name],
 area|z17[amenity=university][name]
-{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 12.75;}
+{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 13.75;}
 node|z17[amenity=university][!name],
 area|z17[amenity=university][!name]
 {}
 node|z18[amenity=university][name],
 area|z18[amenity=university][name]
-{icon-image: college-xl.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 13.5;}
+{icon-image: college-xl.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 14.5;}
 node|z18[amenity=university][!name],
 area|z18[amenity=university][!name]
 {}
 node|z19[amenity=university][name],
 area|z19[amenity=university][name]
-{icon-image: college-xl.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 13.5;}
+{icon-image: college-xl.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 14.5;}
 node|z19[amenity=university][!name],
 area|z19[amenity=university][!name]
 {}
@@ -722,36 +722,36 @@ area|z19[amenity=university][!name]
 
 node|z16-[amenity=place_of_worship],
 area|z16-[amenity=place_of_worship]
-{icon-image: place-of-worship-l.svg;icon-min-distance: 10;font-size: 12.75;}
+{icon-image: place-of-worship-l.svg;icon-min-distance: 10;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=christian],
 area|z16-[amenity=place_of_worship][religion=christian]
-{icon-image: christian-l.svg;font-size: 12.75;}
+{icon-image: christian-l.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=muslim],
 area|z16-[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-l.svg;font-size: 12.75;}
+{icon-image: muslim-l.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=buddhist],
 area|z16-[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-l.svg;font-size: 12.75;}
+{icon-image: buddhist-l.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=hindu],
 area|z16-[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-l.svg;font-size: 12.75;}
+{icon-image: hindu-l.svg;font-size: 13;}
 
 
 node|z18-[amenity=place_of_worship],
 area|z18-[amenity=place_of_worship]
-{icon-image: place-of-worship-l.svg;font-size: 13.5;}
+{icon-image: place-of-worship-l.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=christian],
 area|z18-[amenity=place_of_worship][religion=christian]
-{icon-image: christian-l.svg;font-size: 13.5;}
+{icon-image: christian-l.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=muslim],
 area|z18-[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-l.svg;font-size: 13.5;}
+{icon-image: muslim-l.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=buddhist],
 area|z18-[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-l.svg;font-size: 13.5;}
+{icon-image: buddhist-l.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=hindu],
 area|z18-[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-l.svg;font-size: 13.5;}
+{icon-image: hindu-l.svg;font-size: 14.5;}
 
 
 /* 5.5 Others */
@@ -759,15 +759,15 @@ area|z18-[amenity=place_of_worship][religion=hindu]
 
 node|z17[amenity=bank],
 area|z17[amenity=bank]
-{icon-image: bank-l.svg;font-size: 12.75; icon-min-distance: 15}
+{icon-image: bank-l.svg;font-size: 13.75; icon-min-distance: 15}
 node|z18-[amenity=bank],
 area|z18-[amenity=bank]
-{icon-image: bank-xl.svg;font-size: 13.5; icon-min-distance: 10}
+{icon-image: bank-xl.svg;font-size: 14.5; icon-min-distance: 10}
 
 
 node|z12-14[barrier=toll_booth],
 area|z12-14[barrier=toll_booth]
-{icon-image: toll_booth-s.svg;icon-min-distance: 8;}
+{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
 node|z15-16[barrier=toll_booth],
 area|z15-16[barrier=toll_booth]
 {icon-image: toll_booth-l.svg;icon-min-distance: 8;}
@@ -797,7 +797,7 @@ area|z17-[amenity=vending_machine]
 {icon-image: vending-l.svg;icon-min-distance: 20;}
 node|z17-[amenity=vending_machine][vending=parking_tickets],
 area|z17-[amenity=vending_machine][vending=parking_tickets]
-{icon-image: parking-meter-l.svg;font-size: 12.5;}
+{icon-image: parking-meter-l.svg;font-size: 13.5;}
 node|z18-[amenity=vending_machine],
 area|z18-[amenity=vending_machine]
 {icon-image: vending-l.svg;}
@@ -826,10 +826,10 @@ area|z15[shop=mall]
 {icon-image: shop-m.svg;font-size:12.5;icon-min-distance: 6;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
 node|z16-17[shop=mall],
 area|z16-17[shop=mall]
-{icon-image: shop-l.svg;font-size: 12.75;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
+{icon-image: shop-l.svg;font-size: 13.25;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
 node|z18-[shop=mall],
 area|z18-[shop=mall]
-{icon-image: shop-xl.svg;font-size: 13.5;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
+{icon-image: shop-xl.svg;font-size: 14.5;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
 
 node|z14[shop=supermarket],
 area|z14[shop=supermarket]
@@ -839,12 +839,12 @@ area|z15[shop=supermarket]
 {icon-image: grocery-m.svg;font-size:12.5;icon-min-distance: 3;}
 node|z16-17[shop=supermarket],
 area|z16-17[shop=supermarket]
-{icon-image: grocery-l.svg;font-size: 12.75;icon-min-distance: 16;text-min-distance:6;}
+{icon-image: grocery-l.svg;font-size: 13.25;icon-min-distance: 16;text-min-distance:6;}
 
 
 node|z18-[shop=supermarket],
 area|z18-[shop=supermarket]
-{icon-image: grocery-xl.svg;font-size: 13.5;icon-min-distance: 15;}
+{icon-image: grocery-xl.svg;font-size: 14.5;icon-min-distance: 15;}
 
 
 node|z15[shop=car_repair][service=tyres],
@@ -855,37 +855,37 @@ area|z16[shop=car_repair][service=tyres]
 {icon-image: car-repair-l.svg;;-x-me-text-priority:15500;font-size: 12.75;}
 node|z17[shop=car_repair][service=tyres],
 area|z17[shop=car_repair][service=tyres]
-{icon-image: car-repair-l.svg;font-size: 12.75;}
+{icon-image: car-repair-l.svg;font-size: 13.75;}
 node|z18-[shop=car_repair][service=tyres],
 area|z18-[shop=car_repair][service=tyres]
-{icon-image: car-repair-l.svg;font-size: 13.5;}
+{icon-image: car-repair-l.svg;font-size: 14.5;}
 
 
 node|z17[shop=car],
 area|z17[shop=car]
-{icon-image: car_shop-l.svg;icon-min-distance: 24;font-size: 12.75;}
+{icon-image: car_shop-l.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=motorcycle],
 area|z17[shop=motorcycle]
-{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;font-size: 12.75;}
+{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=car_parts],
 area|z17[shop=car_parts]
-{icon-image: car-part-l.svg;icon-min-distance: 24;font-size: 12.75;}
+{icon-image: car-part-l.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=car_repair],
 area|z17[shop=car_repair]
-{icon-image: car-repair-l.svg;icon-min-distance: 24;font-size: 12.75;}
+{icon-image: car-repair-l.svg;icon-min-distance: 24;font-size: 13.75;}
 
 node|z18-[shop=car],
 area|z18-[shop=car]
-{icon-image: car_shop-xl.svg;font-size: 13.5;}
+{icon-image: car_shop-xl.svg;font-size: 14.5;}
 node|z18-[shop=motorcycle],
 area|z18-[shop=motorcycle]
-{icon-image: motorcycle_shop-l.svg;font-size: 13.5;}
+{icon-image: motorcycle_shop-l.svg;font-size: 14.5;}
 node|z18-[shop=car_parts],
 area|z18-[shop=car_parts]
-{icon-image: car-part-xl.svg;font-size: 13.5;}
+{icon-image: car-part-xl.svg;font-size: 14.5;}
 node|z18-[shop=car_repair],
 area|z18-[shop=car_repair]
-{icon-image: car-repair-xl.svg;font-size: 13.5;}
+{icon-image: car-repair-xl.svg;font-size: 14.5;}
 
 
 /* 7. CAR */
@@ -921,10 +921,10 @@ area|z16[amenity=fuel]
 {icon-image: fuel-l.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;}
 node|z17[amenity=fuel],
 area|z17[amenity=fuel]
-{icon-image: fuel-l.svg;font-size: 12.75;}
+{icon-image: fuel-l.svg;font-size: 13.75;}
 node|z18-[amenity=fuel],
 area|z18-[amenity=fuel]
-{icon-image: fuel-xl.svg;font-size: 13.5;text:}
+{icon-image: fuel-xl.svg;font-size: 14.5;text:}
 
 node|z14[amenity=charging_station],
 area|z14[amenity=charging_station]
@@ -937,10 +937,10 @@ area|z16[amenity=charging_station]
 {icon-image: charging-station-l.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;}
 node|z17[amenity=charging_station],
 area|z17[amenity=charging_station]
-{icon-image: charging-station-l.svg; font-size: 12.75;}
+{icon-image: charging-station-l.svg; font-size: 13.75;}
 node|z18-[amenity=charging_station],
 area|z18-[amenity=charging_station]
-{icon-image: charging-station-xl.svg;font-size: 12.75;}
+{icon-image: charging-station-xl.svg;font-size: 14.75;}
 
 node|z13[highway=speed_camera]
 {icon-image: speedcam-l.svg; z-index: 75000;}
@@ -956,18 +956,18 @@ node|z18-[highway=speed_camera]
 
 node|z17[amenity=car_wash],
 area|z17[amenity=car_wash]
-{icon-image: car-wash-l.svg;font-size: 12.75;icon-min-distance: 24;}
+{icon-image: car-wash-l.svg;font-size: 13.75;icon-min-distance: 24;}
 node|z18-[amenity=car_wash],
 area|z18-[amenity=car_wash ]
-{icon-image: car-wash-xl.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: car-wash-xl.svg;text-offset: 10;font-size: 14.5;}
 
 node|z18-[amenity=car_rental],
 area|z18-[amenity=car_rental]
-{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 14.5;}
 
 node|z18-[amenity=car_sharing],
 area|z18-[amenity=car_sharing]
-{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 14.5;}
 
 /* 7.1 Parking */
 
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index c1aa28645b..f7d240d348 100755
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -916,28 +916,33 @@ line|z19-[highway=proposed]
 
 /* 8.6 Track & Path 14-22 ZOOM */
 
-/*line|z14[highway=track][tracktype=grade1],
-line|z14[highway=raceway],
-line|z14[leisure=track]
-{width: 1;}
+line|z14-[highway=track][tracktype=grade1],
+line|z14-[psurface=unpaved_good],
+line|z14-[psurface=unpaved_bad]
+{color: @pedestrian;opacity: 1;}
+
+line|z14[highway=track][tracktype=grade1],
+line|z14[psurface=unpaved_good],
+line|z14[psurface=unpaved_bad]
+{width: 1.4;dashes: 2,1.35;}
 line|z15[highway=track][tracktype=grade1],
-line|z15[highway=raceway],
-line|z15[leisure=track]
-{width: 1.5;}
+line|z15[psurface=unpaved_good],
+line|z15[psurface=unpaved_bad]
+{width: 2;dashes: 2.2,1.26;}
 line|z16[highway=track][tracktype=grade1],
-line|z16[highway=raceway],
-line|z16[leisure=track]
-{width: 1.8;}
+line|z16[psurface=unpaved_good],
+line|z16[psurface=unpaved_bad]
+{width: 2.6;dashes: 3.3,1.8;}
 line|z17-18[highway=track][tracktype=grade1],
-line|z17-18[highway=raceway],
-line|z17-18[leisure=track]
-{width:3;}
+line|z17-18[psurface=unpaved_good],
+line|z17-18[psurface=unpaved_bad]
+{width: 3;dashes: 4,1.8;}
 line|z19-[highway=track][tracktype=grade1],
-line|z19-[highway=raceway],
-line|z19-[leisure=track]
-{width:4;}
+line|z19-[psurface=unpaved_good],
+line|z19-[psurface=unpaved_bad]
+{width: 4;dashes: 6.3,2.7;}
 
-line|z14[highway=track],
+/*line|z14[highway=track],
 line|z14[highway=path],
 line|z14[route=hiking]
 {width:0.9;dashes: 2.52,1.35;}
diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss
index 4ed05e61c0..af6950d033 100755
--- a/data/styles/vehicle/include/Roads_label.mapcss
+++ b/data/styles/vehicle/include/Roads_label.mapcss
@@ -295,39 +295,39 @@ line|z10-11[highway=motorway],
 line|z10-11[highway=trunk],
 line|z10-11[highway=motorway_link],
 line|z10-11[highway=trunk_link]
-{font-size: 12;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
+{font-size: 13;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
 line|z12-13[highway=motorway],
 line|z12-13[highway=trunk],
 line|z12-13[highway=motorway_link],
 line|z12-13[highway=trunk_link]
-{font-size: 13;text-halo-color: @label_halo_light;}
+{font-size: 15;text-halo-color: @label_halo_light;}
 line|z14-15[highway=motorway],
 line|z14-15[highway=trunk],
-{font-size: 14;text-color: @label_dark;text-halo-opacity: 0.9;}
+{font-size: 16;text-color: @label_dark;text-halo-opacity: 0.9;}
 line|z14[highway=motorway_link],
 line|z14[highway=trunk_link]
-{font-size: 11.5;text-halo-color: @label_halo_medium;}
+{font-size: 13.5;text-halo-color: @label_halo_medium;}
 line|z15[highway=motorway_link],
 line|z15[highway=trunk_link]
-{font-size: 12;text-halo-color: @label_halo_medium;}
+{font-size: 14;text-halo-color: @label_halo_medium;}
 line|z16[highway=trunk],
 line|z16[highway=motorway],
-{font-size: 16.5;text-color: @label_dark;text-halo-opacity: 0.9;}
+{font-size: 18.5;text-color: @label_dark;text-halo-opacity: 0.9;}
 line|z16[highway=motorway_link],
 line|z16[highway=trunk_link]
-{font-size: 13.75;text-halo-opacity: 0.9;}
+{font-size: 15.75;text-halo-opacity: 0.9;}
 line|z17[highway=trunk],
 line|z17[highway=motorway],
-{font-size: 17.5;text-color: @label_dark;text-halo-opacity: 0.99;}
+{font-size: 19.5;text-color: @label_dark;text-halo-opacity: 0.99;}
 line|z17[highway=motorway_link],
 line|z17[highway=trunk_link]
-{font-size: 14;text-halo-opacity: 0.99;}
+{font-size: 16;text-halo-opacity: 0.99;}
 line|z18-[highway=trunk],
 line|z18-[highway=motorway],
-{font-size: 18.5;text-color: @label_dark;text-halo-opacity: 1;}
+{font-size: 20.5;text-color: @label_dark;text-halo-opacity: 1;}
 line|z18-[highway=motorway_link],
 line|z18-[highway=trunk_link]
-{font-size: 14.75;text-halo-opacity: 1;}
+{font-size: 16.75;text-halo-opacity: 1;}
 
 /* 4.PRIMARY 10-22 ZOOM */
 
@@ -337,31 +337,31 @@ line|z10-[highway=primary_link],
 
 line|z10[highway=primary],
 line|z10[highway=primary_link]
-{font-size: 11.5;text-halo-color: @label_halo_medium;}
+{font-size: 12.5;text-halo-color: @label_halo_medium;}
 line|z11[highway=primary],
 line|z11[highway=primary_link]
-{font-size: 11.5;text-halo-color: @label_halo_medium;}
+{font-size: 13.5;text-halo-color: @label_halo_medium;}
 line|z12-13[highway=primary],
 line|z12-13[highway=primary_link]
-{font-size: 12.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;}
+{font-size: 14.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;}
 line|z14-15[highway=primary],
-{font-size: 13.5;text-color: @label_dark;}
+{font-size: 15.5;text-color: @label_dark;}
 line|z14[highway=primary_link]
-{font-size: 11;text-halo-color: @label_halo_medium;}
+{font-size: 13;text-halo-color: @label_halo_medium;}
 line|z15[highway=primary_link]
-{font-size: 11.5;text-halo-color: @label_halo_medium;}
+{font-size: 13.5;text-halo-color: @label_halo_medium;}
 line|z16[highway=primary],
-{font-size: 15.5;text-color: @label_dark;}
+{font-size: 17.5;text-color: @label_dark;}
 line|z16[highway=primary_link],
-{font-size: 13;}
+{font-size: 15;}
 line|z17[highway=primary],
-{font-size: 16.75;text-color: @label_dark;}
+{font-size: 18.75;text-color: @label_dark;}
 line|z17[highway=primary_link],
-{font-size: 13.5;}
+{font-size: 15.5;}
 line|z18-[highway=primary],
-{font-size: 17;text-color: @label_dark;}
+{font-size: 19;text-color: @label_dark;}
 line|z18-[highway=primary_link],
-{font-size: 14.5;text-halo-opacity: 1;}
+{font-size: 16.5;text-halo-opacity: 1;}
 
 /* 5.SECONDARY 10-22 ZOOM */
 
@@ -370,22 +370,22 @@ line|z16-[highway=secondary_link]
 {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
 
 line|z10-11[highway=secondary]
-{font-size: 11;text-color: @label_light;}
+{font-size: 12;text-color: @label_light;}
 line|z12-13[highway=secondary]
-{font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
+{font-size: 14;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
 line|z14[highway=secondary],
-{font-size: 12.75;}
+{font-size: 14.75;}
 line|z15[highway=secondary],
-{font-size: 13.75;}
+{font-size: 15.75;}
 line|z16[highway=secondary],
 line|z16[highway=secondary_link]
-{font-size: 15;text-color: @label_dark;text-halo-color: @label_halo_light;}
+{font-size: 17;text-color: @label_dark;text-halo-color: @label_halo_light;}
 line|z17[highway=secondary],
 line|z17[highway=secondary_link]
-{font-size: 15.75;text-color: @label_dark;text-halo-color: @label_halo_light;}
+{font-size: 17.75;text-color: @label_dark;text-halo-color: @label_halo_light;}
 line|z18-[highway=secondary],
 line|z18-[highway=secondary_link]
-{font-size: 16;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 18;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 6.RESIDENTAL & TERTIARY 12-22 ZOOM */
 
@@ -397,24 +397,24 @@ line|z18-[highway=tertiary_link]
 
 line|z12-13[highway=residential],
 line|z12-13[highway=tertiary]
-{font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
+{font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
 line|z14[highway=residential],
 line|z14[highway=tertiary],
-{font-size: 11;}
+{font-size: 13;}
 line|z15[highway=residential],
 line|z15[highway=tertiary],
-{font-size: 12.5;}
+{font-size: 14.5;}
 line|z16[highway=residential],
 line|z16[highway=tertiary],
-{font-size: 13.5;text-halo-color: @label_halo_light;}
+{font-size: 15.5;text-halo-color: @label_halo_light;}
 line|z17[highway=residential],
 line|z17[highway=tertiary],
-{font-size: 14.25;text-halo-color: @label_halo_light;}
+{font-size: 16.25;text-halo-color: @label_halo_light;}
 line|z18-[highway=residential],
 line|z18-[highway=residential_link],
 line|z18-[highway=tertiary],
 line|z18-[highway=tertiary_link]
-{font-size: 15;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 17;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 14-22 ZOOM */
 
@@ -429,25 +429,25 @@ line|z14[highway=unclassified],
 line|z14[highway=living_street],
 line|z14[highway=pedestrian],
 line|z14[highway=road],
-{font-size: 10.5;}
+{font-size: 12.5;}
 line|z15[highway=unclassified],
 line|z15[highway=living_street],
 line|z15[highway=pedestrian],
 line|z15[highway=road],
-{font-size: 11.5;}
+{font-size: 13.5;}
 line|z16-17[highway=unclassified],
 line|z16-17[highway=living_street],
-{font-size: 12.5;text-halo-color: @label_halo_light;}
+{font-size: 14.5;text-halo-color: @label_halo_light;}
 line|z16-17[highway=pedestrian],
 line|z16-17[highway=service],
 line|z16-17[highway=road],
-{font-size: 12.5;text-halo-color: @label_halo_light;}
+{font-size: 15.5;text-halo-color: @label_halo_light;}
 line|z18-[highway=unclassified],
 line|z18-[highway=living_street],
 line|z18-[highway=pedestrian],
 line|z18-[highway=service],
 line|z18-[highway=road],
-{font-size: 13.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 15.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 8.OTHERS ROADS 15-22 ZOOM */
 
diff --git a/data/visibility.txt b/data/visibility.txt
index 40f7186cef..f439154cda 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -313,7 +313,7 @@ world  00000000000000000000  +
         track  00000000000000000000  +
             area  00000000000000000000  -
             bridge  00000000000000000000  -
-            grade1  00000000000000000000  -
+            grade1  00000000000000111111  -
             grade2  00000000000000000000  -
             grade3  00000000000000000000  +
                 no-access  00000000000000000000  -
@@ -624,8 +624,8 @@ world  00000000000000000000  +
     psurface  00000000000000000000  +
         paved_bad  00000000000000000000  -
         paved_good  00000000000000000000  -
-        unpaved_bad  00000000000000000000  -
-        unpaved_good  00000000000000000000  -
+        unpaved_bad  00000000000000111111  -
+        unpaved_good  00000000000000111111  -
         {}
     public_transport  00000000000000000000  +
         platform  00000000000000000000  -