[ink] updated binary stylesheet

1 files changed, 48238 insertions, 9977 deletions

diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index 7c6e0e8eff..a63b3e1fcf 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -1,11 +1,56 @@
 cont {
   name: "aerialway-cable_car"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.8
       color: 0x111111
-      priority: 1608
+      priority: 1601
     }
   }
   element {
@@ -13,7 +58,7 @@ cont {
     lines {
       width: 1.6
       color: 0x111111
-      priority: 1778
+      priority: 1774
     }
   }
   element {
@@ -21,7 +66,7 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1846
+      priority: 1844
     }
   }
   element {
@@ -29,7 +74,7 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1846
+      priority: 1844
     }
   }
   element {
@@ -37,18 +82,63 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1846
+      priority: 1844
     }
   }
 }
 cont {
   name: "aerialway-chair_lift"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.8
       color: 0x111111
-      priority: 1613
+      priority: 1607
     }
   }
   element {
@@ -56,7 +146,7 @@ cont {
     lines {
       width: 1.6
       color: 0x111111
-      priority: 1783
+      priority: 1779
     }
   }
   element {
@@ -87,11 +177,56 @@ cont {
 cont {
   name: "aerialway-gondola"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.8
       color: 0x111111
-      priority: 1610
+      priority: 1604
     }
   }
   element {
@@ -99,7 +234,7 @@ cont {
     lines {
       width: 1.6
       color: 0x111111
-      priority: 1780
+      priority: 1777
     }
   }
   element {
@@ -107,7 +242,7 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1849
+      priority: 1846
     }
   }
   element {
@@ -115,7 +250,7 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1849
+      priority: 1846
     }
   }
   element {
@@ -123,18 +258,63 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1849
+      priority: 1846
     }
   }
 }
 cont {
   name: "aerialway-mixed_lift"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.8
       color: 0x111111
-      priority: 1616
+      priority: 1610
     }
   }
   element {
@@ -142,7 +322,7 @@ cont {
     lines {
       width: 1.6
       color: 0x111111
-      priority: 1786
+      priority: 1782
     }
   }
   element {
@@ -150,7 +330,7 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1852
+      priority: 1849
     }
   }
   element {
@@ -158,7 +338,7 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1852
+      priority: 1849
     }
   }
   element {
@@ -166,13 +346,52 @@ cont {
     lines {
       width: 3.2
       color: 0x111111
-      priority: 1852
+      priority: 1849
     }
   }
 }
 cont {
   name: "aerialway-station"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     circle {
       radius: 2
@@ -204,9 +423,15 @@ cont {
       priority: 16000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -220,9 +445,15 @@ cont {
       priority: 16000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -236,9 +467,15 @@ cont {
       priority: 16000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -252,9 +489,15 @@ cont {
       priority: 16000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -264,10 +507,43 @@ cont {
 cont {
   name: "aeroway-aerodrome"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
     scale: 11
     area {
       color: 0xcccccc
-      priority: -16001
+      priority: -16000
     }
   }
   element {
@@ -279,13 +555,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -293,7 +569,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16002
+      priority: -16000
     }
   }
   element {
@@ -305,13 +581,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -319,7 +595,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16003
+      priority: -16000
     }
   }
   element {
@@ -331,13 +607,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -345,7 +621,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16004
+      priority: -16000
     }
   }
   element {
@@ -357,13 +633,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -371,7 +647,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16005
+      priority: -16000
     }
   }
   element {
@@ -383,13 +659,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -397,7 +673,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16006
+      priority: -16000
     }
   }
   element {
@@ -409,13 +685,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -423,7 +699,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16007
+      priority: -16000
     }
   }
   element {
@@ -435,13 +711,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -449,7 +725,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16008
+      priority: -16000
     }
   }
   element {
@@ -461,13 +737,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -475,13 +751,49 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16009
+      priority: -16000
     }
   }
 }
 cont {
   name: "aeroway-airport"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "airport"
@@ -490,13 +802,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -512,13 +824,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -534,13 +846,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -556,13 +868,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -578,13 +890,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -600,13 +912,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -622,13 +934,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -644,13 +956,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -661,77 +973,167 @@ cont {
 cont {
   name: "aeroway-apron"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
     scale: 11
     area {
       color: 0xcccccc
-      priority: -16010
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16011
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16012
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16013
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16014
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16015
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xcccccc
-      priority: -16016
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xcccccc
-      priority: -16017
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xcccccc
-      priority: -16018
+      priority: -16000
     }
   }
 }
 cont {
   name: "aeroway-gate"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -740,9 +1142,15 @@ cont {
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -751,9 +1159,15 @@ cont {
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -763,6 +1177,51 @@ cont {
 cont {
   name: "aeroway-helipad"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     symbol {
       name: "helipad"
@@ -801,11 +1260,47 @@ cont {
 cont {
   name: "aeroway-runway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
-      width: 3
+      width: 4
       color: 0x111111
-      priority: 260
+      priority: 256
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -814,15 +1309,15 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1260
+      priority: 1256
     }
   }
   element {
     scale: 13
     lines {
-      width: 3.5
+      width: 4.5
       color: 0x111111
-      priority: 273
+      priority: 270
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -831,7 +1326,7 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1273
+      priority: 1270
     }
   }
   element {
@@ -839,7 +1334,7 @@ cont {
     lines {
       width: 14
       color: 0x111111
-      priority: 361
+      priority: 350
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -848,7 +1343,7 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1361
+      priority: 1350
     }
   }
   element {
@@ -940,11 +1435,47 @@ cont {
 cont {
   name: "aeroway-taxiway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
-      width: 0.74
+      width: 2.5
       color: 0x111111
-      priority: 263
+      priority: 259
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -953,15 +1484,15 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1263
+      priority: 1259
     }
   }
   element {
     scale: 13
     lines {
-      width: 1.5
+      width: 3
       color: 0x111111
-      priority: 276
+      priority: 272
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -970,7 +1501,7 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1276
+      priority: 1272
     }
   }
   element {
@@ -978,7 +1509,7 @@ cont {
     lines {
       width: 6
       color: 0x111111
-      priority: 364
+      priority: 353
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -987,7 +1518,7 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1364
+      priority: 1353
     }
   }
   element {
@@ -995,7 +1526,7 @@ cont {
     lines {
       width: 12
       color: 0x111111
-      priority: 435
+      priority: 426
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -1004,7 +1535,7 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1435
+      priority: 1426
     }
   }
   element {
@@ -1012,7 +1543,7 @@ cont {
     lines {
       width: 12
       color: 0x111111
-      priority: 435
+      priority: 426
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -1021,7 +1552,7 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1435
+      priority: 1426
     }
   }
   element {
@@ -1029,7 +1560,7 @@ cont {
     lines {
       width: 12
       color: 0x111111
-      priority: 435
+      priority: 426
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -1038,7 +1569,7 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1435
+      priority: 1426
     }
   }
   element {
@@ -1046,7 +1577,7 @@ cont {
     lines {
       width: 12
       color: 0x111111
-      priority: 435
+      priority: 426
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -1055,7 +1586,7 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1435
+      priority: 1426
     }
   }
   element {
@@ -1063,7 +1594,7 @@ cont {
     lines {
       width: 12
       color: 0x111111
-      priority: 435
+      priority: 426
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -1072,77 +1603,170 @@ cont {
       color: 0xcccccc
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1435
+      priority: 1426
     }
   }
 }
 cont {
   name: "aeroway-terminal"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16019
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16020
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16021
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16022
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16023
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16024
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16025
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16026
+      priority: -16000
     }
   }
 }
 cont {
   name: "amenity"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1152,9 +1776,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1164,9 +1794,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1177,15 +1813,72 @@ cont {
 cont {
   name: "amenity-atm"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "atm"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1199,9 +1892,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1215,9 +1914,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1228,6 +1933,54 @@ cont {
 cont {
   name: "amenity-bank"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "bank"
@@ -1241,9 +1994,15 @@ cont {
       priority: 16016
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1257,9 +2016,15 @@ cont {
       priority: 16016
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1273,9 +2038,15 @@ cont {
       priority: 16016
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1286,6 +2057,54 @@ cont {
 cont {
   name: "amenity-bar"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "bar"
@@ -1299,9 +2118,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1315,9 +2140,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1331,9 +2162,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1344,6 +2181,54 @@ cont {
 cont {
   name: "amenity-bench"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "bench"
@@ -1357,9 +2242,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1373,9 +2264,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1389,9 +2286,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1402,6 +2305,54 @@ cont {
 cont {
   name: "amenity-bicycle_rental"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "bicycle_rental"
@@ -1415,9 +2366,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1431,9 +2388,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1447,9 +2410,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1460,6 +2429,54 @@ cont {
 cont {
   name: "amenity-bureau_de_change"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "bureau_de_change"
@@ -1473,9 +2490,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1489,9 +2512,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1505,9 +2534,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1518,82 +2553,178 @@ cont {
 cont {
   name: "amenity-bus_station"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "bus"
-      priority: 16032
+      priority: 16033
     }
   }
   element {
     scale: 17
     symbol {
       name: "bus"
-      priority: 16032
+      priority: 16033
     }
     caption {
       secondary {
         height: 10
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
     scale: 18
     symbol {
       name: "bus"
-      priority: 16032
+      priority: 16033
     }
     caption {
       secondary {
         height: 10
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
     scale: 19
     symbol {
       name: "bus"
-      priority: 16032
+      priority: 16033
     }
     caption {
       secondary {
         height: 10
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15032
+      priority: 15033
     }
   }
 }
 cont {
   name: "amenity-cafe"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "cafe"
@@ -1607,9 +2738,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1623,9 +2760,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1639,9 +2782,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1652,6 +2801,54 @@ cont {
 cont {
   name: "amenity-car_rental"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "car_rental"
@@ -1665,9 +2862,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1681,9 +2884,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1697,9 +2906,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1710,6 +2925,54 @@ cont {
 cont {
   name: "amenity-car_sharing"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "car_sharing"
@@ -1723,9 +2986,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1739,9 +3008,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1755,9 +3030,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1768,6 +3049,54 @@ cont {
 cont {
   name: "amenity-cinema"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "cinema"
@@ -1781,9 +3110,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1797,9 +3132,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1813,9 +3154,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1826,17 +3173,62 @@ cont {
 cont {
   name: "amenity-college"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xdddddd
-      priority: -16027
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xdddddd
-      priority: -16028
+      priority: -16000
     }
   }
   element {
@@ -1846,9 +3238,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1866,9 +3264,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1886,9 +3290,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1903,6 +3313,54 @@ cont {
 cont {
   name: "amenity-doctors"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "pharmacy"
@@ -1916,9 +3374,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1932,9 +3396,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1948,9 +3418,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1961,15 +3437,72 @@ cont {
 cont {
   name: "amenity-drinking_water"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "drinking_water"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1983,9 +3516,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -1999,9 +3538,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2012,6 +3557,54 @@ cont {
 cont {
   name: "amenity-embassy"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "embassy"
@@ -2025,9 +3618,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2041,9 +3640,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2057,9 +3662,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2070,6 +3681,54 @@ cont {
 cont {
   name: "amenity-fast_food"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "fastfood"
@@ -2083,9 +3742,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2099,9 +3764,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2115,9 +3786,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2128,6 +3805,54 @@ cont {
 cont {
   name: "amenity-ferry_terminal"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "slipway"
@@ -2141,9 +3866,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2157,9 +3888,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2173,9 +3910,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2186,6 +3929,54 @@ cont {
 cont {
   name: "amenity-fire_station"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "firebrigade"
@@ -2199,9 +3990,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2215,9 +4012,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2231,9 +4034,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2244,14 +4053,62 @@ cont {
 cont {
   name: "amenity-fountain"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "fountain"
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
@@ -2261,9 +4118,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2281,9 +4144,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2301,9 +4170,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2318,6 +4193,51 @@ cont {
 cont {
   name: "amenity-fuel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     symbol {
       name: "petrolstation"
@@ -2338,9 +4258,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2354,9 +4280,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2370,9 +4302,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2383,6 +4321,45 @@ cont {
 cont {
   name: "amenity-grave_yard"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     area {
       color: 0xeeeeee
@@ -2413,9 +4390,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2429,9 +4412,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2445,9 +4434,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2462,6 +4457,45 @@ cont {
 cont {
   name: "amenity-grave_yard-christian"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     area {
       color: 0xeeeeee
@@ -2492,9 +4526,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2508,9 +4548,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2524,9 +4570,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2541,15 +4593,72 @@ cont {
 cont {
   name: "amenity-hospital"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "hospital"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2563,9 +4672,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2579,9 +4694,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2592,6 +4713,54 @@ cont {
 cont {
   name: "amenity-hunting_stand"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "hunting_closed_high"
@@ -2605,9 +4774,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2621,9 +4796,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2637,9 +4818,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2650,17 +4837,62 @@ cont {
 cont {
   name: "amenity-kindergarten"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xdddddd
-      priority: -16029
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xdddddd
-      priority: -16030
+      priority: -16000
     }
   }
   element {
@@ -2670,9 +4902,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2690,9 +4928,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2710,9 +4954,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2727,6 +4977,54 @@ cont {
 cont {
   name: "amenity-library"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "library"
@@ -2740,9 +5038,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2756,9 +5060,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2772,9 +5082,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2785,6 +5101,54 @@ cont {
 cont {
   name: "amenity-marketplace"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "supermarket"
@@ -2798,9 +5162,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2814,9 +5184,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2830,9 +5206,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2843,6 +5225,54 @@ cont {
 cont {
   name: "amenity-nightclub"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "bar"
@@ -2856,9 +5286,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2872,9 +5308,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2888,9 +5330,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2901,11 +5349,68 @@ cont {
 cont {
   name: "amenity-parking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2915,9 +5420,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2927,9 +5438,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2940,11 +5457,68 @@ cont {
 cont {
   name: "amenity-parking-fee"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2954,9 +5528,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2966,9 +5546,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2979,11 +5565,68 @@ cont {
 cont {
   name: "amenity-parking-multi-storey"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -2993,9 +5636,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3005,9 +5654,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3018,11 +5673,68 @@ cont {
 cont {
   name: "amenity-parking-multi-storey-fee"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3032,9 +5744,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3044,9 +5762,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3057,11 +5781,68 @@ cont {
 cont {
   name: "amenity-parking-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3071,9 +5852,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3083,9 +5870,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3096,11 +5889,68 @@ cont {
 cont {
   name: "amenity-parking-park_and_ride"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3110,9 +5960,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3122,9 +5978,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3135,11 +5997,68 @@ cont {
 cont {
   name: "amenity-parking-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3149,9 +6068,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3161,9 +6086,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3174,11 +6105,68 @@ cont {
 cont {
   name: "amenity-parking-permissive-fee"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3188,9 +6176,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3200,9 +6194,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3213,11 +6213,68 @@ cont {
 cont {
   name: "amenity-parking-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3227,9 +6284,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3239,9 +6302,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3252,11 +6321,68 @@ cont {
 cont {
   name: "amenity-parking-underground"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3266,9 +6392,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3278,9 +6410,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3291,11 +6429,68 @@ cont {
 cont {
   name: "amenity-parking-underground-fee"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3305,9 +6500,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3317,9 +6518,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3330,6 +6537,54 @@ cont {
 cont {
   name: "amenity-pharmacy"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "pharmacy"
@@ -3343,9 +6598,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3359,9 +6620,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3375,9 +6642,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3388,6 +6661,54 @@ cont {
 cont {
   name: "amenity-place_of_worship"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "religion"
@@ -3401,9 +6722,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3417,9 +6744,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3433,9 +6766,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3446,15 +6785,72 @@ cont {
 cont {
   name: "amenity-police"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "police"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3468,9 +6864,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3484,9 +6886,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3497,15 +6905,72 @@ cont {
 cont {
   name: "amenity-post_box"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "postbox"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3519,9 +6984,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3535,9 +7006,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3548,6 +7025,54 @@ cont {
 cont {
   name: "amenity-post_office"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "postoffice"
@@ -3561,9 +7086,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3577,9 +7108,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3593,9 +7130,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3606,6 +7149,54 @@ cont {
 cont {
   name: "amenity-pub"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "pub"
@@ -3619,9 +7210,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3635,9 +7232,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3651,9 +7254,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3664,6 +7273,57 @@ cont {
 cont {
   name: "amenity-recycling"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       apply_for_type: 1
@@ -3671,9 +7331,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3688,9 +7354,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3705,9 +7377,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3718,6 +7396,54 @@ cont {
 cont {
   name: "amenity-restaurant"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "restaurant"
@@ -3731,9 +7457,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3747,9 +7479,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3763,9 +7501,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3776,6 +7520,54 @@ cont {
 cont {
   name: "amenity-restaurant-hotel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "hotel_and_restaurant"
@@ -3789,9 +7581,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3805,9 +7603,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3821,9 +7625,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3834,6 +7644,54 @@ cont {
 cont {
   name: "amenity-restaurant-vegan"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "restaurant"
@@ -3847,9 +7705,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3863,9 +7727,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3879,9 +7749,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3892,6 +7768,54 @@ cont {
 cont {
   name: "amenity-restaurant-vegetarian"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "restaurant"
@@ -3905,9 +7829,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3921,9 +7851,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3937,9 +7873,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3950,17 +7892,62 @@ cont {
 cont {
   name: "amenity-school"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xdddddd
-      priority: -16031
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xdddddd
-      priority: -16032
+      priority: -16000
     }
   }
   element {
@@ -3970,9 +7957,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -3990,9 +7983,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4010,9 +8009,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4027,6 +8032,48 @@ cont {
 cont {
   name: "amenity-shelter"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "shelter"
@@ -4054,9 +8101,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4070,9 +8123,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4086,9 +8145,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4099,6 +8164,54 @@ cont {
 cont {
   name: "amenity-speed_trap"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "speed_trap"
@@ -4112,9 +8225,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4128,9 +8247,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4144,9 +8269,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4157,6 +8288,54 @@ cont {
 cont {
   name: "amenity-taxi"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "taxi"
@@ -4170,9 +8349,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4186,9 +8371,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4202,9 +8393,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4215,6 +8412,54 @@ cont {
 cont {
   name: "amenity-telephone"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       apply_for_type: 1
@@ -4230,9 +8475,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4247,9 +8498,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4264,9 +8521,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4277,6 +8540,54 @@ cont {
 cont {
   name: "amenity-theatre"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "theatre"
@@ -4290,9 +8601,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4306,9 +8623,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4322,9 +8645,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4335,15 +8664,72 @@ cont {
 cont {
   name: "amenity-toilets"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "toilets"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4357,9 +8743,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4373,9 +8765,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4386,11 +8784,65 @@ cont {
 cont {
   name: "amenity-townhall"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -4399,9 +8851,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4411,9 +8869,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4423,9 +8887,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4436,17 +8906,62 @@ cont {
 cont {
   name: "amenity-university"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xdddddd
-      priority: -16033
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xdddddd
-      priority: -16034
+      priority: -16000
     }
   }
   element {
@@ -4456,9 +8971,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4476,9 +8997,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4496,9 +9023,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -4511,502 +9044,1261 @@ cont {
   }
 }
 cont {
+  name: "area:highway-cycleway"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "area:highway-footway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-living_street"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0x666666
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0x666666
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0x666666
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0x666666
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0x666666
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-motorway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0x777777
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0x777777
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0x777777
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0x777777
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0x777777
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-path"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-pedestrian"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-primary"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-residential"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-secondary"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-service"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xdddddd
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xdddddd
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xdddddd
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xdddddd
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xdddddd
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-steps"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xffffff
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-tertiary"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
+  name: "area:highway-track"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "area:highway-trunk"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0x888888
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "area:highway-unclassified"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 17
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 18
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
   element {
     scale: 19
     area {
       color: 0xcccccc
-      priority: 1406
+      priority: 1396
     }
   }
 }
 cont {
   name: "barrier-block"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     circle {
       radius: 1.2
@@ -5042,6 +10334,54 @@ cont {
 cont {
   name: "barrier-bollard"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     circle {
       radius: 1.2
@@ -5077,6 +10417,54 @@ cont {
 cont {
   name: "barrier-city_wall"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.0
@@ -5086,7 +10474,7 @@ cont {
         dd: 2.0
       }
       cap: BUTTCAP
-      priority: 1841
+      priority: 1838
     }
   }
   element {
@@ -5099,7 +10487,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1945
+      priority: 1944
     }
   }
   element {
@@ -5112,7 +10500,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1945
+      priority: 1944
     }
   }
   element {
@@ -5125,13 +10513,124 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1945
+      priority: 1944
     }
   }
 }
 cont {
+  name: "barrier-cycle_barrier"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "barrier-fence"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 0.5
@@ -5167,6 +10666,57 @@ cont {
 cont {
   name: "barrier-gate"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "gate"
@@ -5191,6 +10741,54 @@ cont {
 cont {
   name: "barrier-hedge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.0
@@ -5200,7 +10798,7 @@ cont {
         dd: 2.0
       }
       cap: BUTTCAP
-      priority: 1832
+      priority: 1830
     }
   }
   element {
@@ -5213,7 +10811,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1928
+      priority: 1927
     }
   }
   element {
@@ -5226,7 +10824,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1928
+      priority: 1927
     }
   }
   element {
@@ -5239,13 +10837,61 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1928
+      priority: 1927
     }
   }
 }
 cont {
   name: "barrier-lift_gate"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "barrier"
@@ -5277,6 +10923,54 @@ cont {
 cont {
   name: "barrier-retaining_wall"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.0
@@ -5286,7 +10980,7 @@ cont {
         dd: 2.0
       }
       cap: BUTTCAP
-      priority: 1838
+      priority: 1835
     }
   }
   element {
@@ -5299,7 +10993,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1936
+      priority: 1935
     }
   }
   element {
@@ -5312,7 +11006,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1936
+      priority: 1935
     }
   }
   element {
@@ -5325,13 +11019,61 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1936
+      priority: 1935
     }
   }
 }
 cont {
   name: "barrier-stile"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     circle {
       radius: 1.2
@@ -5367,6 +11109,54 @@ cont {
 cont {
   name: "barrier-toll_booth"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     circle {
       radius: 1.2
@@ -5402,6 +11192,54 @@ cont {
 cont {
   name: "barrier-wall"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 0.5
@@ -5414,7 +11252,7 @@ cont {
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1934
+      priority: 1933
     }
   }
   element {
@@ -5422,7 +11260,7 @@ cont {
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1934
+      priority: 1933
     }
   }
   element {
@@ -5430,13 +11268,121 @@ cont {
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1934
+      priority: 1933
     }
   }
 }
 cont {
+  name: "boundary-administrative"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "boundary-administrative-10"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.8
@@ -5446,7 +11392,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11709
+      priority: 20705
     }
   }
   element {
@@ -5459,7 +11405,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11871
+      priority: 20870
     }
   }
   element {
@@ -5472,7 +11418,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11950
+      priority: 20950
     }
   }
   element {
@@ -5485,7 +11431,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11950
+      priority: 20950
     }
   }
   element {
@@ -5498,13 +11444,64 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11950
+      priority: 20950
     }
   }
 }
 cont {
   name: "boundary-administrative-11"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     lines {
       width: 0.8
@@ -5514,7 +11511,7 @@ cont {
         dd: 5.2
       }
       cap: BUTTCAP
-      priority: 11947
+      priority: 20948
     }
   }
   element {
@@ -5527,7 +11524,7 @@ cont {
         dd: 5.2
       }
       cap: BUTTCAP
-      priority: 11947
+      priority: 20948
     }
   }
   element {
@@ -5540,13 +11537,25 @@ cont {
         dd: 5.2
       }
       cap: BUTTCAP
-      priority: 11947
+      priority: 20948
     }
   }
 }
 cont {
   name: "boundary-administrative-2"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
     scale: 4
     lines {
       width: 1.0
@@ -5556,7 +11565,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 11405
+      priority: 20001
     }
   }
   element {
@@ -5569,7 +11578,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 11405
+      priority: 20001
     }
   }
   element {
@@ -5582,12 +11591,12 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 11142
+      priority: 20001
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11139
+      priority: 20001
     }
   }
   element {
@@ -5595,7 +11604,7 @@ cont {
     lines {
       width: 2.73
       color: 0xdddddd
-      priority: 11142
+      priority: 20001
     }
     lines {
       width: 2.0
@@ -5605,7 +11614,7 @@ cont {
         dd: 5.0
       }
       cap: BUTTCAP
-      priority: 11145
+      priority: 20001
     }
   }
   element {
@@ -5613,7 +11622,7 @@ cont {
     lines {
       width: 3.12
       color: 0xdddddd
-      priority: 11142
+      priority: 20001
     }
     lines {
       width: 2.34
@@ -5623,7 +11632,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 11145
+      priority: 20001
     }
   }
   element {
@@ -5631,7 +11640,7 @@ cont {
     lines {
       width: 3.12
       color: 0xdddddd
-      priority: 11142
+      priority: 20001
     }
     lines {
       width: 2.34
@@ -5641,7 +11650,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 11145
+      priority: 20001
     }
   }
   element {
@@ -5649,7 +11658,7 @@ cont {
     lines {
       width: 3.12
       color: 0xdddddd
-      priority: 11142
+      priority: 20001
     }
     lines {
       width: 2.34
@@ -5659,7 +11668,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 11145
+      priority: 20001
     }
   }
   element {
@@ -5667,7 +11676,7 @@ cont {
     lines {
       width: 3.12
       color: 0xdddddd
-      priority: 11142
+      priority: 20001
     }
     lines {
       width: 2.34
@@ -5677,7 +11686,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 11145
+      priority: 20001
     }
   }
   element {
@@ -5685,7 +11694,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11419
+      priority: 20410
     }
     lines {
       width: 2.0
@@ -5695,7 +11704,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11421
+      priority: 20413
     }
   }
   element {
@@ -5703,7 +11712,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11446
+      priority: 20438
     }
     lines {
       width: 2.0
@@ -5713,7 +11722,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11449
+      priority: 20441
     }
   }
   element {
@@ -5721,7 +11730,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11495
+      priority: 20488
     }
     lines {
       width: 2.0
@@ -5731,7 +11740,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11498
+      priority: 20491
     }
   }
   element {
@@ -5739,7 +11748,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11731
+      priority: 20728
     }
     lines {
       width: 2.0
@@ -5749,7 +11758,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11734
+      priority: 20730
     }
   }
   element {
@@ -5757,7 +11766,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11887
+      priority: 20886
     }
     lines {
       width: 2.0
@@ -5767,7 +11776,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11890
+      priority: 20889
     }
   }
   element {
@@ -5775,7 +11784,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11000
+      priority: 20001
     }
     lines {
       width: 2.0
@@ -5785,7 +11794,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11967
+      priority: 20967
     }
   }
   element {
@@ -5793,7 +11802,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11000
+      priority: 20001
     }
     lines {
       width: 2.0
@@ -5803,7 +11812,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11967
+      priority: 20967
     }
   }
   element {
@@ -5811,7 +11820,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11000
+      priority: 20001
     }
     lines {
       width: 2.0
@@ -5821,13 +11830,25 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11967
+      priority: 20967
     }
   }
 }
 cont {
   name: "boundary-administrative-3"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
     scale: 4
     lines {
       width: 1.0
@@ -5837,7 +11858,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
   }
   element {
@@ -5850,7 +11871,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
   }
   element {
@@ -5863,12 +11884,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -5881,12 +11902,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -5899,12 +11920,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -5917,12 +11938,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -5935,12 +11956,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -5953,12 +11974,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -5971,12 +11992,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -5989,12 +12010,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -6007,12 +12028,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -6025,12 +12046,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -6043,12 +12064,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -6061,12 +12082,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -6079,12 +12100,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
   element {
@@ -6097,18 +12118,30 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11139
+      priority: 20143
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11136
+      priority: 20140
     }
   }
 }
 cont {
   name: "boundary-administrative-4"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
     scale: 4
     lines {
       width: 0.2
@@ -6118,7 +12151,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11134
+      priority: 20137
     }
   }
   element {
@@ -6131,12 +12164,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11134
+      priority: 20137
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11131
+      priority: 20134
     }
   }
   element {
@@ -6149,12 +12182,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11134
+      priority: 20137
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11131
+      priority: 20134
     }
   }
   element {
@@ -6167,12 +12200,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11134
+      priority: 20137
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11131
+      priority: 20134
     }
   }
   element {
@@ -6185,12 +12218,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11134
+      priority: 20137
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11131
+      priority: 20134
     }
   }
   element {
@@ -6203,12 +12236,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11027
+      priority: 20028
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 11000
+      priority: 20001
     }
   }
   element {
@@ -6221,18 +12254,57 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11410
+      priority: 20402
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 11408
+      priority: 20399
     }
   }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "boundary-administrative-4-state"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
     scale: 4
     lines {
       width: 0.2
@@ -6242,12 +12314,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11134
+      priority: 20137
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11131
+      priority: 20134
     }
   }
   element {
@@ -6260,12 +12332,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11134
+      priority: 20137
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11131
+      priority: 20134
     }
   }
   element {
@@ -6278,12 +12350,12 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11134
+      priority: 20137
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 11131
+      priority: 20134
     }
   }
   element {
@@ -6296,7 +12368,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11060
+      priority: 20065
     }
     lines {
       width: 0.12
@@ -6308,7 +12380,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11063
+      priority: 20067
     }
   }
   element {
@@ -6321,7 +12393,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11065
+      priority: 20070
     }
     lines {
       width: 0.25
@@ -6333,7 +12405,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11068
+      priority: 20073
     }
   }
   element {
@@ -6346,7 +12418,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11065
+      priority: 20070
     }
     lines {
       width: 0.5
@@ -6358,7 +12430,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11068
+      priority: 20073
     }
   }
   element {
@@ -6371,7 +12443,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11410
+      priority: 20402
     }
     lines {
       width: 1.0
@@ -6383,7 +12455,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11175
+      priority: 20176
     }
   }
   element {
@@ -6413,7 +12485,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11430
+      priority: 20421
     }
   }
   element {
@@ -6428,7 +12500,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11454
+      priority: 20446
     }
   }
   element {
@@ -6443,7 +12515,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11506
+      priority: 20499
     }
   }
   element {
@@ -6458,7 +12530,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11758
+      priority: 20755
     }
   }
   element {
@@ -6473,7 +12545,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11906
+      priority: 20906
     }
   }
   element {
@@ -6488,7 +12560,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11000
+      priority: 20001
     }
   }
   element {
@@ -6503,7 +12575,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11000
+      priority: 20001
     }
   }
   element {
@@ -6518,13 +12590,55 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "boundary-administrative-5"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.0
@@ -6534,7 +12648,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11493
+      priority: 20485
     }
   }
   element {
@@ -6547,7 +12661,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11723
+      priority: 20719
     }
   }
   element {
@@ -6560,7 +12674,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11884
+      priority: 20884
     }
   }
   element {
@@ -6573,7 +12687,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11964
+      priority: 20964
     }
   }
   element {
@@ -6586,7 +12700,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11964
+      priority: 20964
     }
   }
   element {
@@ -6599,13 +12713,55 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11964
+      priority: 20964
     }
   }
 }
 cont {
   name: "boundary-administrative-6"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.0
@@ -6615,7 +12771,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11490
+      priority: 20482
     }
   }
   element {
@@ -6628,7 +12784,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11720
+      priority: 20716
     }
   }
   element {
@@ -6641,7 +12797,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11882
+      priority: 20881
     }
   }
   element {
@@ -6654,7 +12810,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11961
+      priority: 20962
     }
   }
   element {
@@ -6667,7 +12823,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11961
+      priority: 20962
     }
   }
   element {
@@ -6680,18 +12836,63 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11961
+      priority: 20962
     }
   }
 }
 cont {
   name: "boundary-administrative-7"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 1.0
       color: 0x888888
-      priority: 11717
+      priority: 20714
     }
   }
   element {
@@ -6699,7 +12900,7 @@ cont {
     lines {
       width: 1.0
       color: 0x888888
-      priority: 11879
+      priority: 20878
     }
   }
   element {
@@ -6707,7 +12908,7 @@ cont {
     lines {
       width: 0.8
       color: 0x888888
-      priority: 11958
+      priority: 20959
     }
   }
   element {
@@ -6715,7 +12916,7 @@ cont {
     lines {
       width: 0.8
       color: 0x888888
-      priority: 11958
+      priority: 20959
     }
   }
   element {
@@ -6723,13 +12924,58 @@ cont {
     lines {
       width: 0.8
       color: 0x888888
-      priority: 11958
+      priority: 20959
     }
   }
 }
 cont {
   name: "boundary-administrative-8"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 1.0
@@ -6741,7 +12987,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11000
+      priority: 20001
     }
   }
   element {
@@ -6756,7 +13002,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11876
+      priority: 20875
     }
   }
   element {
@@ -6771,7 +13017,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11956
+      priority: 20956
     }
   }
   element {
@@ -6786,7 +13032,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11956
+      priority: 20956
     }
   }
   element {
@@ -6801,13 +13047,58 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11956
+      priority: 20956
     }
   }
 }
 cont {
   name: "boundary-administrative-9"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 1.0
@@ -6817,7 +13108,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11712
+      priority: 20708
     }
   }
   element {
@@ -6830,7 +13121,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11873
+      priority: 20872
     }
   }
   element {
@@ -6843,7 +13134,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11953
+      priority: 20953
     }
   }
   element {
@@ -6856,7 +13147,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11953
+      priority: 20953
     }
   }
   element {
@@ -6869,13 +13160,58 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11953
+      priority: 20953
     }
   }
 }
 cont {
   name: "boundary-administrative-city"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.8
@@ -6887,7 +13223,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11747
+      priority: 20744
     }
   }
   element {
@@ -6902,7 +13238,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11898
+      priority: 20897
     }
   }
   element {
@@ -6917,7 +13253,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11975
+      priority: 20975
     }
   }
   element {
@@ -6932,7 +13268,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11975
+      priority: 20975
     }
   }
   element {
@@ -6947,18 +13283,54 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11975
+      priority: 20975
     }
   }
 }
 cont {
   name: "boundary-administrative-country"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11435
+      priority: 20427
     }
     lines {
       width: 2.0
@@ -6968,7 +13340,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11441
+      priority: 20432
     }
   }
   element {
@@ -6976,7 +13348,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11460
+      priority: 20452
     }
     lines {
       width: 2.0
@@ -6986,7 +13358,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11465
+      priority: 20457
     }
   }
   element {
@@ -6994,7 +13366,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11512
+      priority: 20505
     }
     lines {
       width: 2.0
@@ -7004,7 +13376,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11517
+      priority: 20510
     }
   }
   element {
@@ -7012,7 +13384,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11764
+      priority: 20761
     }
     lines {
       width: 2.0
@@ -7022,7 +13394,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11769
+      priority: 20767
     }
   }
   element {
@@ -7030,7 +13402,7 @@ cont {
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 11887
+      priority: 20886
     }
     lines {
       width: 2.0
@@ -7040,7 +13412,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11915
+      priority: 20914
     }
   }
   element {
@@ -7048,7 +13420,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11986
+      priority: 20987
     }
     lines {
       width: 2.0
@@ -7058,7 +13430,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11991
+      priority: 20992
     }
   }
   element {
@@ -7066,7 +13438,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11986
+      priority: 20987
     }
     lines {
       width: 2.0
@@ -7076,7 +13448,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11991
+      priority: 20992
     }
   }
   element {
@@ -7084,7 +13456,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11986
+      priority: 20987
     }
     lines {
       width: 2.0
@@ -7094,13 +13466,55 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11991
+      priority: 20992
     }
   }
 }
 cont {
   name: "boundary-administrative-county"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.0
@@ -7110,7 +13524,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11501
+      priority: 20494
     }
   }
   element {
@@ -7123,7 +13537,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11750
+      priority: 20747
     }
   }
   element {
@@ -7136,7 +13550,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11901
+      priority: 20900
     }
   }
   element {
@@ -7149,7 +13563,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11978
+      priority: 20978
     }
   }
   element {
@@ -7162,7 +13576,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11978
+      priority: 20978
     }
   }
   element {
@@ -7175,13 +13589,58 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11978
+      priority: 20978
     }
   }
 }
 cont {
   name: "boundary-administrative-municipality"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 1.0
@@ -7193,7 +13652,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11745
+      priority: 20741
     }
   }
   element {
@@ -7208,7 +13667,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11895
+      priority: 20895
     }
   }
   element {
@@ -7223,7 +13682,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11972
+      priority: 20973
     }
   }
   element {
@@ -7238,7 +13697,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11972
+      priority: 20973
     }
   }
   element {
@@ -7253,18 +13712,54 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11972
+      priority: 20973
     }
   }
 }
 cont {
   name: "boundary-administrative-nation"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11432
+      priority: 20424
     }
     lines {
       width: 2.0
@@ -7274,7 +13769,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11438
+      priority: 20429
     }
   }
   element {
@@ -7282,7 +13777,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11457
+      priority: 20449
     }
     lines {
       width: 2.0
@@ -7292,7 +13787,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11463
+      priority: 20455
     }
   }
   element {
@@ -7300,7 +13795,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11509
+      priority: 20502
     }
     lines {
       width: 2.0
@@ -7310,7 +13805,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11515
+      priority: 20507
     }
   }
   element {
@@ -7318,7 +13813,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11761
+      priority: 20758
     }
     lines {
       width: 2.0
@@ -7328,7 +13823,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11767
+      priority: 20764
     }
   }
   element {
@@ -7336,7 +13831,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11909
+      priority: 20909
     }
     lines {
       width: 2.0
@@ -7346,7 +13841,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11912
+      priority: 20911
     }
   }
   element {
@@ -7354,7 +13849,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11983
+      priority: 20984
     }
     lines {
       width: 2.0
@@ -7364,7 +13859,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11989
+      priority: 20989
     }
   }
   element {
@@ -7372,7 +13867,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11983
+      priority: 20984
     }
     lines {
       width: 2.0
@@ -7382,7 +13877,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11989
+      priority: 20989
     }
   }
   element {
@@ -7390,7 +13885,7 @@ cont {
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 11983
+      priority: 20984
     }
     lines {
       width: 2.0
@@ -7400,13 +13895,49 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 11989
+      priority: 20989
     }
   }
 }
 cont {
   name: "boundary-administrative-region"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
@@ -7418,7 +13949,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11427
+      priority: 20418
     }
   }
   element {
@@ -7433,7 +13964,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11452
+      priority: 20443
     }
   }
   element {
@@ -7448,7 +13979,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11504
+      priority: 20496
     }
   }
   element {
@@ -7463,7 +13994,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11756
+      priority: 20753
     }
   }
   element {
@@ -7478,7 +14009,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11904
+      priority: 20903
     }
   }
   element {
@@ -7493,7 +14024,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11980
+      priority: 20981
     }
   }
   element {
@@ -7508,7 +14039,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11980
+      priority: 20981
     }
   }
   element {
@@ -7523,18 +14054,36 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11980
+      priority: 20981
     }
   }
 }
 cont {
   name: "boundary-administrative-state"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
     scale: 6
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1057
+      priority: 1061
     }
   }
   element {
@@ -7542,7 +14091,7 @@ cont {
     lines {
       width: 0.62
       color: 0xaaaaaa
-      priority: 1060
+      priority: 1064
     }
     lines {
       width: 0.12
@@ -7554,7 +14103,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1063
+      priority: 1066
     }
   }
   element {
@@ -7562,7 +14111,7 @@ cont {
     lines {
       width: 1.25
       color: 0xaaaaaa
-      priority: 1065
+      priority: 1069
     }
     lines {
       width: 0.25
@@ -7574,7 +14123,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11068
+      priority: 20073
     }
   }
   element {
@@ -7582,7 +14131,7 @@ cont {
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1065
+      priority: 1069
     }
     lines {
       width: 0.5
@@ -7594,7 +14143,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1068
+      priority: 1072
     }
   }
   element {
@@ -7644,7 +14193,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11430
+      priority: 20421
     }
   }
   element {
@@ -7659,7 +14208,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11454
+      priority: 20446
     }
   }
   element {
@@ -7674,7 +14223,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11506
+      priority: 20499
     }
   }
   element {
@@ -7689,7 +14238,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11758
+      priority: 20755
     }
   }
   element {
@@ -7704,7 +14253,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11906
+      priority: 20906
     }
   }
   element {
@@ -7719,7 +14268,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11000
+      priority: 20001
     }
   }
   element {
@@ -7734,7 +14283,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11000
+      priority: 20001
     }
   }
   element {
@@ -7749,13 +14298,58 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "boundary-administrative-suburb"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.8
@@ -7765,7 +14359,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11742
+      priority: 20739
     }
   }
   element {
@@ -7778,7 +14372,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11893
+      priority: 20892
     }
   }
   element {
@@ -7791,7 +14385,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11969
+      priority: 20970
     }
   }
   element {
@@ -7804,7 +14398,7 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11969
+      priority: 20970
     }
   }
   element {
@@ -7817,13 +14411,43 @@ cont {
         dd: 20.0
       }
       cap: BUTTCAP
-      priority: 11969
+      priority: 20970
     }
   }
 }
 cont {
   name: "boundary-national_park"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     lines {
       width: 1.0
@@ -7835,7 +14459,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 11178
+      priority: 20179
     }
   }
   element {
@@ -7850,7 +14474,7 @@ cont {
         dd: 2.0
       }
       cap: BUTTCAP
-      priority: 11178
+      priority: 20179
     }
   }
   element {
@@ -7865,7 +14489,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11443
+      priority: 20435
     }
   }
   element {
@@ -7880,7 +14504,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11468
+      priority: 20460
     }
   }
   element {
@@ -7895,7 +14519,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11520
+      priority: 20513
     }
   }
   element {
@@ -7910,7 +14534,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11772
+      priority: 20769
     }
   }
   element {
@@ -7925,7 +14549,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11917
+      priority: 20917
     }
   }
   element {
@@ -7940,7 +14564,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11994
+      priority: 20995
     }
   }
   element {
@@ -7955,7 +14579,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11994
+      priority: 20995
     }
   }
   element {
@@ -7970,13 +14594,58 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 11994
+      priority: 20995
     }
   }
 }
 cont {
   name: "building"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     area {
       color: 0xbbbbbb
@@ -7988,13 +14657,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 10
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -8009,13 +14678,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -8030,13 +14699,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -8051,13 +14720,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -8071,11 +14740,65 @@ cont {
 cont {
   name: "building-address"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -8084,9 +14807,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -8096,9 +14825,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -8108,9 +14843,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -8121,6 +14862,54 @@ cont {
 cont {
   name: "communication-line"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.6
@@ -8130,7 +14919,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1813
+      priority: 1810
     }
   }
   element {
@@ -8138,7 +14927,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1879
+      priority: 1877
     }
     lines {
       width: 0.8
@@ -8148,7 +14937,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1887
+      priority: 1885
     }
   }
   element {
@@ -8156,7 +14945,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1879
+      priority: 1877
     }
     lines {
       width: 0.8
@@ -8166,7 +14955,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1887
+      priority: 1885
     }
   }
   element {
@@ -8174,7 +14963,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1879
+      priority: 1877
     }
     lines {
       width: 0.8
@@ -8184,13 +14973,61 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1887
+      priority: 1885
     }
   }
 }
 cont {
   name: "communication-line-underground"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.6
@@ -8200,7 +15037,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1813
+      priority: 1810
     }
   }
   element {
@@ -8217,7 +15054,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1882
+      priority: 1880
     }
     lines {
       width: 0.8
@@ -8227,7 +15064,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1887
+      priority: 1885
     }
   }
   element {
@@ -8244,7 +15081,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1882
+      priority: 1880
     }
     lines {
       width: 0.8
@@ -8254,7 +15091,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1887
+      priority: 1885
     }
   }
   element {
@@ -8271,7 +15108,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1882
+      priority: 1880
     }
     lines {
       width: 0.8
@@ -8281,13 +15118,55 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1887
+      priority: 1885
     }
   }
 }
 cont {
   name: "earthquake:damage-spontaneous_camp"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "earthquakecamp"
@@ -8333,20 +15212,77 @@ cont {
 cont {
   name: "entrance"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     circle {
       radius: 2
       color: 0x111111
-      priority: 16024
+      priority: 16025
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 9
         color: 0x000000
         stroke_color: 0xeeeeee
         offset_x: 6
       }
-      priority: 15024
+      priority: 15025
     }
   }
   element {
@@ -8354,16 +15290,22 @@ cont {
     circle {
       radius: 2
       color: 0x111111
-      priority: 16024
+      priority: 16025
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 9
         color: 0x000000
         stroke_color: 0xeeeeee
         offset_x: 6
       }
-      priority: 15024
+      priority: 15025
     }
   }
   element {
@@ -8371,14 +15313,14 @@ cont {
     circle {
       radius: 2
       color: 0x111111
-      priority: 16024
+      priority: 16025
     }
     caption {
       secondary {
-        height: 9
+        height: 10
         color: 0x000000
         stroke_color: 0xeeeeee
-        offset_y: 10
+        offset_y: 20
       }
       primary {
         height: 9
@@ -8386,22 +15328,139 @@ cont {
         stroke_color: 0xeeeeee
         offset_x: 6
       }
-      priority: 15024
+      priority: 15025
     }
   }
 }
 cont {
   name: "highway-bridleway"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 4.9
+      width: 6.9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.9
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8415,13 +15474,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.6
+      width: 7.6
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
+      width: 3.6
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8435,13 +15494,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.2
+      width: 9.2
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.2
+      width: 5.2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8455,13 +15514,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 10.4
+      width: 12.4
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.4
+      width: 8.4
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8472,9 +15531,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8483,13 +15548,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8500,9 +15565,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8511,13 +15582,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8528,9 +15599,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8539,13 +15616,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8556,9 +15633,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8568,15 +15651,132 @@ cont {
 cont {
   name: "highway-bridleway-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 4.9
+      width: 6.9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.9
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8590,13 +15790,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.6
+      width: 7.6
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
+      width: 3.6
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8610,13 +15810,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.2
+      width: 9.2
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.2
+      width: 5.2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8635,20 +15835,20 @@ cont {
     lines {
       width: 9.2
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 10.4
+      width: 12.4
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.4
+      width: 8.4
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8659,9 +15859,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8675,20 +15881,20 @@ cont {
     lines {
       width: 12.4
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8699,9 +15905,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8715,20 +15927,20 @@ cont {
     lines {
       width: 12.8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8739,9 +15951,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8755,20 +15973,20 @@ cont {
     lines {
       width: 12.8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8779,9 +15997,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8795,7 +16019,7 @@ cont {
     lines {
       width: 12.8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -8803,15 +16027,132 @@ cont {
 cont {
   name: "highway-bridleway-permissive"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 4.9
+      width: 6.9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.9
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8825,13 +16166,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.6
+      width: 7.6
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
+      width: 3.6
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8845,13 +16186,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.2
+      width: 9.2
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.2
+      width: 5.2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8865,13 +16206,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 10.4
+      width: 12.4
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.4
+      width: 8.4
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8882,9 +16223,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8893,13 +16240,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8910,9 +16257,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8921,13 +16274,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8938,9 +16291,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8949,13 +16308,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -8966,9 +16325,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -8978,15 +16343,132 @@ cont {
 cont {
   name: "highway-bridleway-private"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 4.9
+      width: 6.9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.9
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9000,13 +16482,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.6
+      width: 7.6
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
+      width: 3.6
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9020,13 +16502,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.2
+      width: 9.2
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.2
+      width: 5.2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9040,13 +16522,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 10.4
+      width: 12.4
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.4
+      width: 8.4
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9057,9 +16539,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -9068,13 +16556,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9085,9 +16573,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -9096,13 +16590,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9113,9 +16607,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -9124,13 +16624,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9141,9 +16641,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -9153,15 +16659,132 @@ cont {
 cont {
   name: "highway-bridleway-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 4.9
+      width: 6.9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.9
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9175,13 +16798,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.6
+      width: 7.6
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2.6
+      width: 3.6
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9195,13 +16818,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 7.2
+      width: 9.2
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.2
+      width: 5.2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9220,7 +16843,7 @@ cont {
     lines {
       width: 9.2
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -9231,13 +16854,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 10.4
+      width: 12.4
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.4
+      width: 8.4
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9248,9 +16871,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -9264,7 +16893,7 @@ cont {
     lines {
       width: 12.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -9275,13 +16904,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9292,9 +16921,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -9308,7 +16943,7 @@ cont {
     lines {
       width: 12.8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -9319,13 +16954,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9336,9 +16971,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -9352,7 +16993,7 @@ cont {
     lines {
       width: 12.8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -9363,13 +17004,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 7.8
+      width: 8.8
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -9380,9 +17021,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
       priority: 16000
@@ -9396,7 +17043,7 @@ cont {
     lines {
       width: 12.8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -9408,126 +17055,309 @@ cont {
 cont {
   name: "highway-bus_stop"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 16
     lines {
-      width: 1
+      width: 2
       color: 0x888888
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     symbol {
       name: "bus-mini"
-      priority: 16032
+      priority: 16033
     }
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
     scale: 17
     lines {
-      width: 1
+      width: 2
       color: 0x888888
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     symbol {
       name: "bus"
-      priority: 16032
+      priority: 16033
     }
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
     scale: 18
     lines {
-      width: 1
+      width: 2
       color: 0x888888
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     symbol {
       name: "bus"
-      priority: 16032
+      priority: 16033
     }
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
     scale: 19
     lines {
-      width: 1
+      width: 2
       color: 0x888888
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     symbol {
       name: "bus"
-      priority: 16032
+      priority: 16033
     }
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15032
+      priority: 15033
     }
   }
 }
 cont {
   name: "highway-construction"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 6.75
+      width: 8.75
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -9544,9 +17374,9 @@ cont {
   element {
     scale: 14
     lines {
-      width: 7.5
+      width: 9.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -9563,9 +17393,9 @@ cont {
   element {
     scale: 15
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -9582,9 +17412,9 @@ cont {
   element {
     scale: 16
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -9601,9 +17431,9 @@ cont {
   element {
     scale: 17
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -9620,9 +17450,9 @@ cont {
   element {
     scale: 18
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -9639,9 +17469,9 @@ cont {
   element {
     scale: 19
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -9657,152 +17487,809 @@ cont {
   }
 }
 cont {
+  name: "highway-crossing-island"
+  element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+}
+cont {
+  name: "highway-crossing-uncontrolled"
+  element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+}
+cont {
+  name: "highway-crossing-zebra"
+  element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+}
+cont {
   name: "highway-cycleway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x666666
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-cycleway-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x666666
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     lines {
       width: 5
@@ -9813,30 +18300,36 @@ cont {
     lines {
       width: 7
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 6
@@ -9847,30 +18340,36 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 7
@@ -9881,30 +18380,36 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 7
@@ -9915,30 +18420,36 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 7
@@ -9949,7 +18460,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -9957,269 +18468,443 @@ cont {
 cont {
   name: "highway-cycleway-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x666666
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-cycleway-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x666666
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-cycleway-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x666666
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     lines {
       width: 5
@@ -10230,7 +18915,7 @@ cont {
     lines {
       width: 7
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -10241,23 +18926,29 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 6
@@ -10268,7 +18959,7 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -10279,23 +18970,29 @@ cont {
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 7
@@ -10306,7 +19003,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -10317,23 +19014,29 @@ cont {
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 7
@@ -10344,7 +19047,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -10355,23 +19058,29 @@ cont {
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 7
@@ -10382,7 +19091,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -10394,50 +19103,107 @@ cont {
 cont {
   name: "highway-footway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -10447,29 +19213,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -10479,29 +19251,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -10511,57 +19289,114 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-alpine_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -10571,29 +19406,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -10603,29 +19444,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -10635,59 +19482,116 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-area"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     area {
       color: 0xffffff
-      priority: 1039
+      priority: 1037
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xeeeeee
-      priority: 1039
+      priority: 1037
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xffffff
-      priority: 1039
+      priority: 1037
     }
     lines {
       width: 4.0
@@ -10697,28 +19601,34 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xffffff
-      priority: 1039
+      priority: 1037
     }
     lines {
       width: 8.0
@@ -10728,28 +19638,34 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xffffff
-      priority: 1039
+      priority: 1037
     }
     lines {
       width: 16.0
@@ -10759,24 +19675,69 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     lines {
       width: 5
@@ -10787,47 +19748,47 @@ cont {
     lines {
       width: 7
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
-    }
-    lines {
-      width: 8
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -10837,41 +19798,47 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 10
-      color: 0x666666
-      priority: 10
+      color: 0xeeeeee
+      priority: -14987
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 12
+      width: 8
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
     lines {
+      width: 10
+      color: 0x666666
+      priority: 11
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
-    }
-    lines {
-      width: 12
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -10881,41 +19848,47 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 14
-      color: 0x666666
-      priority: 10
+      color: 0xeeeeee
+      priority: -14987
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 20
+      width: 12
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
     lines {
+      width: 14
+      color: 0x666666
+      priority: 11
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
-    }
-    lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -10925,12 +19898,24 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
+    }
+    lines {
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 20
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -10938,50 +19923,107 @@ cont {
 cont {
   name: "highway-footway-demanding_alpine_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -10991,29 +20033,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -11023,29 +20071,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -11055,57 +20109,114 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-demanding_mountain_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -11115,29 +20226,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -11147,29 +20264,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -11179,57 +20302,114 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-difficult_alpine_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -11239,29 +20419,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -11271,29 +20457,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -11303,57 +20495,114 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -11363,29 +20612,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -11395,29 +20650,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -11427,57 +20688,114 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-mountain_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -11487,29 +20805,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -11519,29 +20843,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -11551,57 +20881,114 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -11611,29 +20998,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -11643,29 +21036,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -11675,57 +21074,114 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -11735,29 +21191,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -11767,29 +21229,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -11799,57 +21267,114 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -11859,29 +21384,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -11891,29 +21422,35 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -11923,24 +21460,69 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
   }
 }
 cont {
   name: "highway-footway-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     lines {
       width: 5
@@ -11951,7 +21533,7 @@ cont {
     lines {
       width: 7
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -11962,40 +21544,40 @@ cont {
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 5.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
-    }
-    lines {
-      width: 8
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16036
     }
     lines {
       width: 4.0
@@ -12005,45 +21587,51 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 12
+      width: 10
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 9.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
-    }
-    lines {
-      width: 12
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16036
     }
     lines {
       width: 8.0
@@ -12053,45 +21641,51 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 20
+      width: 14
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 12
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 17.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
-    }
-    lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16036
     }
     lines {
       width: 16.0
@@ -12101,414 +21695,813 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 20
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "highway-ford"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 6.75
+      width: 8.75
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2.99
+      width: 4.75
       color: 0x111111
-      priority: 194
+      priority: 0
       cap: BUTTCAP
     }
     lines {
       width: 2.75
       color: 0xbbbbbb
-      priority: 1194
+      priority: 1000
     }
   }
   element {
     scale: 14
     lines {
-      width: 7.5
+      width: 9.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.5
+      width: 5.5
       color: 0x000000
-      priority: 279
+      priority: 0
       cap: BUTTCAP
     }
     lines {
       width: 3.5
       color: 0xbbbbbb
-      priority: 1279
+      priority: 1000
     }
   }
   element {
     scale: 15
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 0x666666
-      priority: 367
+      priority: 356
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xbbbbbb
-      priority: 1367
+      priority: 1356
     }
   }
   element {
     scale: 16
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 0x666666
-      priority: 594
+      priority: 587
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xbbbbbb
-      priority: 1594
+      priority: 1587
     }
   }
   element {
     scale: 17
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 13.2
       color: 0x666666
-      priority: 619
+      priority: 612
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 0xbbbbbb
-      priority: 1619
+      priority: 1612
     }
   }
   element {
     scale: 18
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 13.2
       color: 0x666666
-      priority: 619
+      priority: 612
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 0xbbbbbb
-      priority: 1619
+      priority: 1612
     }
   }
   element {
     scale: 19
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 13.2
       color: 0x666666
-      priority: 619
+      priority: 612
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 0xbbbbbb
-      priority: 1619
+      priority: 1612
     }
   }
 }
 cont {
   name: "highway-living_street"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
   }
 }
 cont {
   name: "highway-living_street-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 8
@@ -12519,36 +22512,42 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 10
@@ -12559,36 +22558,42 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 11
@@ -12599,36 +22604,42 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 27
@@ -12639,36 +22650,42 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 45
@@ -12679,7 +22696,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -12687,71 +22704,194 @@ cont {
 cont {
   name: "highway-living_street-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 41
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 8
@@ -12762,7 +22902,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -12773,29 +22913,35 @@ cont {
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 10
@@ -12806,7 +22952,7 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -12817,29 +22963,35 @@ cont {
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 11
@@ -12850,7 +23002,7 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -12861,29 +23013,35 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 27
@@ -12894,7 +23052,7 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -12905,29 +23063,35 @@ cont {
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
       color: 0xbbbbbb
-      priority: 38
+      priority: 41
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1038
+      priority: 1041
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16038
+      priority: 16041
     }
     lines {
       width: 45
@@ -12938,7 +23102,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -12950,566 +23114,800 @@ cont {
 cont {
   name: "highway-motorway"
   element {
-    scale: 7
+    scale: 0
     lines {
       width: 2
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 3
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 8
     lines {
-      width: 3
-      color: 0x666666
-      priority: 57
+      width: 4
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 9
     lines {
-      width: 4
-      color: 0x666666
-      priority: 57
+      width: 9
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 5
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 10
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5
-      color: 0x666666
-      priority: 57
+      width: 6
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 11
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 12
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 13
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 14
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 14
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 15
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 18
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 16
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 18
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 17
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 19
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "highway-motorway-bridge"
   element {
-    scale: 7
+    scale: 0
     lines {
       width: 2
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 3
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 8
     lines {
-      width: 3
-      color: 0x666666
-      priority: 57
+      width: 4
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 9
     lines {
-      width: 4
-      color: 0x666666
-      priority: 57
+      width: 9
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 5
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 10
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5
-      color: 0x666666
-      priority: 57
+      width: 6
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 11
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 12
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 13
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 14
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 14
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 15
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 18
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 20
@@ -13520,36 +23918,47 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 18
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
+    }
+    lines {
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 20
@@ -13560,41 +23969,47 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 17
     lines {
-      width: 21
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 19
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
+    }
+    lines {
+      width: 23
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 21
@@ -13605,41 +24020,47 @@ cont {
     lines {
       width: 23
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 18
     lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 25
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
+    }
+    lines {
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 27
@@ -13650,41 +24071,47 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 19
     lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 43
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
+    }
+    lines {
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 45
@@ -13695,230 +24122,330 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
 }
 cont {
   name: "highway-motorway-tunnel"
   element {
-    scale: 7
+    scale: 0
     lines {
       width: 2
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 3
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 8
     lines {
-      width: 3
-      color: 0x666666
-      priority: 57
+      width: 4
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 9
     lines {
-      width: 4
-      color: 0x666666
-      priority: 57
+      width: 9
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 5
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 10
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5
-      color: 0x666666
-      priority: 57
+      width: 6
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
       cap: BUTTCAP
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 11
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 12
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 13
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 14
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 14
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 15
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 18
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 20
@@ -13929,7 +24456,7 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -13940,40 +24467,39 @@ cont {
   element {
     scale: 16
     lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 18
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
-    }
-    lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16061
     }
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -13981,48 +24507,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
-      width: 21
+      width: 20
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 19
-      color: 0x666666
-      priority: 57
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
-    }
-    lines {
-      width: 21
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16061
     }
     lines {
       width: 23
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -14030,48 +24562,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 23
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 27
+      width: 21
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
-      width: 25
+      width: 0.5
       color: 0x666666
-      priority: 57
+      priority: 20001
+    }
+    lines {
+      width: 25
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
-    }
-    lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16061
     }
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -14079,48 +24617,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 45
+      width: 27
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
-      width: 43
+      width: 0.5
       color: 0x666666
-      priority: 57
+      priority: 20001
+    }
+    lines {
+      width: 43
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
-    }
-    lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16061
     }
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -14128,26 +24672,156 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 45
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "highway-motorway_junction"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 1
+      width: 2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -14156,15 +24830,21 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1
+      width: 2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -14173,15 +24853,21 @@ cont {
   element {
     scale: 15
     lines {
-      width: 1
+      width: 2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -14190,15 +24876,21 @@ cont {
   element {
     scale: 16
     lines {
-      width: 1
+      width: 2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -14207,15 +24899,21 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1
+      width: 2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -14224,15 +24922,21 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1
+      width: 2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -14241,15 +24945,21 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1
+      width: 2
       color: 0x888888
       priority: 0
       cap: BUTTCAP
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -14259,330 +24969,594 @@ cont {
 cont {
   name: "highway-motorway_link"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x666666
-      priority: 57
+      width: 3
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x666666
-      priority: 57
+      width: 4
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 14
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5
-      color: 0x666666
-      priority: 57
+      width: 6
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 9
-      color: 0x666666
-      priority: 57
+      width: 10
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 16
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0x666666
-      priority: 57
+      width: 14
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0x666666
-      priority: 57
+      width: 14
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 24
-      color: 0x666666
-      priority: 57
+      width: 25
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 42
-      color: 0x666666
-      priority: 57
+      width: 43
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "highway-motorway_link-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x666666
-      priority: 57
+      width: 3
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x666666
-      priority: 57
+      width: 4
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 14
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5
-      color: 0x666666
-      priority: 57
+      width: 6
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 9
-      color: 0x666666
-      priority: 57
+      width: 10
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 12
@@ -14593,36 +25567,47 @@ cont {
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
-      color: 0x666666
-      priority: 57
+      width: 14
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
+    }
+    lines {
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 16
@@ -14633,41 +25618,47 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 17
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
-      color: 0x666666
-      priority: 57
+      width: 14
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
+    }
+    lines {
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 16
@@ -14678,41 +25669,47 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 18
     lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 24
-      color: 0x666666
-      priority: 57
+      width: 25
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
+    }
+    lines {
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 27
@@ -14723,41 +25720,47 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 19
     lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 42
-      color: 0x666666
-      priority: 57
+      width: 43
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
+    }
+    lines {
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 45
@@ -14768,112 +25771,227 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
 }
 cont {
   name: "highway-motorway_link-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x555555
+      priority: 61
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x666666
-      priority: 57
+      width: 3
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x666666
-      priority: 57
+      width: 4
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
   }
   element {
     scale: 14
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5
-      color: 0x666666
-      priority: 57
+      width: 6
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 9
-      color: 0x666666
-      priority: 57
+      width: 10
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
+      priority: 16061
     }
     lines {
       width: 12
@@ -14884,7 +26002,7 @@ cont {
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -14895,40 +26013,39 @@ cont {
   element {
     scale: 16
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
-      color: 0x666666
-      priority: 57
+      width: 14
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
-    }
-    lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16061
     }
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -14936,48 +26053,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 16
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
-      width: 13
+      width: 0.5
       color: 0x666666
-      priority: 57
+      priority: 20001
+    }
+    lines {
+      width: 14
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
-    }
-    lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16061
     }
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -14985,48 +26108,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 27
+      width: 16
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
-      width: 24
+      width: 0.5
       color: 0x666666
-      priority: 57
+      priority: 20001
+    }
+    lines {
+      width: 25
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
-    }
-    lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16061
     }
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -15034,48 +26163,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 45
+      width: 27
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
-      width: 42
+      width: 0.5
       color: 0x666666
-      priority: 57
+      priority: 20001
+    }
+    lines {
+      width: 43
+      color: 0x555555
+      priority: 61
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x777777
-      priority: 1057
+      priority: 1061
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
-        stroke_color: 0x777777
+        color: 0xffffff
+        stroke_color: 0x666666
       }
-      priority: 16057
-    }
-    lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16061
     }
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -15083,341 +26218,600 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 45
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "highway-path"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-alpine_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 0.8
       color: 0x555555
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 0.8
       color: 0x555555
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 0.8
       color: 0x555555
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-bicycle"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-bicycle-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     lines {
       width: 6
@@ -15428,30 +26822,36 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 6
@@ -15462,30 +26862,36 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15496,30 +26902,36 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15530,30 +26942,36 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15564,7 +26982,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -15572,17 +26990,62 @@ cont {
 cont {
   name: "highway-path-bicycle-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     lines {
       width: 6
@@ -15593,7 +27056,7 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -15604,23 +27067,29 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 6
@@ -15631,7 +27100,7 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -15642,23 +27111,29 @@ cont {
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15669,7 +27144,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -15680,23 +27155,29 @@ cont {
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15707,7 +27188,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -15718,23 +27199,29 @@ cont {
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15745,7 +27232,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -15757,17 +27244,62 @@ cont {
 cont {
   name: "highway-path-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     lines {
       width: 6
@@ -15778,30 +27310,36 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 6
@@ -15812,30 +27350,36 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15846,30 +27390,36 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15880,30 +27430,36 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -15914,7 +27470,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -15922,257 +27478,446 @@ cont {
 cont {
   name: "highway-path-demanding_alpine_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-demanding_mountain_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-difficult_alpine_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -16183,23 +27928,29 @@ cont {
         dd: 1.2
       }
       cap: BUTTCAP
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -16210,23 +27961,29 @@ cont {
         dd: 1.2
       }
       cap: BUTTCAP
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -16237,662 +27994,1127 @@ cont {
         dd: 1.2
       }
       cap: BUTTCAP
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 0.8
       color: 0x555555
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 0.8
       color: 0x555555
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 4.8
+      width: 6.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 0.8
       color: 0x555555
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0x555555
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-horse"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-mountain_hiking"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
   }
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-path-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     lines {
       width: 6
@@ -16903,7 +29125,7 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -16914,23 +29136,29 @@ cont {
   element {
     scale: 16
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 6
@@ -16941,7 +29169,7 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -16952,23 +29180,29 @@ cont {
   element {
     scale: 17
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -16979,7 +29213,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -16990,23 +29224,29 @@ cont {
   element {
     scale: 18
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -17017,7 +29257,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -17028,23 +29268,29 @@ cont {
   element {
     scale: 19
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xffffff
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -17055,7 +29301,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -17067,347 +29313,545 @@ cont {
 cont {
   name: "highway-pedestrian"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 15
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
-      width: 5
-      color: 0xaaaaaa
-      priority: 38
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 11
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 19
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
   }
 }
 cont {
   name: "highway-pedestrian-area"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xbbbbbb
-      priority: 1039
+      priority: 1037
     }
   }
   element {
     scale: 15
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xdddddd
-      priority: 1039
+      priority: 1037
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xdddddd
-      priority: 1039
+      priority: 1037
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xdddddd
-      priority: 1039
+      priority: 1037
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xdddddd
-      priority: 1039
+      priority: 1037
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     area {
       color: 0xdddddd
-      priority: 1039
+      priority: 1037
     }
   }
 }
 cont {
   name: "highway-pedestrian-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 15
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
-      width: 5
-      color: 0xaaaaaa
-      priority: 38
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -17418,36 +29862,42 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8
@@ -17458,36 +29908,42 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 11
@@ -17498,36 +29954,42 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 11
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 13
@@ -17538,36 +30000,42 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 19
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 21
@@ -17578,7 +30046,7 @@ cont {
     lines {
       width: 23
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -17586,53 +30054,101 @@ cont {
 cont {
   name: "highway-pedestrian-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16038
+      priority: 16036
     }
   }
   element {
     scale: 15
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
-      width: 5
-      color: 0xaaaaaa
-      priority: 38
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 7
@@ -17643,7 +30159,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -17654,29 +30170,35 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 8
@@ -17687,7 +30209,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -17698,29 +30220,35 @@ cont {
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 11
@@ -17731,7 +30259,7 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -17742,29 +30270,35 @@ cont {
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 11
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 13
@@ -17775,7 +30309,7 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -17786,29 +30320,35 @@ cont {
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 19
       color: 0xaaaaaa
-      priority: 38
+      priority: 36
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1038
+      priority: 1036
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16038
+      priority: 16036
     }
     lines {
       width: 21
@@ -17819,7 +30359,7 @@ cont {
     lines {
       width: 23
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -17831,538 +30371,790 @@ cont {
 cont {
   name: "highway-primary"
   element {
-    scale: 8
+    scale: 0
     lines {
       width: 2
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 9
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 7
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 11
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x888888
-      priority: 54
+      width: 4
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 13
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 14
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 15
     lines {
-      width: 18
+      width: 20
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 16
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 15
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 16
     lines {
-      width: 18
+      width: 20
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 16
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 17
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 18
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "highway-primary-bridge"
   element {
-    scale: 8
+    scale: 0
     lines {
       width: 2
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 9
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 7
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 11
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x888888
-      priority: 54
+      width: 4
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 13
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 14
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 15
     lines {
-      width: 18
+      width: 20
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 16
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 15
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 18
@@ -18373,36 +31165,47 @@ cont {
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 16
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
+    }
+    lines {
+      width: 20
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 18
@@ -18413,41 +31216,47 @@ cont {
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 17
     lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 18
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
+    }
+    lines {
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 20
@@ -18458,41 +31267,47 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 18
     lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 25
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
+    }
+    lines {
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 27
@@ -18503,41 +31318,47 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 19
     lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 43
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
+    }
+    lines {
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 45
@@ -18548,216 +31369,325 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
 }
 cont {
   name: "highway-primary-tunnel"
   element {
-    scale: 8
+    scale: 0
     lines {
       width: 2
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 9
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 7
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 11
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x888888
-      priority: 54
+      width: 4
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 13
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 14
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 15
     lines {
-      width: 18
+      width: 20
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 16
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 15
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 18
@@ -18768,7 +31698,7 @@ cont {
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -18779,40 +31709,39 @@ cont {
   element {
     scale: 16
     lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 16
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
-    }
-    lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16058
     }
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -18820,48 +31749,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 20
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
-      width: 20
+      width: 18
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 18
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
-    }
-    lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16058
     }
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -18869,48 +31804,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 27
+      width: 20
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 25
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
-    }
-    lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16058
     }
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -18918,48 +31859,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 45
+      width: 27
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 43
-      color: 0x888888
-      priority: 54
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
-    }
-    lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16058
     }
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -18967,419 +31914,654 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 45
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "highway-primary_link"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x888888
-      priority: 54
+      width: 5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 13
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x888888
-      priority: 54
+      width: 5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
-      color: 0x888888
-      priority: 54
+      width: 6.5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 54
+      width: 11
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 16
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0x888888
-      priority: 54
+      width: 14
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0x888888
-      priority: 54
+      width: 14
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 24
-      color: 0x888888
-      priority: 54
+      width: 25
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 42
-      color: 0x888888
-      priority: 54
+      width: 43
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "highway-primary_link-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x888888
-      priority: 54
+      width: 5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 13
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x888888
-      priority: 54
+      width: 5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
-      color: 0x888888
-      priority: 54
+      width: 6.5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 54
+      width: 11
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 13
@@ -19390,36 +32572,47 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
-      color: 0x888888
-      priority: 54
+      width: 14
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
+    }
+    lines {
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 16
@@ -19430,41 +32623,47 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 17
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
-      color: 0x888888
-      priority: 54
+      width: 14
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
+    }
+    lines {
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 16
@@ -19475,41 +32674,47 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 18
     lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 24
-      color: 0x888888
-      priority: 54
+      width: 25
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
+    }
+    lines {
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 27
@@ -19520,41 +32725,47 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 19
     lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 42
-      color: 0x888888
-      priority: 54
+      width: 43
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
+    }
+    lines {
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 45
@@ -19565,152 +32776,249 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
 }
 cont {
   name: "highway-primary_link-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 58
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 54
+      width: 3
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x888888
-      priority: 54
+      width: 5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 13
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x888888
-      priority: 54
+      width: 5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
-      color: 0x888888
-      priority: 54
+      width: 6.5
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 54
+      width: 11
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
+      priority: 16058
     }
     lines {
       width: 13
@@ -19721,7 +33029,7 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -19732,40 +33040,39 @@ cont {
   element {
     scale: 16
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
-      color: 0x888888
-      priority: 54
+      width: 14
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
-    }
-    lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16058
     }
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -19773,48 +33080,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 16
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
-      width: 13
-      color: 0x888888
-      priority: 54
+      width: 14
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
-    }
-    lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16058
     }
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -19822,48 +33135,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 27
+      width: 16
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
-      width: 24
-      color: 0x888888
-      priority: 54
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
+    lines {
+      width: 25
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
-    }
-    lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16058
     }
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -19871,48 +33190,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 45
+      width: 27
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
-      width: 42
-      color: 0x888888
-      priority: 54
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
+    lines {
+      width: 43
+      color: 0x666666
+      priority: 58
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1054
+      priority: 1058
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0x888888
       }
-      priority: 16054
-    }
-    lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16058
     }
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -19920,24 +33245,184 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 45
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "highway-proposed"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 15
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 16
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 17
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       dashdot {
@@ -19960,13 +33445,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       dashdot {
@@ -19989,13 +33474,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       dashdot {
@@ -20019,15 +33504,123 @@ cont {
 cont {
   name: "highway-raceway"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 4.38
+      width: 6.38
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.38
+      width: 2.38
       color: 0x888888
       priority: 183
       cap: BUTTCAP
@@ -20041,66 +33634,61 @@ cont {
   element {
     scale: 13
     lines {
-      width: 4.75
+      width: 6.75
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.75
+      width: 2.75
       color: 0x888888
-      priority: 197
+      priority: 192
       cap: BUTTCAP
     }
     lines {
       width: 0.75
       color: 0xdddddd
-      priority: 1197
+      priority: 1192
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
+      width: 5
       color: 0x888888
-      priority: 282
+      priority: 275
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xdddddd
-      priority: 1282
+      priority: 1275
     }
   }
   element {
     scale: 15
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 5.4
       color: 0x888888
-      priority: 189
+      priority: 186
       cap: BUTTCAP
     }
     lines {
       width: 3.4
       color: 0xffffff
-      priority: 1189
-    }
-    lines {
-      width: 6.0
-      color: 0xdddddd
-      priority: 1369
+      priority: 1186
     }
     lines {
       width: 3.4
@@ -20110,27 +33698,32 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1191
+      priority: 1189
+    }
+    lines {
+      width: 6.0
+      color: 0xdddddd
+      priority: 1359
     }
   }
   element {
     scale: 16
     lines {
-      width: 10.8
+      width: 12.8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 597
+      priority: 590
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xdddddd
-      priority: 1597
+      priority: 1590
     }
     lines {
       width: 6.8
@@ -20140,32 +33733,32 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1473
+      priority: 1465
     }
     lines {
       width: 6.0
       color: 0xdddddd
-      priority: 1600
+      priority: 1593
     }
   }
   element {
     scale: 17
     lines {
-      width: 17.6
+      width: 19.6
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 476
+      priority: 467
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xdddddd
-      priority: 1476
+      priority: 1467
     }
     lines {
       width: 13.6
@@ -20175,32 +33768,32 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1479
+      priority: 1470
     }
     lines {
       width: 12.0
       color: 0xdddddd
-      priority: 1641
+      priority: 1635
     }
   }
   element {
     scale: 18
     lines {
-      width: 17.6
+      width: 19.6
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 476
+      priority: 467
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xdddddd
-      priority: 1476
+      priority: 1467
     }
     lines {
       width: 13.6
@@ -20210,32 +33803,32 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1479
+      priority: 1470
     }
     lines {
       width: 12.0
       color: 0xdddddd
-      priority: 1641
+      priority: 1635
     }
   }
   element {
     scale: 19
     lines {
-      width: 17.6
+      width: 19.6
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 476
+      priority: 467
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xdddddd
-      priority: 1476
+      priority: 1467
     }
     lines {
       width: 13.6
@@ -20245,424 +33838,781 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1479
+      priority: 1470
     }
     lines {
       width: 12.0
       color: 0xdddddd
-      priority: 1641
+      priority: 1635
     }
   }
 }
 cont {
   name: "highway-residential"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-residential-area"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
 }
 cont {
   name: "highway-residential-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 8
@@ -20673,36 +34623,42 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 10
@@ -20713,36 +34669,42 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 11
@@ -20753,36 +34715,42 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 27
@@ -20793,36 +34761,42 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 45
@@ -20833,7 +34807,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -20841,270 +34815,552 @@ cont {
 cont {
   name: "highway-residential-private"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-residential-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 3
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 8
@@ -21115,7 +35371,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21126,29 +35382,35 @@ cont {
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 10
@@ -21159,7 +35421,7 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21170,29 +35432,35 @@ cont {
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 11
@@ -21203,7 +35471,7 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21214,29 +35482,35 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 27
@@ -21247,7 +35521,7 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21258,29 +35532,35 @@ cont {
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 45
@@ -21291,7 +35571,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21303,15 +35583,141 @@ cont {
 cont {
   name: "highway-road"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 14
     lines {
-      width: 7.5
+      width: 9.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.5
+      width: 5.5
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21322,9 +35728,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21333,13 +35745,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 8
+      width: 9
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21350,9 +35762,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21361,13 +35779,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
+      width: 11
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21378,9 +35796,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21389,13 +35813,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21406,9 +35830,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21417,13 +35847,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21434,9 +35864,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21445,13 +35881,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21462,9 +35898,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21474,15 +35916,141 @@ cont {
 cont {
   name: "highway-road-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 14
     lines {
-      width: 7.5
+      width: 9.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.5
+      width: 5.5
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21493,9 +36061,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21504,13 +36078,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 8
+      width: 9
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21521,9 +36095,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21537,20 +36117,20 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
+      width: 11
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21561,9 +36141,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21577,20 +36163,20 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21601,9 +36187,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21617,20 +36209,20 @@ cont {
     lines {
       width: 16
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21641,9 +36233,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21657,20 +36255,20 @@ cont {
     lines {
       width: 16
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21681,9 +36279,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21697,7 +36301,7 @@ cont {
     lines {
       width: 16
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -21705,15 +36309,141 @@ cont {
 cont {
   name: "highway-road-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 0
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 14
     lines {
-      width: 7.5
+      width: 9.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4.5
+      width: 5.5
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21724,9 +36454,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21735,13 +36471,13 @@ cont {
   element {
     scale: 15
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 8
+      width: 9
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21752,9 +36488,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21768,7 +36510,7 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21779,13 +36521,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
+      width: 11
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21796,9 +36538,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21812,7 +36560,7 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21823,13 +36571,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21840,9 +36588,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21856,7 +36610,7 @@ cont {
     lines {
       width: 16
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21867,13 +36621,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21884,9 +36638,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21900,7 +36660,7 @@ cont {
     lines {
       width: 16
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21911,13 +36671,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 14
+      width: 16
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 11
+      width: 12
       color: 0x888888
       priority: 0
       cap: BUTTCAP
@@ -21928,9 +36688,15 @@ cont {
       priority: 1000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xcccccc
       }
       priority: 16000
@@ -21944,7 +36710,7 @@ cont {
     lines {
       width: 16
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -21956,454 +36722,688 @@ cont {
 cont {
   name: "highway-secondary"
   element {
-    scale: 9
+    scale: 0
     lines {
       width: 2
       color: 0x888888
-      priority: 52
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 7
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3
+      color: 0x888888
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 11
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
+      width: 4
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 13
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 14
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 15
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 16
     lines {
-      width: 15
+      width: 17
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 13
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 17
     lines {
-      width: 18
+      width: 20
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 16
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "highway-secondary-bridge"
   element {
-    scale: 9
+    scale: 0
     lines {
       width: 2
       color: 0x888888
-      priority: 52
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 7
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3
+      color: 0x888888
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 11
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
+      width: 4
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 13
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 14
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 15
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 11
@@ -22414,36 +37414,47 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 15
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 13
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
+    }
+    lines {
+      width: 17
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 15
@@ -22454,41 +37465,47 @@ cont {
     lines {
       width: 17
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 17
     lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 16
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
+    }
+    lines {
+      width: 20
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 18
@@ -22499,41 +37516,47 @@ cont {
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 18
     lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 25
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
+    }
+    lines {
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 27
@@ -22544,41 +37567,47 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 19
     lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 43
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
+    }
+    lines {
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 45
@@ -22589,174 +37618,274 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
 }
 cont {
   name: "highway-secondary-tunnel"
   element {
-    scale: 9
+    scale: 0
     lines {
       width: 2
       color: 0x888888
-      priority: 52
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 7
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3
+      color: 0x888888
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 11
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
+      width: 4
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 13
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 14
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 15
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 11
@@ -22767,7 +37896,7 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -22778,40 +37907,39 @@ cont {
   element {
     scale: 16
     lines {
-      width: 15
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 13
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 11.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
-    }
-    lines {
-      width: 15
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16055
     }
     lines {
       width: 17
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -22819,48 +37947,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 17
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
-      width: 18
+      width: 15
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 16
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
-    }
-    lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16055
     }
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -22868,48 +38002,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 20
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 27
+      width: 18
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 25
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
-    }
-    lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16055
     }
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -22917,48 +38057,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 45
+      width: 27
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 43
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
-    }
-    lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16055
     }
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -22966,419 +38112,654 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 45
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "highway-secondary_link"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
+      width: 4
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
+      width: 6.5
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
+      width: 11
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 16
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 24
+      width: 25
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 42
+      width: 43
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "highway-secondary_link-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
+      width: 4
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
+      width: 6.5
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
+      width: 11
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 13
@@ -23389,36 +38770,47 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
+    }
+    lines {
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 16
@@ -23429,41 +38821,47 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 17
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
+    }
+    lines {
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 16
@@ -23474,41 +38872,47 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 18
     lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 24
+      width: 25
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
+    }
+    lines {
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 27
@@ -23519,41 +38923,47 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 19
     lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 42
+      width: 43
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
+    }
+    lines {
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 45
@@ -23564,152 +38974,249 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
 }
 cont {
   name: "highway-secondary_link-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 55
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
+      width: 4
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
+      width: 6.5
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
+      width: 11
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
+      priority: 16055
     }
     lines {
       width: 13
@@ -23720,7 +39227,7 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -23731,40 +39238,39 @@ cont {
   element {
     scale: 16
     lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
-      width: 13
+      width: 14
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
-    }
-    lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16055
     }
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -23772,48 +39278,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 16
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
-      width: 13
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
+    lines {
+      width: 14
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
-    }
-    lines {
-      width: 16
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16055
     }
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -23821,48 +39333,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 18
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 27
+      width: 16
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
-      width: 24
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
+    lines {
+      width: 25
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
-    }
-    lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16055
     }
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -23870,48 +39388,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 45
+      width: 27
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
-      width: 42
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
+    lines {
+      width: 43
       color: 0x888888
-      priority: 52
+      priority: 55
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1052
+      priority: 1055
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16052
-    }
-    lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16055
     }
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -23919,267 +39443,637 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 45
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "highway-service"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
-      color: 0x888888
-      priority: 35
+      width: 2.5
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 0.5
-      color: 0x888888
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
   }
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 35
+      width: 3
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 1.0
-      color: 0xaaaaaa
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 6
-      color: 0x888888
-      priority: 35
+      width: 7
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 35
+      width: 11
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 18
-      color: 0x888888
-      priority: 35
+      width: 19
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
 }
 cont {
   name: "highway-service-area"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     area {
-      color: 0x888888
-      priority: 1036
+      color: 0xdddddd
+      priority: 1039
     }
   }
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     area {
-      color: 0xaaaaaa
-      priority: 1036
+      color: 0xdddddd
+      priority: 1039
     }
   }
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     area {
       color: 0xdddddd
-      priority: 1036
+      priority: 1039
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     area {
       color: 0xdddddd
-      priority: 1036
+      priority: 1039
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     area {
       color: 0xdddddd
-      priority: 1036
+      priority: 1039
     }
   }
 }
 cont {
   name: "highway-service-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
-      color: 0x888888
-      priority: 35
+      width: 2.5
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 0.5
-      color: 0x888888
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     lines {
       width: 4.5
@@ -24190,36 +40084,42 @@ cont {
     lines {
       width: 6.5
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 35
+      width: 3
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 1.0
-      color: 0xaaaaaa
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 5
@@ -24230,36 +40130,42 @@ cont {
     lines {
       width: 7
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 6
-      color: 0x888888
-      priority: 35
+      width: 7
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 9
@@ -24270,36 +40176,42 @@ cont {
     lines {
       width: 11
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 35
+      width: 11
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 13
@@ -24310,36 +40222,42 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 18
-      color: 0x888888
-      priority: 35
+      width: 19
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 21
@@ -24350,7 +40268,7 @@ cont {
     lines {
       width: 23
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -24358,258 +40276,621 @@ cont {
 cont {
   name: "highway-service-driveway"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
-      color: 0x888888
-      priority: 35
+      width: 2.5
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 0.5
-      color: 0x888888
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
   }
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 35
+      width: 3
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 1.0
-      color: 0xaaaaaa
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 6
-      color: 0x888888
-      priority: 35
+      width: 7
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 35
+      width: 11
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 18
-      color: 0x888888
-      priority: 35
+      width: 19
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
 }
 cont {
   name: "highway-service-driveway-area"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     area {
-      color: 0x888888
-      priority: 1036
+      color: 0xdddddd
+      priority: 1039
     }
   }
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     area {
-      color: 0xaaaaaa
-      priority: 1036
+      color: 0xdddddd
+      priority: 1039
     }
   }
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     area {
       color: 0xdddddd
-      priority: 1036
+      priority: 1039
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     area {
       color: 0xdddddd
-      priority: 1036
+      priority: 1039
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     area {
       color: 0xdddddd
-      priority: 1036
+      priority: 1039
     }
   }
 }
 cont {
   name: "highway-service-driveway-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
-      color: 0x888888
-      priority: 35
+      width: 2.5
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 0.5
-      color: 0x888888
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     lines {
       width: 4.5
@@ -24620,36 +40901,42 @@ cont {
     lines {
       width: 6.5
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 35
+      width: 3
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 1.0
-      color: 0xaaaaaa
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 5
@@ -24660,36 +40947,42 @@ cont {
     lines {
       width: 7
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 6
-      color: 0x888888
-      priority: 35
+      width: 7
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 9
@@ -24700,36 +40993,42 @@ cont {
     lines {
       width: 11
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 35
+      width: 11
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 13
@@ -24740,36 +41039,42 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 18
-      color: 0x888888
-      priority: 35
+      width: 19
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 21
@@ -24780,7 +41085,7 @@ cont {
     lines {
       width: 23
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -24788,23 +41093,158 @@ cont {
 cont {
   name: "highway-service-driveway-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
-      color: 0x888888
-      priority: 35
+      width: 2.5
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 0.5
-      color: 0x888888
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     lines {
       width: 4.5
@@ -24815,7 +41255,7 @@ cont {
     lines {
       width: 6.5
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -24826,29 +41266,35 @@ cont {
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 35
+      width: 3
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 1.0
-      color: 0xaaaaaa
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 5
@@ -24859,7 +41305,7 @@ cont {
     lines {
       width: 7
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -24870,29 +41316,35 @@ cont {
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 6
-      color: 0x888888
-      priority: 35
+      width: 7
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 9
@@ -24903,7 +41355,7 @@ cont {
     lines {
       width: 11
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -24914,29 +41366,35 @@ cont {
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 35
+      width: 11
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 13
@@ -24947,7 +41405,7 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -24958,29 +41416,35 @@ cont {
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 18
-      color: 0x888888
-      priority: 35
+      width: 19
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 21
@@ -24991,7 +41455,7 @@ cont {
     lines {
       width: 23
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -25003,158 +41467,452 @@ cont {
 cont {
   name: "highway-service-parking_aisle"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
-      color: 0x888888
-      priority: 35
+      width: 2.5
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 0.5
-      color: 0x888888
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
   }
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 35
+      width: 3
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 1.0
-      color: 0xaaaaaa
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 6
-      color: 0x888888
-      priority: 35
+      width: 7
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 35
+      width: 11
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 18
-      color: 0x888888
-      priority: 35
+      width: 19
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
   }
 }
 cont {
   name: "highway-service-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 2
+      color: 0xcccccc
+      priority: 38
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 15
     lines {
-      width: 4.5
+      width: 6.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 1.5
-      color: 0x888888
-      priority: 35
+      width: 2.5
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 0.5
-      color: 0x888888
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     lines {
       width: 4.5
@@ -25165,7 +41923,7 @@ cont {
     lines {
       width: 6.5
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -25176,29 +41934,35 @@ cont {
   element {
     scale: 16
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x888888
-      priority: 35
+      width: 3
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 1.0
-      color: 0xaaaaaa
-      priority: 1035
+      color: 0xdddddd
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
-        stroke_color: 0xaaaaaa
+        color: 0x000000
+        stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 5
@@ -25209,7 +41973,7 @@ cont {
     lines {
       width: 7
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -25220,29 +41984,35 @@ cont {
   element {
     scale: 17
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 6
-      color: 0x888888
-      priority: 35
+      width: 7
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 9
@@ -25253,7 +42023,7 @@ cont {
     lines {
       width: 11
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -25264,29 +42034,35 @@ cont {
   element {
     scale: 18
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0x888888
-      priority: 35
+      width: 11
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 13
@@ -25297,7 +42073,7 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -25308,29 +42084,35 @@ cont {
   element {
     scale: 19
     lines {
-      width: 21
+      width: 23
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 18
-      color: 0x888888
-      priority: 35
+      width: 19
+      color: 0xcccccc
+      priority: 38
       cap: BUTTCAP
     }
     lines {
       width: 17.0
       color: 0xdddddd
-      priority: 1035
+      priority: 1038
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xdddddd
       }
-      priority: 16035
+      priority: 16038
     }
     lines {
       width: 21
@@ -25341,7 +42123,7 @@ cont {
     lines {
       width: 23
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -25353,11 +42135,59 @@ cont {
 cont {
   name: "highway-steps"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -25368,38 +42198,50 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16043
+      priority: 16047
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16043
+      priority: 16047
     }
     lines {
       width: 4.0
@@ -25409,30 +42251,36 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
   }
   element {
     scale: 18
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 0x999999
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16043
+      priority: 16047
     }
     lines {
       width: 8.0
@@ -25442,30 +42290,36 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
   }
   element {
     scale: 19
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 18.0
       color: 0xeeeeee
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16043
+      priority: 16047
     }
     lines {
       width: 16.0
@@ -25475,18 +42329,66 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
   }
 }
 cont {
   name: "highway-steps-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -25497,15 +42399,21 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16043
+      priority: 16047
     }
     lines {
       width: 8
@@ -25516,37 +42424,31 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 8
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 6.0
       color: 0x999999
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16043
-    }
-    lines {
-      width: 8
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16047
     }
     lines {
       width: 4.0
@@ -25556,42 +42458,48 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
     lines {
       width: 10
-      color: 0x666666
-      priority: 10
+      color: 0xeeeeee
+      priority: -14987
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 12
+      width: 8
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
     lines {
+      width: 10
+      color: 0x666666
+      priority: 11
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 18
+    lines {
       width: 10.0
       color: 0x999999
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16043
-    }
-    lines {
-      width: 12
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16047
     }
     lines {
       width: 8.0
@@ -25601,42 +42509,48 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
     lines {
       width: 14
-      color: 0x666666
-      priority: 10
+      color: 0xeeeeee
+      priority: -14987
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 20
+      width: 12
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
     lines {
+      width: 14
+      color: 0x666666
+      priority: 11
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 19
+    lines {
       width: 18.0
       color: 0xeeeeee
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16043
-    }
-    lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16047
     }
     lines {
       width: 16.0
@@ -25646,12 +42560,24 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
+    }
+    lines {
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 20
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -25659,11 +42585,59 @@ cont {
 cont {
   name: "highway-steps-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
@@ -25674,15 +42648,21 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xffffff
       }
-      priority: 16043
+      priority: 16047
     }
     lines {
       width: 8
@@ -25693,7 +42673,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -25704,30 +42684,24 @@ cont {
   element {
     scale: 17
     lines {
-      width: 8
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 6.0
       color: 0x999999
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16043
-    }
-    lines {
-      width: 8
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16047
     }
     lines {
       width: 4.0
@@ -25737,46 +42711,52 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 12
+      width: 10
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 8
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 10.0
       color: 0x999999
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16043
-    }
-    lines {
-      width: 12
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16047
     }
     lines {
       width: 8.0
@@ -25786,46 +42766,52 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 20
+      width: 14
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 12
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 18.0
       color: 0xeeeeee
       cap: BUTTCAP
-      priority: 1043
+      priority: 1047
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16043
-    }
-    lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16047
     }
     lines {
       width: 16.0
@@ -25835,327 +42821,603 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 20
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "highway-tertiary"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x999999
-      priority: 49
+      width: 3
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4
-      color: 0xaaaaaa
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 14
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
 }
 cont {
   name: "highway-tertiary-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x999999
-      priority: 49
+      width: 3
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4
-      color: 0xaaaaaa
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 8
@@ -26166,36 +43428,42 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 10
@@ -26206,36 +43474,42 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 14
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 16
@@ -26246,36 +43520,42 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 27
@@ -26286,36 +43566,42 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 45
@@ -26326,7 +43612,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -26334,99 +43620,219 @@ cont {
 cont {
   name: "highway-tertiary-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x999999
-      priority: 49
+      width: 3
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4
-      color: 0xaaaaaa
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 8
@@ -26437,7 +43843,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -26448,29 +43854,35 @@ cont {
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 10
@@ -26481,7 +43893,7 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -26492,29 +43904,35 @@ cont {
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 14
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 16
@@ -26525,7 +43943,7 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -26536,29 +43954,35 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 27
@@ -26569,7 +43993,7 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -26580,29 +44004,35 @@ cont {
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0x999999
-      priority: 49
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 45
@@ -26613,7 +44043,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -26625,294 +44055,546 @@ cont {
 cont {
   name: "highway-tertiary_link"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0xaaaaaa
-      priority: 49
+      width: 3
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 13
     lines {
-      width: 6.75
+      width: 8.75
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3.75
-      color: 0xaaaaaa
-      priority: 49
+      width: 4.75
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 2.75
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
-      color: 0xaaaaaa
-      priority: 49
+      width: 6.5
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0xaaaaaa
-      priority: 49
+      width: 11
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 16
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0xaaaaaa
-      priority: 49
+      width: 14
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0xaaaaaa
-      priority: 49
+      width: 14
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 24
-      color: 0xaaaaaa
-      priority: 49
+      width: 25
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 42
-      color: 0xaaaaaa
-      priority: 49
+      width: 43
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
   }
 }
 cont {
   name: "highway-tertiary_link-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0xaaaaaa
-      priority: 49
+      width: 3
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 13
     lines {
-      width: 6.75
+      width: 8.75
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3.75
-      color: 0xaaaaaa
-      priority: 49
+      width: 4.75
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 2.75
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
-      color: 0xaaaaaa
-      priority: 49
+      width: 6.5
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0xaaaaaa
-      priority: 49
+      width: 11
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 13
@@ -26923,36 +44605,42 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0xaaaaaa
-      priority: 49
+      width: 14
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 16
@@ -26963,36 +44651,42 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0xaaaaaa
-      priority: 49
+      width: 14
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 16
@@ -27003,36 +44697,42 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 24
-      color: 0xaaaaaa
-      priority: 49
+      width: 25
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 27
@@ -27043,36 +44743,42 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 42
-      color: 0xaaaaaa
-      priority: 49
+      width: 43
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 45
@@ -27083,7 +44789,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -27091,91 +44797,205 @@ cont {
 cont {
   name: "highway-tertiary_link-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0x888888
+      priority: 52
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0xaaaaaa
-      priority: 49
+      width: 3
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 13
     lines {
-      width: 6.75
+      width: 8.75
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3.75
-      color: 0xaaaaaa
-      priority: 49
+      width: 4.75
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 2.75
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 14
     lines {
-      width: 8.5
+      width: 10.5
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 5.5
-      color: 0xaaaaaa
-      priority: 49
+      width: 6.5
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
   }
   element {
     scale: 15
     lines {
-      width: 13
+      width: 15
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 10
-      color: 0xaaaaaa
-      priority: 49
+      width: 11
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 13
@@ -27186,7 +45006,7 @@ cont {
     lines {
       width: 15
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -27197,29 +45017,35 @@ cont {
   element {
     scale: 16
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0xaaaaaa
-      priority: 49
+      width: 14
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 16
@@ -27230,7 +45056,7 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -27241,29 +45067,35 @@ cont {
   element {
     scale: 17
     lines {
-      width: 16
+      width: 18
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 13
-      color: 0xaaaaaa
-      priority: 49
+      width: 14
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 16
@@ -27274,7 +45106,7 @@ cont {
     lines {
       width: 18
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -27285,29 +45117,35 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 24
-      color: 0xaaaaaa
-      priority: 49
+      width: 25
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 27
@@ -27318,7 +45156,7 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -27329,29 +45167,35 @@ cont {
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 42
-      color: 0xaaaaaa
-      priority: 49
+      width: 43
+      color: 0x888888
+      priority: 52
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xaaaaaa
-      priority: 1049
+      priority: 1052
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xaaaaaa
       }
-      priority: 16049
+      priority: 16052
     }
     lines {
       width: 45
@@ -27362,7 +45206,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -27374,308 +45218,473 @@ cont {
 cont {
   name: "highway-track"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-area"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     area {
       color: 0x888888
-      priority: 1042
+      priority: 1045
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     area {
       color: 0x888888
-      priority: 1042
+      priority: 1045
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     area {
       color: 0x999999
-      priority: 1042
+      priority: 1045
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     area {
       color: 0x999999
-      priority: 1042
+      priority: 1045
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     area {
       color: 0x999999
-      priority: 1042
+      priority: 1045
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     area {
       color: 0x999999
-      priority: 1042
+      priority: 1045
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     area {
       color: 0x999999
-      priority: 1042
+      priority: 1045
     }
   }
 }
 cont {
   name: "highway-track-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     lines {
       width: 6
@@ -27686,30 +45695,36 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 8
@@ -27720,30 +45735,36 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 10
@@ -27754,30 +45775,36 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 10
@@ -27788,30 +45815,36 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 10
@@ -27822,7 +45855,7 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -27830,2342 +45863,3452 @@ cont {
 cont {
   name: "highway-track-grade1"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade2"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade3"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade3-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade3-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade3-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade4"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade4-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade4-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade4-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade5"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade5-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade5-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-grade5-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
   }
 }
 cont {
   name: "highway-track-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 14
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1041
+      priority: 1044
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     lines {
       width: 6
@@ -30176,7 +49319,7 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -30187,23 +49330,29 @@ cont {
   element {
     scale: 16
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 8
@@ -30214,7 +49363,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -30225,23 +49374,29 @@ cont {
   element {
     scale: 17
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 10
@@ -30252,7 +49407,7 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -30263,23 +49418,29 @@ cont {
   element {
     scale: 18
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 10
@@ -30290,7 +49451,7 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -30301,23 +49462,29 @@ cont {
   element {
     scale: 19
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0x999999
-      priority: 1041
+      priority: 1044
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0x999999
       }
-      priority: 16041
+      priority: 16044
     }
     lines {
       width: 10
@@ -30328,7 +49495,7 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -30340,568 +49507,802 @@ cont {
 cont {
   name: "highway-trunk"
   element {
-    scale: 7
+    scale: 0
     lines {
       width: 2
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 8
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 9
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 8
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 10
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 11
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x777777
-      priority: 60
+      width: 5
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 13
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 14
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 15
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 16
     lines {
-      width: 18
+      width: 20
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 16
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 17
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 18
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "highway-trunk-bridge"
   element {
-    scale: 7
+    scale: 0
     lines {
       width: 2
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 8
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 9
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 8
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 10
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 11
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x777777
-      priority: 60
+      width: 5
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 13
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 14
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 15
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 12
@@ -30912,36 +50313,47 @@ cont {
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 16
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
+    }
+    lines {
+      width: 20
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 18
@@ -30952,41 +50364,47 @@ cont {
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 17
     lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 18
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
+    }
+    lines {
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 20
@@ -30997,41 +50415,47 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 18
     lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 25
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
+    }
+    lines {
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 27
@@ -31042,41 +50466,47 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 19
     lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 43
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
+    }
+    lines {
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 45
@@ -31087,231 +50517,331 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
 }
 cont {
   name: "highway-trunk-tunnel"
   element {
-    scale: 7
+    scale: 0
     lines {
       width: 2
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 8
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 9
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 8
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 10
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 11
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 4
-      color: 0x777777
-      priority: 60
+      width: 5
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
       cap: BUTTCAP
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 12
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 13
     lines {
-      width: 9
+      width: 11
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 7
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 14
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 15
-        color: 0x222222
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 12
@@ -31322,7 +50852,7 @@ cont {
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -31333,40 +50863,39 @@ cont {
   element {
     scale: 16
     lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 16
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
-    }
-    lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16064
     }
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -31374,48 +50903,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 20
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
-      width: 20
+      width: 18
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 18
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
-    }
-    lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16064
     }
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -31423,48 +50958,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 27
+      width: 20
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 25
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
-    }
-    lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16064
     }
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -31472,48 +51013,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 45
+      width: 27
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 43
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
-    }
-    lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16064
     }
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -31521,387 +51068,598 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 45
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "highway-trunk_link"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 14
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 16
     lines {
-      width: 18
+      width: 20
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 16
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 17
     lines {
-      width: 20
+      width: 22
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 18
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
     }
     lines {
       width: 0.5
       color: 0x666666
-      priority: 11000
+      priority: 20001
     }
   }
 }
 cont {
   name: "highway-trunk_link-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 14
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     lines {
       width: 12
@@ -31912,36 +51670,47 @@ cont {
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 16
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
+    }
+    lines {
+      width: 20
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 18
@@ -31952,41 +51721,47 @@ cont {
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 17
     lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 18
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
+    }
+    lines {
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 20
@@ -31997,41 +51772,47 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 18
     lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 25
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
+    }
+    lines {
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 27
@@ -32042,41 +51823,47 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
   element {
     scale: 19
     lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 43
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
+      priority: 16064
+    }
+    lines {
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
     lines {
       width: 45
@@ -32087,136 +51874,221 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
-    lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
-    }
   }
 }
 cont {
   name: "highway-trunk_link-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0x666666
+      priority: 64
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 10
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 11
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 12
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
-      color: 0x777777
-      priority: 60
+      width: 3
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 13
     lines {
-      width: 6
+      width: 8
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 3
-      color: 0x777777
-      priority: 60
+      width: 4
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 14
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
   }
   element {
     scale: 15
     lines {
-      width: 12
+      width: 14
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 10
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     lines {
       width: 12
@@ -32227,7 +52099,7 @@ cont {
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -32238,40 +52110,39 @@ cont {
   element {
     scale: 16
     lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      width: 0.5
+      color: 0x666666
+      priority: 20001
     }
     lines {
       width: 16
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
-    }
-    lines {
-      width: 18
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16064
     }
     lines {
       width: 20
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -32279,48 +52150,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 20
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
-      width: 20
+      width: 18
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 18
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
-    }
-    lines {
-      width: 20
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16064
     }
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -32328,48 +52205,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 22
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
-      width: 27
+      width: 20
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 25
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
-    }
-    lines {
-      width: 27
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16064
     }
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -32377,48 +52260,54 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 29
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
-      width: 45
+      width: 27
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 0.5
+      color: 0x666666
+      priority: 20001
+    }
     lines {
       width: 43
-      color: 0x777777
-      priority: 60
+      color: 0x666666
+      priority: 64
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0x888888
-      priority: 1060
+      priority: 1064
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 17
-        color: 0x333333
-        stroke_color: 0x888888
+        color: 0xffffff
+        stroke_color: 0x777777
       }
-      priority: 16060
-    }
-    lines {
-      width: 45
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16064
     }
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -32426,423 +52315,787 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 0.5
-      color: 0x666666
-      priority: 11000
+      width: 47
+      color: 0xeeeeee
+      priority: -14987
+      cap: BUTTCAP
+    }
+    lines {
+      width: 45
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "highway-unclassified"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
       cap: BUTTCAP
-      priority: 1046
+      priority: 1050
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
 }
 cont {
   name: "highway-unclassified-area"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     area {
       color: 0xcccccc
-      priority: 1047
+      priority: 1051
     }
   }
 }
 cont {
   name: "highway-unclassified-bridge"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
       cap: BUTTCAP
-      priority: 1046
+      priority: 1050
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 8
@@ -32853,36 +53106,42 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 10
@@ -32893,36 +53152,42 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 11
@@ -32933,36 +53198,42 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 27
@@ -32973,36 +53244,42 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 45
@@ -33013,7 +53290,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -33021,80 +53298,209 @@ cont {
 cont {
   name: "highway-unclassified-tunnel"
   element {
+    scale: 0
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 1
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 2
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 3
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 4
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 7
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 8
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 9
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 10
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 2
+      color: 0xaaaaaa
+      priority: 50
+      cap: BUTTCAP
+    }
+  }
+  element {
     scale: 13
     lines {
-      width: 5
+      width: 7
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
-      width: 2
+      width: 3
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 1.0
       color: 0xcccccc
       cap: BUTTCAP
-      priority: 1046
+      priority: 1050
     }
   }
   element {
     scale: 14
     lines {
-      width: 7
+      width: 9
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xaaaaaa
-      priority: 46
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
   }
   element {
     scale: 15
     lines {
-      width: 8
+      width: 10
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 6
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 8
@@ -33105,7 +53511,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -33116,29 +53522,35 @@ cont {
   element {
     scale: 16
     lines {
-      width: 10
+      width: 12
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 8
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 10
@@ -33149,7 +53561,7 @@ cont {
     lines {
       width: 12
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -33160,29 +53572,35 @@ cont {
   element {
     scale: 17
     lines {
-      width: 11
+      width: 13
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 9
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 11
@@ -33193,7 +53611,7 @@ cont {
     lines {
       width: 13
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -33204,29 +53622,35 @@ cont {
   element {
     scale: 18
     lines {
-      width: 27
+      width: 29
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 25
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 23.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 27
@@ -33237,7 +53661,7 @@ cont {
     lines {
       width: 29
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -33248,29 +53672,35 @@ cont {
   element {
     scale: 19
     lines {
-      width: 45
+      width: 47
       color: 0xeeeeee
-      priority: 13
+      priority: -14987
       cap: BUTTCAP
     }
     lines {
       width: 43
-      color: 0xbbbbbb
-      priority: 46
+      color: 0xaaaaaa
+      priority: 50
       cap: BUTTCAP
     }
     lines {
       width: 41.0
       color: 0xcccccc
-      priority: 1046
+      priority: 1050
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xcccccc
       }
-      priority: 16046
+      priority: 16050
     }
     lines {
       width: 45
@@ -33281,7 +53711,7 @@ cont {
     lines {
       width: 47
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -33293,6 +53723,54 @@ cont {
 cont {
   name: "historic-archaeological_site"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "museum"
@@ -33306,9 +53784,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33322,9 +53806,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33338,9 +53828,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33351,6 +53847,54 @@ cont {
 cont {
   name: "historic-battlefield"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "cannon"
@@ -33364,9 +53908,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33380,9 +53930,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33396,9 +53952,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33409,6 +53971,54 @@ cont {
 cont {
   name: "historic-castle"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "castle"
@@ -33422,9 +54032,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33438,9 +54054,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33454,9 +54076,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33467,6 +54095,54 @@ cont {
 cont {
   name: "historic-memorial"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "memorial"
@@ -33480,9 +54156,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33496,9 +54178,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33512,9 +54200,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33525,6 +54219,54 @@ cont {
 cont {
   name: "historic-monument"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "memorial"
@@ -33538,9 +54280,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33554,9 +54302,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33570,9 +54324,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33583,6 +54343,54 @@ cont {
 cont {
   name: "historic-museum"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "museum"
@@ -33596,9 +54404,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33612,9 +54426,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33628,9 +54448,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33641,6 +54467,54 @@ cont {
 cont {
   name: "historic-ruins"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "ruins"
@@ -33654,9 +54528,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33670,9 +54550,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33686,9 +54572,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33699,8 +54591,59 @@ cont {
 cont {
   name: "historic-ship"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
         color: 0x000000
@@ -33716,6 +54659,12 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
         color: 0x000000
@@ -33731,9 +54680,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33747,9 +54702,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33763,9 +54724,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -33780,2024 +54747,3362 @@ cont {
 cont {
   name: "landuse-allotments"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16035
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16036
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16037
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16038
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16039
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16040
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16041
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16042
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-basin"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
 }
 cont {
   name: "landuse-brownfield"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16043
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16044
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16045
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16046
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16047
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16048
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16049
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16050
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-cemetery"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16051
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16052
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16053
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16054
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16055
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16056
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16057
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16058
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-cemetery-christian"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16059
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16060
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16061
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16062
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16063
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16064
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16065
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16066
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-commercial"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xdddddd
-      priority: -16067
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xdddddd
-      priority: -16068
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xdddddd
-      priority: -16069
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16070
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16071
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16072
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16073
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16074
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-conservation"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -16075
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -16076
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -16077
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: -16078
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: -16079
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: -16080
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: -16081
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: -16082
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-conservation-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -16083
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -16084
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -16085
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: -16086
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: -16087
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: -16088
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: -16089
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: -16090
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-conservation-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -16091
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -16092
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -16093
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: -16094
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: -16095
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: -16096
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: -16097
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: -16098
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-conservation-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -16099
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -16100
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -16101
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: -16102
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: -16103
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: -16104
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: -16105
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: -16106
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-construction"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16107
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16108
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16109
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16110
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16111
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16112
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16113
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16114
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-farm"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -16115
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -16116
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -16117
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16118
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16119
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16120
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16121
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16122
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-farmland"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -16123
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -16124
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -16125
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16126
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16127
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16128
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16129
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16130
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-farmyard"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16131
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xdddddd
-      priority: -16132
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xdddddd
-      priority: -16133
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16134
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16135
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16136
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16137
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16138
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-field"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16139
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16140
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16141
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xeeeeee
-      priority: -16142
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xeeeeee
-      priority: -16143
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xeeeeee
-      priority: -16144
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xeeeeee
-      priority: -16145
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xeeeeee
-      priority: -16146
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-forest"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xaaaaaa
-      priority: -16147
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xaaaaaa
-      priority: -16148
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16149
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16150
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16151
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16152
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16153
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16154
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16155
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16156
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-forest-coniferous"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xaaaaaa
-      priority: -16157
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xaaaaaa
-      priority: -16158
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16159
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16160
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16161
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16162
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16163
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16164
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16165
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16166
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-forest-deciduous"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xaaaaaa
-      priority: -16167
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xaaaaaa
-      priority: -16168
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16169
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16170
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16171
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16172
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16173
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16174
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16175
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16176
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-forest-mixed"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xaaaaaa
-      priority: -16177
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xaaaaaa
-      priority: -16178
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16179
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16180
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16181
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16182
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16183
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16184
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16185
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xaaaaaa
-      priority: -16186
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-garages"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16187
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16188
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16189
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16190
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xdddddd
-      priority: -16191
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-grass"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16192
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16193
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16194
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16195
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16196
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16197
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16198
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16199
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-greenfield"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16200
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16201
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16202
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16203
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16204
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16205
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16206
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16207
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-greenhouse_horticulture"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -35806,9 +58111,15 @@ cont {
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -35817,9 +58128,15 @@ cont {
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -35828,9 +58145,15 @@ cont {
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -35839,9 +58162,15 @@ cont {
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -35851,400 +58180,718 @@ cont {
 cont {
   name: "landuse-industrial"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16208
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16209
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16210
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16211
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16212
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16213
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16214
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16215
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-landfill"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -16216
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -16217
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16218
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16219
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16220
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16221
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16222
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-meadow"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16223
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16224
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16225
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16226
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16227
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16228
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16229
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16230
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-military"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0x999999
-      priority: -16231
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0x999999
-      priority: -16232
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0x999999
-      priority: -16233
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0x999999
-      priority: -16234
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0x999999
-      priority: -16235
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0x999999
-      priority: -16236
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0x999999
-      priority: -16237
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0x999999
-      priority: -16238
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-orchard"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36253,9 +58900,15 @@ cont {
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36264,9 +58917,15 @@ cont {
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36275,9 +58934,15 @@ cont {
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36286,9 +58951,15 @@ cont {
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36298,407 +58969,974 @@ cont {
 cont {
   name: "landuse-quarry"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16239
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -16240
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -16241
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16242
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16243
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16244
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16245
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xbbbbbb
-      priority: -16246
+      priority: -16000
     }
   }
 }
 cont {
+  name: "landuse-raceway"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "landuse-railway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16247
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16248
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16249
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16250
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16251
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16252
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16253
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16254
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-recreation_ground"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16255
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16256
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16257
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16258
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16259
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16260
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16261
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16262
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-reservoir"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16104
+      priority: 16105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
 }
 cont {
+  name: "landuse-residential"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
+  name: "landuse-residential-rural"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
+  name: "landuse-residential-urban"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "landuse-retail"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36707,9 +59945,15 @@ cont {
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36718,9 +59962,15 @@ cont {
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36729,9 +59979,15 @@ cont {
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36740,9 +59996,15 @@ cont {
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36752,11 +60014,62 @@ cont {
 cont {
   name: "landuse-salt_pond"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36765,9 +60078,15 @@ cont {
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36776,9 +60095,15 @@ cont {
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36787,9 +60112,15 @@ cont {
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36798,9 +60129,15 @@ cont {
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -36810,406 +60147,685 @@ cont {
 cont {
   name: "landuse-village_green"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16263
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16264
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16265
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16266
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16267
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16268
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16269
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xeeeeee
-      priority: -16270
+      priority: -16000
     }
   }
 }
 cont {
   name: "landuse-vineyard"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16271
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16272
+      priority: -16000
     }
   }
   element {
     scale: 15
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16273
+      priority: -16000
     }
   }
   element {
     scale: 16
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16274
+      priority: -16000
     }
   }
   element {
     scale: 17
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16275
+      priority: -16000
     }
   }
   element {
     scale: 18
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16276
+      priority: -16000
     }
   }
   element {
     scale: 19
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
     }
     area {
       color: 0xcccccc
-      priority: -16277
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-common"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16278
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16279
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16280
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16281
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16282
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xcccccc
-      priority: -16283
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xcccccc
-      priority: -16284
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xcccccc
-      priority: -16285
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-dog_park"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16286
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16287
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16288
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16289
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16290
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xcccccc
-      priority: -16291
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xcccccc
-      priority: -16292
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xcccccc
-      priority: -16293
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-dog_park-tennis"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16294
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16295
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16296
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16297
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16298
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16299
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16300
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16301
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-garden"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16302
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16303
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16304
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16305
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16306
+      priority: -16000
     }
   }
   element {
@@ -37217,20 +60833,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16307
+      priority: -16000
     }
   }
   element {
@@ -37238,20 +60854,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16308
+      priority: -16000
     }
   }
   element {
@@ -37259,58 +60875,94 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16309
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-golf_course"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16310
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16311
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16312
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16313
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16314
+      priority: -16000
     }
   }
   element {
@@ -37321,7 +60973,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16315
+      priority: -16000
     }
   }
   element {
@@ -37332,7 +60984,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16316
+      priority: -16000
     }
   }
   element {
@@ -37343,13 +60995,121 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16317
+      priority: -16000
     }
   }
 }
 cont {
+  name: "leisure-landscape_reserve"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "leisure-nature_reserve"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     symbol {
       name: "bird"
@@ -37388,24 +61148,54 @@ cont {
 cont {
   name: "leisure-park"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xcccccc
-      priority: -16318
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xcccccc
-      priority: -16319
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16320
+      priority: -16000
     }
   }
   element {
@@ -37413,20 +61203,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16321
+      priority: -16000
     }
   }
   element {
@@ -37434,20 +61224,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16322
+      priority: -16000
     }
   }
   element {
@@ -37455,20 +61245,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16323
+      priority: -16000
     }
   }
   element {
@@ -37476,20 +61266,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16324
+      priority: -16000
     }
   }
   element {
@@ -37497,20 +61287,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16325
+      priority: -16000
     }
   }
   element {
@@ -37518,20 +61308,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16326
+      priority: -16000
     }
   }
   element {
@@ -37539,44 +61329,74 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16327
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-park-no-access"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xcccccc
-      priority: -16328
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xcccccc
-      priority: -16329
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16330
+      priority: -16000
     }
   }
   element {
@@ -37584,20 +61404,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16331
+      priority: -16000
     }
   }
   element {
@@ -37605,20 +61425,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16332
+      priority: -16000
     }
   }
   element {
@@ -37626,20 +61446,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16333
+      priority: -16000
     }
   }
   element {
@@ -37647,20 +61467,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16334
+      priority: -16000
     }
   }
   element {
@@ -37668,20 +61488,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16335
+      priority: -16000
     }
   }
   element {
@@ -37689,20 +61509,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16336
+      priority: -16000
     }
   }
   element {
@@ -37710,44 +61530,74 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16337
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-park-permissive"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xcccccc
-      priority: -16338
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xcccccc
-      priority: -16339
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16340
+      priority: -16000
     }
   }
   element {
@@ -37755,20 +61605,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16341
+      priority: -16000
     }
   }
   element {
@@ -37776,20 +61626,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16342
+      priority: -16000
     }
   }
   element {
@@ -37797,20 +61647,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16343
+      priority: -16000
     }
   }
   element {
@@ -37818,20 +61668,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16344
+      priority: -16000
     }
   }
   element {
@@ -37839,20 +61689,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16345
+      priority: -16000
     }
   }
   element {
@@ -37860,20 +61710,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16346
+      priority: -16000
     }
   }
   element {
@@ -37881,44 +61731,74 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16347
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-park-private"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xcccccc
-      priority: -16348
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xcccccc
-      priority: -16349
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16350
+      priority: -16000
     }
   }
   element {
@@ -37926,20 +61806,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16351
+      priority: -16000
     }
   }
   element {
@@ -37947,20 +61827,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16352
+      priority: -16000
     }
   }
   element {
@@ -37968,20 +61848,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16353
+      priority: -16000
     }
   }
   element {
@@ -37989,20 +61869,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16354
+      priority: -16000
     }
   }
   element {
@@ -38010,20 +61890,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16355
+      priority: -16000
     }
   }
   element {
@@ -38031,20 +61911,20 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16356
+      priority: -16000
     }
   }
   element {
@@ -38052,176 +61932,284 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16357
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-pitch"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16358
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16359
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16360
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16361
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16362
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xcccccc
-      priority: -16363
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xcccccc
-      priority: -16364
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xcccccc
-      priority: -16365
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-pitch-tennis"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16366
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16367
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16368
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16369
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16370
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16371
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16372
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16373
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-playground"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16374
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16375
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16376
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16377
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16378
+      priority: -16000
     }
   }
   element {
@@ -38232,7 +62220,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16379
+      priority: -16000
     }
   }
   element {
@@ -38243,7 +62231,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16380
+      priority: -16000
     }
   }
   element {
@@ -38254,45 +62242,81 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16381
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-playground-tennis"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16382
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16383
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16384
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16385
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16386
+      priority: -16000
     }
   }
   element {
@@ -38303,7 +62327,7 @@ cont {
     }
     area {
       color: 0xaaaaaa
-      priority: -16387
+      priority: -16000
     }
   }
   element {
@@ -38314,7 +62338,7 @@ cont {
     }
     area {
       color: 0xaaaaaa
-      priority: -16388
+      priority: -16000
     }
   }
   element {
@@ -38325,65 +62349,344 @@ cont {
     }
     area {
       color: 0xaaaaaa
-      priority: -16389
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-playing_fields-tennis"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16390
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16391
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16392
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16393
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16394
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16395
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16396
+      priority: -16000
     }
   }
 }
 cont {
+  name: "leisure-recreation_ground-no-access"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
+  name: "leisure-recreation_ground-permissive"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
+  name: "leisure-recreation_ground-private"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "leisure-slipway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "slipway"
@@ -38408,283 +62711,505 @@ cont {
 cont {
   name: "leisure-sports_centre"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16397
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16398
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16399
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xeeeeee
-      priority: -16400
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xeeeeee
-      priority: -16401
+      priority: -16000
     }
   }
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xeeeeee
-      priority: -16402
+      priority: -16000
     }
   }
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xeeeeee
-      priority: -16403
+      priority: -16000
     }
   }
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xeeeeee
-      priority: -16404
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-stadium"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16405
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16406
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16407
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xeeeeee
-      priority: -16408
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xeeeeee
-      priority: -16409
+      priority: -16000
     }
   }
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xeeeeee
-      priority: -16410
+      priority: -16000
     }
   }
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xeeeeee
-      priority: -16411
+      priority: -16000
     }
   }
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xeeeeee
-      priority: -16412
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-swimming_pool"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
 }
 cont {
   name: "leisure-track"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16413
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16414
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16415
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xeeeeee
-      priority: -16416
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xeeeeee
-      priority: -16417
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xeeeeee
-      priority: -16418
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xeeeeee
-      priority: -16419
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xeeeeee
-      priority: -16420
+      priority: -16000
     }
   }
 }
 cont {
   name: "leisure-water_park"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 1.0
@@ -38744,6 +63269,60 @@ cont {
 cont {
   name: "lit"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
     scale: 18
     lines {
       width: 0.3
@@ -38763,6 +63342,51 @@ cont {
 cont {
   name: "man_made-breakwater"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 2.0
@@ -38775,7 +63399,7 @@ cont {
     lines {
       width: 4.0
       color: 0x666666
-      priority: 1789
+      priority: 1785
     }
   }
   element {
@@ -38783,7 +63407,7 @@ cont {
     lines {
       width: 6.4
       color: 0x666666
-      priority: 1854
+      priority: 1852
     }
   }
   element {
@@ -38791,7 +63415,7 @@ cont {
     lines {
       width: 6.4
       color: 0x666666
-      priority: 1854
+      priority: 1852
     }
   }
   element {
@@ -38799,13 +63423,64 @@ cont {
     lines {
       width: 6.4
       color: 0x666666
-      priority: 1854
+      priority: 1852
     }
   }
 }
 cont {
   name: "man_made-cairn"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     circle {
       radius: 3.2
@@ -38833,76 +63508,168 @@ cont {
 cont {
   name: "man_made-cutline"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
-      width: 1.0
+      width: 2
       color: 0xeeeeee
+      priority: 0
       cap: BUTTCAP
-      priority: 1186
     }
   }
   element {
     scale: 13
     lines {
-      width: 2.0
+      width: 4
       color: 0xeeeeee
+      priority: 0
       cap: BUTTCAP
-      priority: 1186
     }
   }
   element {
     scale: 14
     lines {
-      width: 4.0
+      width: 4
       color: 0xeeeeee
+      priority: 0
       cap: BUTTCAP
-      priority: 1284
     }
   }
   element {
     scale: 15
     lines {
-      width: 5.0
+      width: 6
       color: 0xeeeeee
-      priority: 1000
+      priority: 0
+      cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 5.0
+      width: 6
       color: 0xeeeeee
-      priority: 1000
+      priority: 0
+      cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 6.0
+      width: 6
       color: 0xeeeeee
-      priority: 1287
+      priority: 0
+      cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 6.0
+      width: 6
       color: 0xeeeeee
-      priority: 1287
+      priority: 0
+      cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 6.0
+      width: 6
       color: 0xeeeeee
-      priority: 1287
+      priority: 0
+      cap: BUTTCAP
     }
   }
 }
 cont {
   name: "man_made-lighthouse"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "lighthouse"
@@ -38927,20 +63694,62 @@ cont {
 cont {
   name: "man_made-pier"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 0.1
       color: 0xcccccc
-      priority: 1482
+      priority: 1473
     }
     area {
       color: 0xdddddd
-      priority: 1483
+      priority: 1474
     }
     lines {
       width: 0.6
       color: 0xdddddd
-      priority: 1484
+      priority: 1476
     }
   }
   element {
@@ -38948,16 +63757,16 @@ cont {
     lines {
       width: 1.6
       color: 0xcccccc
-      priority: 1635
+      priority: 1629
     }
     area {
       color: 0xdddddd
-      priority: 1636
+      priority: 1630
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1638
+      priority: 1632
     }
   }
   element {
@@ -38965,16 +63774,16 @@ cont {
     lines {
       width: 0.4
       color: 0xcccccc
-      priority: 1791
+      priority: 1788
     }
     area {
       color: 0xdddddd
-      priority: 1792
+      priority: 1789
     }
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1794
+      priority: 1791
     }
     lines {
       width: 3.2
@@ -38987,21 +63796,21 @@ cont {
     lines {
       width: 0.4
       color: 0xcccccc
-      priority: 1857
+      priority: 1855
     }
     area {
       color: 0xdddddd
-      priority: 1858
+      priority: 1856
     }
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1863
+      priority: 1860
     }
     lines {
       width: 3.2
       color: 0xcccccc
-      priority: 1860
+      priority: 1857
     }
   }
   element {
@@ -39009,21 +63818,21 @@ cont {
     lines {
       width: 0.4
       color: 0xcccccc
-      priority: 1857
+      priority: 1855
     }
     area {
       color: 0xdddddd
-      priority: 1858
+      priority: 1856
     }
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1863
+      priority: 1860
     }
     lines {
       width: 3.2
       color: 0xcccccc
-      priority: 1860
+      priority: 1857
     }
   }
   element {
@@ -39031,32 +63840,80 @@ cont {
     lines {
       width: 0.4
       color: 0xcccccc
-      priority: 1857
+      priority: 1855
     }
     area {
       color: 0xdddddd
-      priority: 1858
+      priority: 1856
     }
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1863
+      priority: 1860
     }
     lines {
       width: 3.2
       color: 0xcccccc
-      priority: 1860
+      priority: 1857
     }
   }
 }
 cont {
   name: "man_made-pipeline"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1819
+      priority: 1816
     }
     lines {
       width: 0.8
@@ -39070,7 +63927,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1824
+      priority: 1821
     }
   }
   element {
@@ -39078,7 +63935,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1920
+      priority: 1919
     }
     lines {
       width: 0.8
@@ -39092,7 +63949,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1923
+      priority: 1922
     }
   }
   element {
@@ -39100,7 +63957,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1920
+      priority: 1919
     }
     lines {
       width: 0.8
@@ -39114,7 +63971,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1923
+      priority: 1922
     }
   }
   element {
@@ -39122,7 +63979,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1920
+      priority: 1919
     }
     lines {
       width: 0.8
@@ -39136,13 +63993,61 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1923
+      priority: 1922
     }
   }
 }
 cont {
   name: "man_made-pipeline-overground"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.6
@@ -39152,7 +64057,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1819
+      priority: 1816
     }
     lines {
       width: 0.8
@@ -39166,7 +64071,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1824
+      priority: 1821
     }
   }
   element {
@@ -39174,7 +64079,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1920
+      priority: 1919
     }
     lines {
       width: 0.8
@@ -39188,7 +64093,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1923
+      priority: 1922
     }
   }
   element {
@@ -39196,7 +64101,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1920
+      priority: 1919
     }
     lines {
       width: 0.8
@@ -39210,7 +64115,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1923
+      priority: 1922
     }
   }
   element {
@@ -39218,7 +64123,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1920
+      priority: 1919
     }
     lines {
       width: 0.8
@@ -39232,72 +64137,222 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1923
+      priority: 1922
     }
   }
 }
 cont {
+  name: "man_made-survey_point"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "man_made-wastewater_plant"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xdddddd
-      priority: -16421
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xdddddd
-      priority: -16422
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xdddddd
-      priority: -16423
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xdddddd
-      priority: -16424
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xdddddd
-      priority: -16425
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xdddddd
-      priority: -16426
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xdddddd
-      priority: -16427
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xdddddd
-      priority: -16428
+      priority: -16000
     }
   }
 }
 cont {
   name: "man_made-windmill"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "windmill"
@@ -39322,6 +64377,42 @@ cont {
 cont {
   name: "mapswithme-grid"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 4.0
@@ -39429,6 +64520,51 @@ cont {
 cont {
   name: "marking-sport"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.5
@@ -39472,6 +64608,51 @@ cont {
 cont {
   name: "marking-sport-black"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.5
@@ -39515,6 +64696,51 @@ cont {
 cont {
   name: "marking-sport-blue"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.5
@@ -39558,6 +64784,51 @@ cont {
 cont {
   name: "marking-sport-red"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.5
@@ -39601,6 +64872,51 @@ cont {
 cont {
   name: "marking-sport-white"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 0.5
@@ -39644,6 +64960,57 @@ cont {
 cont {
   name: "military-bunker"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "cannon"
@@ -39668,153 +65035,321 @@ cont {
 cont {
   name: "natural-bay"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
 }
 cont {
   name: "natural-beach"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16429
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16430
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16431
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16432
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16433
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16434
+      priority: -16000
     }
   }
 }
 cont {
   name: "natural-cave_entrance"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "cave_entrance"
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -39828,9 +65363,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -39844,9 +65385,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -39860,9 +65407,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -39876,9 +65429,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -39892,9 +65451,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -39903,151 +65468,253 @@ cont {
   }
 }
 cont {
+  name: "natural-cliff"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "natural-coastline"
   element {
     scale: 0
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 1
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 2
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 3
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 4
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 5
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 6
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 7
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 8
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 9
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 10
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 11
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
 }
 cont {
   name: "natural-glacier"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 0.75
@@ -40060,7 +65727,7 @@ cont {
     lines {
       width: 0.8
       color: 0xcccccc
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -40068,7 +65735,7 @@ cont {
     lines {
       width: 1.6
       color: 0xcccccc
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -40076,7 +65743,7 @@ cont {
     lines {
       width: 3.2
       color: 0xcccccc
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -40084,7 +65751,7 @@ cont {
     lines {
       width: 6.4
       color: 0xcccccc
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -40092,7 +65759,7 @@ cont {
     lines {
       width: 6.4
       color: 0xcccccc
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -40100,18 +65767,69 @@ cont {
     lines {
       width: 6.4
       color: 0xcccccc
-      priority: 1021
+      priority: 1022
     }
   }
 }
 cont {
   name: "natural-grass"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40120,9 +65838,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40131,9 +65855,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40142,9 +65872,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40153,9 +65889,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40165,11 +65907,62 @@ cont {
 cont {
   name: "natural-greenfield"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40178,9 +65971,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40189,9 +65988,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40200,9 +66005,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40211,9 +66022,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40223,11 +66040,62 @@ cont {
 cont {
   name: "natural-greenhouse_horticulture"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40236,9 +66104,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40247,9 +66121,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40258,9 +66138,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40269,9 +66155,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40281,292 +66173,526 @@ cont {
 cont {
   name: "natural-heath"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xdddddd
-      priority: -16435
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xdddddd
-      priority: -16436
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xdddddd
-      priority: -16437
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xdddddd
-      priority: -16438
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xdddddd
-      priority: -16439
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xdddddd
-      priority: -16440
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xdddddd
-      priority: -16441
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xdddddd
-      priority: -16442
+      priority: -16000
     }
   }
 }
 cont {
   name: "natural-lake"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 11
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
 }
 cont {
   name: "natural-land"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
     scale: 6
     area {
       color: 0xffffff
-      priority: -16443
+      priority: -16000
     }
   }
   element {
     scale: 7
     area {
       color: 0xffffff
-      priority: -16444
+      priority: -16000
     }
   }
   element {
     scale: 8
     area {
       color: 0xffffff
-      priority: -16445
+      priority: -16000
     }
   }
   element {
     scale: 9
     area {
       color: 0xffffff
-      priority: -16446
+      priority: -16000
     }
   }
   element {
     scale: 10
     area {
       color: 0xffffff
-      priority: -16447
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xffffff
-      priority: -16448
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16449
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16450
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16451
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xeeeeee
-      priority: -16452
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xeeeeee
-      priority: -16453
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xeeeeee
-      priority: -16454
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xeeeeee
-      priority: -16455
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xeeeeee
-      priority: -16456
+      priority: -16000
     }
   }
 }
 cont {
+  name: "natural-marsh"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "natural-meadow"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40575,9 +66701,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40586,9 +66718,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40597,9 +66735,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40608,9 +66752,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40620,11 +66770,62 @@ cont {
 cont {
   name: "natural-orchard"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40633,9 +66834,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40644,9 +66851,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40655,9 +66868,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40666,9 +66885,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40678,6 +66903,42 @@ cont {
 cont {
   name: "natural-peak"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "peak-mini"
@@ -40691,9 +66952,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -40707,9 +66974,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -40723,9 +66996,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -40739,9 +67018,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -40755,9 +67040,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -40771,9 +67062,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -40787,9 +67084,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -40800,108 +67103,207 @@ cont {
 cont {
   name: "natural-pond"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 11
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 12
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 13
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
 }
 cont {
   name: "natural-salt_pond"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40910,9 +67312,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40921,9 +67329,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40932,9 +67346,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40943,9 +67363,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -40955,65 +67381,143 @@ cont {
 cont {
   name: "natural-scrub"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xeeeeee
-      priority: -16457
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xeeeeee
-      priority: -16458
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xeeeeee
-      priority: -16459
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xeeeeee
-      priority: -16460
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xeeeeee
-      priority: -16461
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xeeeeee
-      priority: -16462
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xeeeeee
-      priority: -16463
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xeeeeee
-      priority: -16464
+      priority: -16000
     }
   }
 }
 cont {
   name: "natural-spring"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 4.0
@@ -41021,9 +67525,15 @@ cont {
       priority: 1000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41037,9 +67547,15 @@ cont {
       priority: 1000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41053,9 +67569,15 @@ cont {
       priority: 1000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41069,9 +67591,15 @@ cont {
       priority: 1000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41085,9 +67613,15 @@ cont {
       priority: 1000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41101,9 +67635,15 @@ cont {
       priority: 1000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41113,6 +67653,54 @@ cont {
 cont {
   name: "natural-tree"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       apply_for_type: 1
@@ -41148,11 +67736,62 @@ cont {
 cont {
   name: "natural-vineyard"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41161,9 +67800,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41172,9 +67817,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41183,9 +67834,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41194,9 +67851,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -41206,6 +67869,42 @@ cont {
 cont {
   name: "natural-volcano"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "vulcan"
@@ -41226,9 +67925,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41242,9 +67947,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41258,9 +67969,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41274,9 +67991,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41290,9 +68013,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41306,9 +68035,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41319,536 +68054,926 @@ cont {
 cont {
   name: "natural-water"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 11
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 13
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15104
+      priority: 15105
     }
     area {
       color: 0xbbbbbb
-      priority: -15896
+      priority: -15895
     }
   }
 }
 cont {
   name: "natural-wetland"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16465
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16466
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16467
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16468
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16469
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16470
+      priority: -16000
     }
   }
 }
 cont {
   name: "natural-wetland-bog"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16471
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16472
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16473
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16474
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16475
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16476
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16477
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16478
+      priority: -16000
     }
   }
 }
 cont {
   name: "natural-wood"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xaaaaaa
-      priority: -16479
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xaaaaaa
-      priority: -16480
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16481
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16482
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16483
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16484
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16485
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16486
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16487
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16488
+      priority: -16000
     }
   }
 }
 cont {
   name: "natural-wood-coniferous"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xaaaaaa
-      priority: -16489
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xaaaaaa
-      priority: -16490
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16491
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16492
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16493
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16494
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16495
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16496
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16497
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16498
+      priority: -16000
     }
   }
 }
 cont {
   name: "natural-wood-deciduous"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xaaaaaa
-      priority: -16499
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xaaaaaa
-      priority: -16500
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16501
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16502
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16503
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16504
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16505
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16506
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16507
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16508
+      priority: -16000
     }
   }
 }
 cont {
   name: "natural-wood-mixed"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xaaaaaa
-      priority: -16509
+      priority: -16000
     }
   }
   element {
     scale: 11
     area {
       color: 0xaaaaaa
-      priority: -16510
+      priority: -16000
     }
   }
   element {
     scale: 12
     area {
       color: 0xaaaaaa
-      priority: -16511
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xaaaaaa
-      priority: -16512
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xaaaaaa
-      priority: -16513
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xaaaaaa
-      priority: -16514
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xaaaaaa
-      priority: -16515
+      priority: -16000
     }
   }
   element {
     scale: 17
     area {
       color: 0xaaaaaa
-      priority: -16516
+      priority: -16000
     }
   }
   element {
     scale: 18
     area {
       color: 0xaaaaaa
-      priority: -16517
+      priority: -16000
     }
   }
   element {
     scale: 19
     area {
       color: 0xaaaaaa
-      priority: -16518
+      priority: -16000
     }
   }
 }
 cont {
+  name: "noexit-motor_vehicle"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "office"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41858,9 +68983,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41870,9 +69001,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41883,11 +69020,68 @@ cont {
 cont {
   name: "office-company"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41897,9 +69091,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41909,9 +69109,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41922,11 +69128,68 @@ cont {
 cont {
   name: "office-estate_agent"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41936,9 +69199,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41948,9 +69217,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41961,11 +69236,68 @@ cont {
 cont {
   name: "office-government"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41975,9 +69307,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -41987,9 +69325,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -42000,11 +69344,68 @@ cont {
 cont {
   name: "office-lawyer"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -42014,9 +69415,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -42026,9 +69433,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -42039,11 +69452,68 @@ cont {
 cont {
   name: "office-telecommunication"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -42053,9 +69523,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -42065,9 +69541,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -42078,6 +69560,54 @@ cont {
 cont {
   name: "oneway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 0
@@ -42133,11 +69663,59 @@ cont {
 cont {
   name: "piste:lift-j-bar"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -42173,7 +69751,7 @@ cont {
         dd: 40.0
       }
       cap: BUTTCAP
-      priority: 1602
+      priority: 1596
     }
   }
   element {
@@ -42191,7 +69769,7 @@ cont {
         dd: 40.0
       }
       cap: BUTTCAP
-      priority: 1602
+      priority: 1596
     }
   }
   element {
@@ -42209,7 +69787,7 @@ cont {
         dd: 40.0
       }
       cap: BUTTCAP
-      priority: 1602
+      priority: 1596
     }
   }
   element {
@@ -42227,7 +69805,7 @@ cont {
         dd: 40.0
       }
       cap: BUTTCAP
-      priority: 1602
+      priority: 1596
     }
   }
   element {
@@ -42245,13 +69823,58 @@ cont {
         dd: 40.0
       }
       cap: BUTTCAP
-      priority: 1602
+      priority: 1596
     }
   }
 }
 cont {
   name: "piste:lift-magic_carpet"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 1.6
@@ -42295,11 +69918,59 @@ cont {
 cont {
   name: "piste:lift-platter"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -42414,6 +70085,51 @@ cont {
 cont {
   name: "piste:lift-rope_tow"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     lines {
       width: 1.0
@@ -42423,7 +70139,7 @@ cont {
         dd: 2.0
       }
       cap: BUTTCAP
-      priority: 1605
+      priority: 1598
     }
   }
   element {
@@ -42482,11 +70198,59 @@ cont {
 cont {
   name: "piste:lift-t-bar"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 16000
@@ -42601,6 +70365,45 @@ cont {
 cont {
   name: "piste:type-downhill"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 2.5
@@ -42660,6 +70463,45 @@ cont {
 cont {
   name: "piste:type-downhill-advanced"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 2.5
@@ -42719,6 +70561,45 @@ cont {
 cont {
   name: "piste:type-downhill-easy"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 2.5
@@ -42778,6 +70659,45 @@ cont {
 cont {
   name: "piste:type-downhill-expert"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 2.5
@@ -42837,6 +70757,45 @@ cont {
 cont {
   name: "piste:type-downhill-freeride"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 2.5
@@ -42896,6 +70855,45 @@ cont {
 cont {
   name: "piste:type-downhill-intermediate"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 2.5
@@ -42955,6 +70953,45 @@ cont {
 cont {
   name: "piste:type-downhill-novice"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 2.5
@@ -43014,6 +71051,45 @@ cont {
 cont {
   name: "piste:type-nordic"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 0.5
@@ -43108,6 +71184,45 @@ cont {
 cont {
   name: "piste:type-sled"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 1.25
@@ -43136,7 +71251,7 @@ cont {
     lines {
       width: 10.0
       color: 0xdddddd
-      priority: 1775
+      priority: 1771
     }
   }
   element {
@@ -43167,17 +71282,32 @@ cont {
 cont {
   name: "place-city"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
     scale: 5
     caption {
       secondary {
         height: 10
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43188,13 +71318,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43205,13 +71335,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 14
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43222,13 +71352,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 14
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43239,13 +71369,13 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 17
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43256,13 +71386,13 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43273,13 +71403,13 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43290,13 +71420,13 @@ cont {
     caption {
       secondary {
         height: 16
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 20
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43307,13 +71437,13 @@ cont {
     caption {
       secondary {
         height: 16
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 20
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43324,13 +71454,13 @@ cont {
     caption {
       secondary {
         height: 16
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 22
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43341,33 +71471,57 @@ cont {
     caption {
       secondary {
         height: 16
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 22
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-city-capital"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
     scale: 4
     caption {
       secondary {
         height: 10
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 11
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43378,13 +71532,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 11
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43395,13 +71549,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43412,13 +71566,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 14
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43429,13 +71583,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 16
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43446,13 +71600,13 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 17
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43463,13 +71617,13 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43480,13 +71634,13 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43497,13 +71651,13 @@ cont {
     caption {
       secondary {
         height: 16
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 22
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43514,13 +71668,13 @@ cont {
     caption {
       secondary {
         height: 18
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 20
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43531,13 +71685,13 @@ cont {
     caption {
       secondary {
         height: 16
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 22
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43548,27 +71702,45 @@ cont {
     caption {
       secondary {
         height: 16
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 22
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-continent"
   element {
     scale: 0
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43577,9 +71749,15 @@ cont {
   element {
     scale: 1
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43588,29 +71766,95 @@ cont {
   element {
     scale: 2
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 18
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-country"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
     scale: 3
     caption {
       secondary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43621,13 +71865,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 14
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43638,13 +71882,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43655,13 +71899,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x999999
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43677,7 +71921,7 @@ cont {
       }
       primary {
         height: 26
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43693,7 +71937,7 @@ cont {
       }
       primary {
         height: 28
-        color: 0x999999
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43709,21 +71953,84 @@ cont {
       }
       primary {
         height: 28
-        color: 0x999999
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-county"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
     scale: 9
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x999999
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43732,9 +72039,15 @@ cont {
   element {
     scale: 10
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0x999999
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43743,9 +72056,15 @@ cont {
   element {
     scale: 11
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x999999
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43754,23 +72073,98 @@ cont {
   element {
     scale: 12
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x999999
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-farm"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43779,9 +72173,15 @@ cont {
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43790,9 +72190,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43801,9 +72207,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43812,9 +72224,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43823,9 +72241,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43835,11 +72259,53 @@ cont {
 cont {
   name: "place-hamlet"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43848,9 +72314,15 @@ cont {
   element {
     scale: 13
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43859,102 +72331,174 @@ cont {
   element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16519
+      priority: -16000
     }
   }
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16520
+      priority: -16000
     }
   }
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16521
+      priority: -16000
     }
   }
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16522
+      priority: -16000
     }
   }
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16523
+      priority: -16000
     }
   }
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16524
+      priority: -16000
     }
   }
 }
 cont {
   name: "place-island"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43963,9 +72507,15 @@ cont {
   element {
     scale: 11
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43974,9 +72524,15 @@ cont {
   element {
     scale: 12
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43985,9 +72541,15 @@ cont {
   element {
     scale: 13
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -43996,9 +72558,15 @@ cont {
   element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44007,9 +72575,15 @@ cont {
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44018,9 +72592,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44029,9 +72609,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44040,9 +72626,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44051,9 +72643,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44063,11 +72661,56 @@ cont {
 cont {
   name: "place-islet"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44076,9 +72719,15 @@ cont {
   element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44087,9 +72736,15 @@ cont {
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44098,9 +72753,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44109,9 +72770,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44120,9 +72787,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44131,9 +72804,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x111111
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44143,6 +72822,48 @@ cont {
 cont {
   name: "place-locality"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     caption {
       secondary {
@@ -44152,7 +72873,7 @@ cont {
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44168,7 +72889,7 @@ cont {
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44184,7 +72905,7 @@ cont {
       }
       primary {
         height: 16
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44193,9 +72914,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44204,9 +72931,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44215,9 +72948,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 16
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44227,11 +72966,20 @@ cont {
 cont {
   name: "place-ocean"
   element {
+    scale: 0
+  }
+  element {
     scale: 1
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 8
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44240,9 +72988,15 @@ cont {
   element {
     scale: 2
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 9
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44251,9 +73005,15 @@ cont {
   element {
     scale: 3
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 9
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44262,9 +73022,15 @@ cont {
   element {
     scale: 4
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 9
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44273,9 +73039,15 @@ cont {
   element {
     scale: 5
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44284,9 +73056,15 @@ cont {
   element {
     scale: 6
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44295,9 +73073,15 @@ cont {
   element {
     scale: 7
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44306,9 +73090,15 @@ cont {
   element {
     scale: 8
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44317,9 +73107,15 @@ cont {
   element {
     scale: 9
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44328,9 +73124,15 @@ cont {
   element {
     scale: 10
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44339,9 +73141,15 @@ cont {
   element {
     scale: 11
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44350,9 +73158,15 @@ cont {
   element {
     scale: 12
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44361,9 +73175,15 @@ cont {
   element {
     scale: 13
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44372,9 +73192,15 @@ cont {
   element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44383,9 +73209,15 @@ cont {
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44394,9 +73226,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44405,9 +73243,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44416,9 +73260,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44427,9 +73277,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15002
@@ -44439,11 +73295,41 @@ cont {
 cont {
   name: "place-region"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
     scale: 8
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44452,23 +73338,74 @@ cont {
   element {
     scale: 9
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-sea"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
     scale: 3
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 8
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44477,9 +73414,15 @@ cont {
   element {
     scale: 4
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 8
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44488,9 +73431,15 @@ cont {
   element {
     scale: 5
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 8
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44499,9 +73448,15 @@ cont {
   element {
     scale: 6
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 8
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44510,9 +73465,15 @@ cont {
   element {
     scale: 7
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44521,9 +73482,15 @@ cont {
   element {
     scale: 8
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 10
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44532,9 +73499,15 @@ cont {
   element {
     scale: 9
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44543,9 +73516,15 @@ cont {
   element {
     scale: 10
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44554,9 +73533,15 @@ cont {
   element {
     scale: 11
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44565,9 +73550,15 @@ cont {
   element {
     scale: 12
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44576,9 +73567,15 @@ cont {
   element {
     scale: 13
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44587,9 +73584,15 @@ cont {
   element {
     scale: 14
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44598,9 +73601,15 @@ cont {
   element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44609,9 +73618,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44620,9 +73635,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44631,9 +73652,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44642,9 +73669,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44654,11 +73687,29 @@ cont {
 cont {
   name: "place-state"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
     scale: 4
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44667,9 +73718,15 @@ cont {
   element {
     scale: 5
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44678,9 +73735,15 @@ cont {
   element {
     scale: 6
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 13
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44689,9 +73752,15 @@ cont {
   element {
     scale: 7
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44700,9 +73769,15 @@ cont {
   element {
     scale: 8
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44711,23 +73786,77 @@ cont {
   element {
     scale: 9
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-state-USA"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
     scale: 4
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44736,9 +73865,15 @@ cont {
   element {
     scale: 5
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44747,9 +73882,15 @@ cont {
   element {
     scale: 6
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 13
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44758,9 +73899,15 @@ cont {
   element {
     scale: 7
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44769,9 +73916,15 @@ cont {
   element {
     scale: 8
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44780,18 +73933,90 @@ cont {
   element {
     scale: 9
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 14
-        color: 0xaaaaaa
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-suburb"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     caption {
       secondary {
@@ -44801,10 +74026,10 @@ cont {
       }
       primary {
         height: 12
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
@@ -44817,10 +74042,10 @@ cont {
       }
       primary {
         height: 14
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
@@ -44833,10 +74058,10 @@ cont {
       }
       primary {
         height: 18
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
@@ -44849,10 +74074,10 @@ cont {
       }
       primary {
         height: 18
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
@@ -44865,10 +74090,10 @@ cont {
       }
       primary {
         height: 18
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
@@ -44881,10 +74106,10 @@ cont {
       }
       primary {
         height: 20
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
@@ -44897,10 +74122,10 @@ cont {
       }
       primary {
         height: 20
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
@@ -44913,21 +74138,51 @@ cont {
       }
       primary {
         height: 20
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 15032
+      priority: 15033
     }
   }
 }
 cont {
   name: "place-town"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
     scale: 8
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44938,13 +74193,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 14
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44955,13 +74210,13 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 16
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44972,13 +74227,13 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 16
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -44989,13 +74244,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -45006,13 +74261,13 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 20
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -45023,41 +74278,95 @@ cont {
     caption {
       secondary {
         height: 14
-        color: 0x777777
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 22
-        color: 0x444444
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
   }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
 }
 cont {
   name: "place-village"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
     scale: 11
     area {
       color: 0xcccccc
-      priority: -16525
+      priority: -16000
     }
   }
   element {
     scale: 12
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16526
+      priority: -16000
     }
   }
   element {
@@ -45065,20 +74374,20 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16527
+      priority: -16000
     }
   }
   element {
@@ -45086,20 +74395,20 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 12
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16528
+      priority: -16000
     }
   }
   element {
@@ -45107,20 +74416,20 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 16
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16529
+      priority: -16000
     }
   }
   element {
@@ -45128,20 +74437,20 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 16
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16530
+      priority: -16000
     }
   }
   element {
@@ -45149,20 +74458,20 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16531
+      priority: -16000
     }
   }
   element {
@@ -45170,20 +74479,20 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16532
+      priority: -16000
     }
   }
   element {
@@ -45191,26 +74500,68 @@ cont {
     caption {
       secondary {
         height: 12
-        color: 0x888888
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 20
       }
       primary {
         height: 18
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
     }
     area {
       color: 0xcccccc
-      priority: -16533
+      priority: -16000
     }
   }
 }
 cont {
   name: "power-generator"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "power_generic"
@@ -45280,6 +74631,48 @@ cont {
 cont {
   name: "power-generator-hydro"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "power_generic"
@@ -45349,6 +74742,48 @@ cont {
 cont {
   name: "power-generator-photovoltaic"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "power_generic"
@@ -45418,6 +74853,48 @@ cont {
 cont {
   name: "power-generator-wind"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "power_generic"
@@ -45487,11 +74964,59 @@ cont {
 cont {
   name: "power-line"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1797
+      priority: 1793
     }
     lines {
       width: 0.8
@@ -45501,7 +75026,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1799
     }
   }
   element {
@@ -45509,7 +75034,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1797
+      priority: 1793
     }
     lines {
       width: 0.8
@@ -45519,7 +75044,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1799
     }
   }
   element {
@@ -45527,7 +75052,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1797
+      priority: 1793
     }
     lines {
       width: 0.8
@@ -45537,7 +75062,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1799
     }
   }
   element {
@@ -45545,7 +75070,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1797
+      priority: 1793
     }
     lines {
       width: 0.8
@@ -45555,13 +75080,61 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1799
     }
   }
 }
 cont {
   name: "power-line-underground"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 0.8
@@ -45575,7 +75148,7 @@ cont {
         dd: 8.8
       }
       cap: BUTTCAP
-      priority: 1800
+      priority: 1796
     }
     lines {
       width: 0.8
@@ -45585,7 +75158,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1799
     }
   }
   element {
@@ -45602,7 +75175,7 @@ cont {
         dd: 8.8
       }
       cap: BUTTCAP
-      priority: 1800
+      priority: 1796
     }
     lines {
       width: 0.8
@@ -45612,7 +75185,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1799
     }
   }
   element {
@@ -45629,7 +75202,7 @@ cont {
         dd: 8.8
       }
       cap: BUTTCAP
-      priority: 1800
+      priority: 1796
     }
     lines {
       width: 0.8
@@ -45639,7 +75212,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1799
     }
   }
   element {
@@ -45656,7 +75229,7 @@ cont {
         dd: 8.8
       }
       cap: BUTTCAP
-      priority: 1800
+      priority: 1796
     }
     lines {
       width: 0.8
@@ -45666,18 +75239,66 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1799
     }
   }
 }
 cont {
   name: "power-minor_line"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1805
+      priority: 1802
     }
     lines {
       width: 0.8
@@ -45687,7 +75308,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1810
+      priority: 1807
     }
     lines {
       width: 0.8
@@ -45701,7 +75322,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1808
+      priority: 1805
     }
   }
   element {
@@ -45709,7 +75330,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1865
+      priority: 1863
     }
     lines {
       width: 0.8
@@ -45719,7 +75340,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1868
+      priority: 1866
     }
     lines {
       width: 0.8
@@ -45741,7 +75362,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1865
+      priority: 1863
     }
     lines {
       width: 0.8
@@ -45751,7 +75372,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1868
+      priority: 1866
     }
     lines {
       width: 0.8
@@ -45773,7 +75394,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80ffffff
-      priority: 1865
+      priority: 1863
     }
     lines {
       width: 0.8
@@ -45783,7 +75404,7 @@ cont {
         dd: 4.0
       }
       cap: BUTTCAP
-      priority: 1868
+      priority: 1866
     }
     lines {
       width: 0.8
@@ -45804,6 +75425,54 @@ cont {
 cont {
   name: "power-pole"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "power-pole"
@@ -45835,6 +75504,48 @@ cont {
 cont {
   name: "power-station"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     area {
       color: 0xbbbbbb
@@ -45880,6 +75591,48 @@ cont {
 cont {
   name: "power-sub_station"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     area {
       color: 0xbbbbbb
@@ -45925,6 +75678,54 @@ cont {
 cont {
   name: "power-tower"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "power-tower"
@@ -45956,11 +75757,47 @@ cont {
 cont {
   name: "railway-abandoned"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.25
       color: 0xb3aaaaaa
-      priority: 1232
+      priority: 1228
     }
   }
   element {
@@ -45968,7 +75805,7 @@ cont {
     lines {
       width: 0.55
       color: 0xb3aaaaaa
-      priority: 1252
+      priority: 1247
     }
   }
   element {
@@ -45976,7 +75813,7 @@ cont {
     lines {
       width: 1.6
       color: 0x99aaaaaa
-      priority: 1205
+      priority: 1200
     }
     lines {
       width: 1.0
@@ -45986,12 +75823,12 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
     lines {
       width: 1.0
       color: 0x99ffffff
-      priority: 1298
+      priority: 1286
     }
   }
   element {
@@ -45999,7 +75836,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1304
+      priority: 1292
     }
     lines {
       width: 2.0
@@ -46009,12 +75846,12 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1408
+      priority: 1398
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1378
+      priority: 1367
     }
   }
   element {
@@ -46022,12 +75859,12 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1531
+      priority: 1523
     }
     lines {
       width: 2.4
       color: 0x99ffffff
-      priority: 1630
+      priority: 1623
     }
   }
   element {
@@ -46035,7 +75872,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46045,12 +75882,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
     }
   }
   element {
@@ -46058,7 +75895,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46068,12 +75905,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
     }
   }
   element {
@@ -46081,7 +75918,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46091,23 +75928,59 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
     }
   }
 }
 cont {
   name: "railway-abandoned-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.25
       color: 0xb3aaaaaa
-      priority: 1232
+      priority: 1228
     }
   }
   element {
@@ -46115,7 +75988,7 @@ cont {
     lines {
       width: 0.55
       color: 0xb3aaaaaa
-      priority: 1252
+      priority: 1247
     }
   }
   element {
@@ -46123,7 +75996,7 @@ cont {
     lines {
       width: 1.6
       color: 0x99aaaaaa
-      priority: 1205
+      priority: 1200
     }
     lines {
       width: 1.0
@@ -46133,12 +76006,12 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
     lines {
       width: 1.0
       color: 0x99ffffff
-      priority: 1298
+      priority: 1286
     }
   }
   element {
@@ -46146,13 +76019,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1304
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1292
     }
     lines {
       width: 2.0
@@ -46162,17 +76029,23 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1408
+      priority: 1398
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1378
+      priority: 1367
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -46181,7 +76054,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1531
+      priority: 1523
     }
     lines {
       width: 6.4
@@ -46190,29 +76063,23 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
-      color: 0x99ffffff
-      priority: 1630
-    }
-    lines {
       width: 8.4
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
+    lines {
+      width: 2.4
+      color: 0x99ffffff
+      priority: 1623
+    }
   }
   element {
     scale: 17
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46222,17 +76089,23 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -46241,13 +76114,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46257,17 +76124,23 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -46276,13 +76149,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46292,17 +76159,23 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -46310,11 +76183,47 @@ cont {
 cont {
   name: "railway-abandoned-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.25
       color: 0xb3aaaaaa
-      priority: 1232
+      priority: 1228
     }
   }
   element {
@@ -46322,7 +76231,7 @@ cont {
     lines {
       width: 0.55
       color: 0xb3aaaaaa
-      priority: 1252
+      priority: 1247
     }
   }
   element {
@@ -46330,7 +76239,7 @@ cont {
     lines {
       width: 1.6
       color: 0x99aaaaaa
-      priority: 1205
+      priority: 1200
     }
     lines {
       width: 1.0
@@ -46340,26 +76249,20 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1325
     }
     lines {
       width: 1.0
       color: 0x99ffffff
-      priority: 1298
+      priority: 1286
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1304
+      priority: 1292
     }
     lines {
       width: 2.0
@@ -46369,30 +76272,36 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1408
+      priority: 1398
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1378
+      priority: 1367
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
   element {
     scale: 16
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1531
+      priority: 1523
     }
     lines {
       width: 6.4
@@ -46401,33 +76310,27 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 2.4
-      color: 0x99ffffff
-      priority: 1630
-    }
-    lines {
       width: 8.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 2.4
+      color: 0x99ffffff
+      priority: 1623
+    }
   }
   element {
     scale: 17
     lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46437,36 +76340,36 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46476,36 +76379,36 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.2
       color: 0x99aaaaaa
-      priority: 1564
+      priority: 1557
     }
     lines {
       width: 2.0
@@ -46515,28 +76418,82 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1731
+      priority: 1727
     }
     lines {
       width: 2.0
       color: 0x99ffffff
-      priority: 1690
+      priority: 1685
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-crossing"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "railway-crossing-small"
@@ -46568,11 +76525,47 @@ cont {
 cont {
   name: "railway-disused"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.5
       color: 0x80777777
-      priority: 1230
+      priority: 1225
     }
   }
   element {
@@ -46580,7 +76573,7 @@ cont {
     lines {
       width: 0.85
       color: 0x80777777
-      priority: 1249
+      priority: 1245
     }
   }
   element {
@@ -46588,7 +76581,7 @@ cont {
     lines {
       width: 1.6
       color: 0x4d777777
-      priority: 1202
+      priority: 1197
     }
     lines {
       width: 1.0
@@ -46598,12 +76591,12 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1334
+      priority: 1323
     }
     lines {
       width: 1.0
       color: 0x4deeeeee
-      priority: 1295
+      priority: 1284
     }
   }
   element {
@@ -46611,7 +76604,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4d777777
-      priority: 1301
+      priority: 1289
     }
     lines {
       width: 2.0
@@ -46621,12 +76614,12 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1405
+      priority: 1395
     }
     lines {
       width: 2.0
       color: 0x4deeeeee
-      priority: 1375
+      priority: 1364
     }
   }
   element {
@@ -46634,12 +76627,12 @@ cont {
     lines {
       width: 3.2
       color: 0x4d777777
-      priority: 1526
+      priority: 1518
     }
     lines {
       width: 2.4
       color: 0x4deeeeee
-      priority: 1624
+      priority: 1618
     }
   }
   element {
@@ -46647,7 +76640,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4d777777
-      priority: 1561
+      priority: 1554
     }
     lines {
       width: 2.0
@@ -46657,12 +76650,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1721
     }
     lines {
       width: 2.0
       color: 0x4deeeeee
-      priority: 1684
+      priority: 1679
     }
   }
   element {
@@ -46670,7 +76663,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4d777777
-      priority: 1561
+      priority: 1554
     }
     lines {
       width: 2.0
@@ -46680,12 +76673,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1721
     }
     lines {
       width: 2.0
       color: 0x4deeeeee
-      priority: 1684
+      priority: 1679
     }
   }
   element {
@@ -46693,7 +76686,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4d777777
-      priority: 1561
+      priority: 1554
     }
     lines {
       width: 2.0
@@ -46703,23 +76696,59 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1721
     }
     lines {
       width: 2.0
       color: 0x4deeeeee
-      priority: 1684
+      priority: 1679
     }
   }
 }
 cont {
   name: "railway-funicular"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1246
+      priority: 1242
     }
   }
   element {
@@ -46727,7 +76756,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1265
+      priority: 1261
     }
   }
   element {
@@ -46735,12 +76764,12 @@ cont {
     lines {
       width: 2.4
       color: 0x222222
-      priority: 1216
+      priority: 1211
     }
     lines {
       width: 0.4
       color: 0x222222
-      priority: 1350
+      priority: 1339
     }
     lines {
       width: 1.7
@@ -46750,7 +76779,7 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1317
+      priority: 1306
     }
   }
   element {
@@ -46758,12 +76787,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1320
+      priority: 1309
     }
     lines {
       width: 0.5
       color: 0x222222
-      priority: 1421
+      priority: 1412
     }
     lines {
       width: 2.0
@@ -46773,7 +76802,7 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1391
+      priority: 1381
     }
   }
   element {
@@ -46781,12 +76810,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1539
+      priority: 1532
     }
     lines {
       width: 0.6
       color: 0x222222
-      priority: 1671
+      priority: 1665
     }
     lines {
       width: 2.0
@@ -46796,7 +76825,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1643
+      priority: 1637
     }
   }
   element {
@@ -46804,12 +76833,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -46819,7 +76848,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
     }
   }
   element {
@@ -46827,12 +76856,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -46842,7 +76871,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
     }
   }
   element {
@@ -46850,12 +76879,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -46865,18 +76894,54 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
     }
   }
 }
 cont {
   name: "railway-funicular-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1246
+      priority: 1242
     }
   }
   element {
@@ -46884,7 +76949,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1265
+      priority: 1261
     }
   }
   element {
@@ -46892,12 +76957,12 @@ cont {
     lines {
       width: 2.4
       color: 0x222222
-      priority: 1216
+      priority: 1211
     }
     lines {
       width: 0.4
       color: 0x222222
-      priority: 1350
+      priority: 1339
     }
     lines {
       width: 1.7
@@ -46907,7 +76972,7 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1317
+      priority: 1306
     }
   }
   element {
@@ -46915,18 +76980,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1320
-    }
-    lines {
-      width: 4.5
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1309
     }
     lines {
       width: 0.5
       color: 0x222222
-      priority: 1421
+      priority: 1412
     }
     lines {
       width: 2.0
@@ -46936,12 +76995,18 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1391
+      priority: 1381
+    }
+    lines {
+      width: 4.5
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 6.5
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -46950,18 +77015,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1539
-    }
-    lines {
-      width: 4.6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1532
     }
     lines {
       width: 0.6
       color: 0x222222
-      priority: 1671
+      priority: 1665
     }
     lines {
       width: 2.0
@@ -46971,12 +77030,18 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1643
+      priority: 1637
+    }
+    lines {
+      width: 4.6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 6.6
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -46985,18 +77050,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
-    }
-    lines {
-      width: 4.64
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -47006,12 +77065,18 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
+    }
+    lines {
+      width: 4.64
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 6.64
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -47020,18 +77085,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
-    }
-    lines {
-      width: 4.64
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -47041,12 +77100,18 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
+    }
+    lines {
+      width: 4.64
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 6.64
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -47055,18 +77120,12 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
-    }
-    lines {
-      width: 4.64
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -47076,12 +77135,18 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
+    }
+    lines {
+      width: 4.64
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 6.64
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -47089,11 +77154,47 @@ cont {
 cont {
   name: "railway-funicular-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1246
+      priority: 1242
     }
   }
   element {
@@ -47101,7 +77202,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1265
+      priority: 1261
     }
   }
   element {
@@ -47109,12 +77210,12 @@ cont {
     lines {
       width: 2.4
       color: 0x222222
-      priority: 1216
+      priority: 1211
     }
     lines {
       width: 0.4
       color: 0x222222
-      priority: 1350
+      priority: 1339
     }
     lines {
       width: 1.7
@@ -47124,26 +77225,20 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1317
+      priority: 1306
     }
   }
   element {
     scale: 15
     lines {
-      width: 4.5
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x222222
-      priority: 1320
+      priority: 1309
     }
     lines {
       width: 0.5
       color: 0x222222
-      priority: 1421
+      priority: 1412
     }
     lines {
       width: 2.0
@@ -47153,36 +77248,36 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1391
+      priority: 1381
     }
     lines {
       width: 6.5
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
-      width: 4.6
+      width: 4.5
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1539
+      priority: 1532
     }
     lines {
       width: 0.6
       color: 0x222222
-      priority: 1671
+      priority: 1665
     }
     lines {
       width: 2.0
@@ -47192,36 +77287,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1643
+      priority: 1637
     }
     lines {
       width: 6.6
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
-      width: 4.64
+      width: 4.6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -47231,36 +77326,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
     }
     lines {
       width: 6.64
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 4.64
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -47270,36 +77365,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
     }
     lines {
       width: 6.64
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 4.64
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1580
+      priority: 1573
     }
     lines {
       width: 0.64
       color: 0x222222
-      priority: 1756
+      priority: 1752
     }
     lines {
       width: 2.0
@@ -47309,23 +77404,71 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1706
+      priority: 1701
     }
     lines {
       width: 6.64
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 4.64
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-halt"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "railway-station-mini"
@@ -47339,9 +77482,15 @@ cont {
       priority: 16169
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -47355,9 +77504,15 @@ cont {
       priority: 16169
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -47371,9 +77526,15 @@ cont {
       priority: 16000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -47387,9 +77548,15 @@ cont {
       priority: 16000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -47403,9 +77570,15 @@ cont {
       priority: 16000
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -47414,8 +77587,182 @@ cont {
   }
 }
 cont {
+  name: "railway-incline-bridge"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
+  name: "railway-incline-tunnel"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "railway-level_crossing"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "railway-crossing"
@@ -47447,11 +77794,47 @@ cont {
 cont {
   name: "railway-light_rail"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1704
+      priority: 1699
     }
   }
   element {
@@ -47459,7 +77842,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1753
+      priority: 1749
     }
   }
   element {
@@ -47467,7 +77850,7 @@ cont {
     lines {
       width: 2.4
       color: 0x222222
-      priority: 1704
+      priority: 1699
     }
     lines {
       width: 1.7
@@ -47477,12 +77860,12 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 1.7
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
     }
   }
   element {
@@ -47490,7 +77873,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1704
+      priority: 1699
     }
     lines {
       width: 2.0
@@ -47500,12 +77883,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
     }
   }
   element {
@@ -47513,7 +77896,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1704
+      priority: 1699
     }
     lines {
       width: 2.0
@@ -47523,12 +77906,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
     }
   }
   element {
@@ -47536,7 +77919,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -47546,12 +77929,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
     }
   }
   element {
@@ -47559,7 +77942,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -47569,12 +77952,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
     }
   }
   element {
@@ -47582,7 +77965,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -47592,23 +77975,59 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
     }
   }
 }
 cont {
   name: "railway-light_rail-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1704
+      priority: 1699
     }
   }
   element {
@@ -47616,7 +78035,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1753
+      priority: 1749
     }
   }
   element {
@@ -47624,7 +78043,7 @@ cont {
     lines {
       width: 2.4
       color: 0x222222
-      priority: 1704
+      priority: 1699
     }
     lines {
       width: 1.7
@@ -47634,12 +78053,12 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 1.7
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
     }
   }
   element {
@@ -47647,13 +78066,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1704
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1699
     }
     lines {
       width: 2.0
@@ -47663,17 +78076,23 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -47682,13 +78101,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1704
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1699
     }
     lines {
       width: 2.0
@@ -47698,17 +78111,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -47717,13 +78136,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -47733,17 +78146,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -47752,13 +78171,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -47768,17 +78181,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -47787,13 +78206,7 @@ cont {
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -47803,17 +78216,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -47821,11 +78240,47 @@ cont {
 cont {
   name: "railway-light_rail-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1704
+      priority: 1699
     }
   }
   element {
@@ -47833,7 +78288,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1753
+      priority: 1749
     }
   }
   element {
@@ -47841,7 +78296,7 @@ cont {
     lines {
       width: 2.4
       color: 0x222222
-      priority: 1704
+      priority: 1699
     }
     lines {
       width: 1.7
@@ -47851,26 +78306,20 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 1.7
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x222222
-      priority: 1704
+      priority: 1699
     }
     lines {
       width: 2.0
@@ -47880,36 +78329,36 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1704
+      priority: 1699
     }
     lines {
       width: 2.0
@@ -47919,36 +78368,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1753
+      priority: 1749
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1726
+      priority: 1721
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -47958,36 +78407,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -47997,36 +78446,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.2
       color: 0x222222
-      priority: 1578
+      priority: 1571
     }
     lines {
       width: 2.0
@@ -48036,33 +78485,75 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1745
+      priority: 1740
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1701
+      priority: 1696
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-monorail"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1249
+      priority: 1245
     }
   }
   element {
@@ -48083,17 +78574,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1556
+      priority: 1548
     }
     lines {
       width: 2.0
       color: 0x333333
-      priority: 1550
+      priority: 1543
     }
     lines {
       width: 1.7
       color: 0x999999
-      priority: 1553
+      priority: 1545
     }
   }
   element {
@@ -48101,7 +78592,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48111,12 +78602,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
   }
   element {
@@ -48124,7 +78615,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48134,12 +78625,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
   }
   element {
@@ -48147,7 +78638,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48157,12 +78648,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
   }
   element {
@@ -48170,7 +78661,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48180,12 +78671,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
   }
   element {
@@ -48193,7 +78684,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48203,23 +78694,59 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
   }
 }
 cont {
   name: "railway-monorail-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1249
+      priority: 1245
     }
   }
   element {
@@ -48240,17 +78767,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1556
+      priority: 1548
     }
     lines {
       width: 2.0
       color: 0x333333
-      priority: 1550
+      priority: 1543
     }
     lines {
       width: 1.7
       color: 0x999999
-      priority: 1553
+      priority: 1545
     }
   }
   element {
@@ -48258,13 +78785,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48274,17 +78795,23 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -48293,13 +78820,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48309,17 +78830,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -48328,13 +78855,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48344,17 +78865,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -48363,13 +78890,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48379,17 +78900,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -48398,13 +78925,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48414,17 +78935,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -48432,11 +78959,47 @@ cont {
 cont {
   name: "railway-monorail-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1249
+      priority: 1245
     }
   }
   element {
@@ -48457,31 +79020,25 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1556
+      priority: 1548
     }
     lines {
       width: 2.0
       color: 0x333333
-      priority: 1550
+      priority: 1543
     }
     lines {
       width: 1.7
       color: 0x999999
-      priority: 1553
+      priority: 1545
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48491,36 +79048,36 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48530,36 +79087,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48569,36 +79126,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48608,36 +79165,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -48647,33 +79204,75 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0x999999
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-narrow_gauge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1238
+      priority: 1233
     }
   }
   element {
@@ -48681,7 +79280,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1260
+      priority: 1256
     }
   }
   element {
@@ -48689,7 +79288,7 @@ cont {
     lines {
       width: 2.4
       color: 0x555555
-      priority: 1210
+      priority: 1206
     }
     lines {
       width: 1.7
@@ -48699,12 +79298,12 @@ cont {
         dd: 5.5
       }
       cap: BUTTCAP
-      priority: 1342
+      priority: 1331
     }
     lines {
       width: 1.7
       color: 0xdddddd
-      priority: 1306
+      priority: 1295
     }
   }
   element {
@@ -48712,7 +79311,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1312
+      priority: 1300
     }
     lines {
       width: 2.0
@@ -48722,12 +79321,12 @@ cont {
         dd: 11.0
       }
       cap: BUTTCAP
-      priority: 1413
+      priority: 1403
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1383
+      priority: 1373
     }
   }
   element {
@@ -48735,7 +79334,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1536
+      priority: 1529
     }
     lines {
       width: 2.0
@@ -48745,12 +79344,12 @@ cont {
         dd: 14.0
       }
       cap: BUTTCAP
-      priority: 1665
+      priority: 1660
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1638
+      priority: 1632
     }
   }
   element {
@@ -48758,7 +79357,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -48768,12 +79367,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
     }
   }
   element {
@@ -48781,7 +79380,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -48791,12 +79390,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
     }
   }
   element {
@@ -48804,7 +79403,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -48814,23 +79413,59 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
     }
   }
 }
 cont {
   name: "railway-narrow_gauge-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1238
+      priority: 1233
     }
   }
   element {
@@ -48838,7 +79473,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1260
+      priority: 1256
     }
   }
   element {
@@ -48846,7 +79481,7 @@ cont {
     lines {
       width: 2.4
       color: 0x555555
-      priority: 1210
+      priority: 1206
     }
     lines {
       width: 1.7
@@ -48856,12 +79491,12 @@ cont {
         dd: 5.5
       }
       cap: BUTTCAP
-      priority: 1342
+      priority: 1331
     }
     lines {
       width: 1.7
       color: 0xdddddd
-      priority: 1306
+      priority: 1295
     }
   }
   element {
@@ -48869,13 +79504,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1312
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1300
     }
     lines {
       width: 2.0
@@ -48885,17 +79514,23 @@ cont {
         dd: 11.0
       }
       cap: BUTTCAP
-      priority: 1413
+      priority: 1403
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1383
+      priority: 1373
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -48904,13 +79539,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1536
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1529
     }
     lines {
       width: 2.0
@@ -48920,17 +79549,23 @@ cont {
         dd: 14.0
       }
       cap: BUTTCAP
-      priority: 1665
+      priority: 1660
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1638
+      priority: 1632
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -48939,13 +79574,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -48955,17 +79584,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -48974,13 +79609,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -48990,17 +79619,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -49009,13 +79644,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -49025,17 +79654,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -49043,11 +79678,47 @@ cont {
 cont {
   name: "railway-narrow_gauge-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1238
+      priority: 1233
     }
   }
   element {
@@ -49055,7 +79726,7 @@ cont {
     lines {
       width: 1.0
       color: 0x999999
-      priority: 1260
+      priority: 1256
     }
   }
   element {
@@ -49063,7 +79734,7 @@ cont {
     lines {
       width: 2.4
       color: 0x555555
-      priority: 1210
+      priority: 1206
     }
     lines {
       width: 1.7
@@ -49073,26 +79744,20 @@ cont {
         dd: 5.5
       }
       cap: BUTTCAP
-      priority: 1342
+      priority: 1331
     }
     lines {
       width: 1.7
       color: 0xdddddd
-      priority: 1306
+      priority: 1295
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x333333
-      priority: 1312
+      priority: 1300
     }
     lines {
       width: 2.0
@@ -49102,36 +79767,36 @@ cont {
         dd: 11.0
       }
       cap: BUTTCAP
-      priority: 1413
+      priority: 1403
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1383
+      priority: 1373
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1536
+      priority: 1529
     }
     lines {
       width: 2.0
@@ -49141,36 +79806,36 @@ cont {
         dd: 14.0
       }
       cap: BUTTCAP
-      priority: 1665
+      priority: 1660
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1638
+      priority: 1632
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -49180,36 +79845,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -49219,36 +79884,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1572
+      priority: 1565
     }
     lines {
       width: 2.0
@@ -49258,37 +79923,91 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1735
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1695
+      priority: 1690
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-platform"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 4.0
       color: 0xaaaaaa
-      priority: 1591
+      priority: 1584
     }
     area {
       color: 0xaaaaaa
-      priority: 1592
+      priority: 1585
     }
   }
   element {
@@ -49331,11 +80050,47 @@ cont {
 cont {
   name: "railway-preserved"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1241
+      priority: 1236
     }
   }
   element {
@@ -49343,7 +80098,7 @@ cont {
     lines {
       width: 1.35
       color: 0xaaaaaa
-      priority: 1263
+      priority: 1259
     }
   }
   element {
@@ -49351,7 +80106,7 @@ cont {
     lines {
       width: 2.4
       color: 0x888888
-      priority: 1213
+      priority: 1208
     }
     lines {
       width: 1.7
@@ -49361,7 +80116,7 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1345
+      priority: 1334
     }
     lines {
       width: 1.7
@@ -49374,7 +80129,7 @@ cont {
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1315
+      priority: 1303
     }
     lines {
       width: 2.0
@@ -49384,12 +80139,12 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1416
+      priority: 1406
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1386
+      priority: 1376
     }
   }
   element {
@@ -49407,7 +80162,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1668
+      priority: 1662
     }
   }
   element {
@@ -49415,7 +80170,7 @@ cont {
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49425,12 +80180,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
     }
   }
   element {
@@ -49438,7 +80193,7 @@ cont {
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49448,12 +80203,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
     }
   }
   element {
@@ -49461,7 +80216,7 @@ cont {
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49471,23 +80226,59 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
     }
   }
 }
 cont {
   name: "railway-preserved-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1241
+      priority: 1236
     }
   }
   element {
@@ -49495,7 +80286,7 @@ cont {
     lines {
       width: 1.35
       color: 0xaaaaaa
-      priority: 1263
+      priority: 1259
     }
   }
   element {
@@ -49503,7 +80294,7 @@ cont {
     lines {
       width: 2.4
       color: 0x888888
-      priority: 1213
+      priority: 1208
     }
     lines {
       width: 1.7
@@ -49513,7 +80304,7 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1345
+      priority: 1334
     }
     lines {
       width: 1.7
@@ -49526,13 +80317,7 @@ cont {
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1315
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1303
     }
     lines {
       width: 2.0
@@ -49542,17 +80327,23 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1416
+      priority: 1406
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1386
+      priority: 1376
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -49577,12 +80368,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1668
+      priority: 1662
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -49591,13 +80382,7 @@ cont {
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49607,17 +80392,23 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -49626,13 +80417,7 @@ cont {
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49642,17 +80427,23 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -49661,13 +80452,7 @@ cont {
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49677,17 +80462,23 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -49695,11 +80486,47 @@ cont {
 cont {
   name: "railway-preserved-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1241
+      priority: 1236
     }
   }
   element {
@@ -49707,7 +80534,7 @@ cont {
     lines {
       width: 1.35
       color: 0xaaaaaa
-      priority: 1263
+      priority: 1259
     }
   }
   element {
@@ -49715,7 +80542,7 @@ cont {
     lines {
       width: 2.4
       color: 0x888888
-      priority: 1213
+      priority: 1208
     }
     lines {
       width: 1.7
@@ -49725,7 +80552,7 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1345
+      priority: 1334
     }
     lines {
       width: 1.7
@@ -49736,15 +80563,9 @@ cont {
   element {
     scale: 15
     lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x888888
-      priority: 1315
+      priority: 1303
     }
     lines {
       width: 2.0
@@ -49754,23 +80575,29 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1416
+      priority: 1406
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1386
+      priority: 1376
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
   element {
     scale: 16
@@ -49793,12 +80620,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1668
+      priority: 1662
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -49809,15 +80636,9 @@ cont {
   element {
     scale: 17
     lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49827,36 +80648,36 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49866,36 +80687,36 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.2
       color: 0x888888
-      priority: 1575
+      priority: 1568
     }
     lines {
       width: 2.0
@@ -49905,34 +80726,80 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1742
+      priority: 1738
     }
     lines {
       width: 2.0
       color: 0xdddddd
-      priority: 1698
+      priority: 1693
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-rail"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     lines {
       width: 1.0
       color: 0xbbbbbb
       priority: 1164
     }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
+    }
   }
   element {
     scale: 11
@@ -49941,13 +80808,33 @@ cont {
       color: 0xbbbbbb
       priority: 1164
     }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
+    }
   }
   element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1235
+      priority: 1231
+    }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
     }
   }
   element {
@@ -49955,7 +80842,17 @@ cont {
     lines {
       width: 1.85
       color: 0xaaaaaa
-      priority: 1257
+      priority: 1253
+    }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
     }
   }
   element {
@@ -49963,20 +80860,26 @@ cont {
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1208
+      priority: 1203
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16208
+      priority: 16203
     }
     lines {
       width: 1.8
       color: 0xdddddd
-      priority: 1304
+      priority: 1292
     }
     lines {
       width: 1.8
@@ -49986,7 +80889,7 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1339
+      priority: 1328
     }
   }
   element {
@@ -49994,20 +80897,26 @@ cont {
     lines {
       width: 4.0
       color: 0x666666
-      priority: 1309
+      priority: 1298
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16309
+      priority: 16298
     }
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1380
+      priority: 1370
     }
     lines {
       width: 2.4
@@ -50017,7 +80926,7 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1383
+      priority: 1373
     }
   }
   element {
@@ -50025,20 +80934,26 @@ cont {
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1635
+      priority: 1629
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16635
+      priority: 16629
     }
     lines {
       width: 4.0
       color: 0x666666
-      priority: 1534
+      priority: 1526
     }
     lines {
       width: 2.4
@@ -50048,7 +80963,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1663
+      priority: 1657
     }
   }
   element {
@@ -50056,20 +80971,26 @@ cont {
     lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
       width: 3.2
@@ -50079,7 +81000,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
     }
   }
   element {
@@ -50087,20 +81008,26 @@ cont {
     lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
       width: 3.2
@@ -50110,7 +81037,7 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
     }
   }
   element {
@@ -50118,20 +81045,26 @@ cont {
     lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
       width: 3.2
@@ -50141,19 +81074,59 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
     }
   }
 }
 cont {
   name: "railway-rail-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     lines {
       width: 1.0
       color: 0xbbbbbb
       priority: 1164
     }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
+    }
   }
   element {
     scale: 11
@@ -50162,13 +81135,33 @@ cont {
       color: 0xbbbbbb
       priority: 1164
     }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
+    }
   }
   element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1235
+      priority: 1231
+    }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
     }
   }
   element {
@@ -50176,7 +81169,17 @@ cont {
     lines {
       width: 1.85
       color: 0xaaaaaa
-      priority: 1257
+      priority: 1253
+    }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
     }
   }
   element {
@@ -50184,20 +81187,26 @@ cont {
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1208
+      priority: 1203
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16208
+      priority: 16203
     }
     lines {
       width: 1.8
       color: 0xdddddd
-      priority: 1304
+      priority: 1292
     }
     lines {
       width: 1.8
@@ -50207,34 +81216,34 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1339
+      priority: 1328
     }
   }
   element {
     scale: 15
     lines {
-      width: 6.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 4.0
       color: 0x666666
-      priority: 1309
+      priority: 1298
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16309
+      priority: 16298
     }
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1380
+      priority: 1370
     }
     lines {
       width: 2.4
@@ -50244,12 +81253,18 @@ cont {
         dd: 9.0
       }
       cap: BUTTCAP
-      priority: 1383
+      priority: 1373
+    }
+    lines {
+      width: 6.4
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -50258,26 +81273,26 @@ cont {
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1635
+      priority: 1629
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16635
-    }
-    lines {
-      width: 6.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 16629
     }
     lines {
       width: 4.0
       color: 0x666666
-      priority: 1534
+      priority: 1526
     }
     lines {
       width: 2.4
@@ -50287,40 +81302,46 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1663
+      priority: 1657
+    }
+    lines {
+      width: 6.4
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 17
     lines {
-      width: 7.2
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
       width: 3.2
@@ -50330,40 +81351,46 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
+    }
+    lines {
+      width: 7.2
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 18
     lines {
-      width: 7.2
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
       width: 3.2
@@ -50373,40 +81400,46 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
+    }
+    lines {
+      width: 7.2
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 19
     lines {
-      width: 7.2
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
       width: 3.2
@@ -50416,12 +81449,18 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
+    }
+    lines {
+      width: 7.2
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -50429,12 +81468,52 @@ cont {
 cont {
   name: "railway-rail-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     lines {
       width: 1.0
       color: 0xbbbbbb
       priority: 1164
     }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
+    }
   }
   element {
     scale: 11
@@ -50443,13 +81522,33 @@ cont {
       color: 0xbbbbbb
       priority: 1164
     }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
+    }
   }
   element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1235
+      priority: 1231
+    }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
     }
   }
   element {
@@ -50457,7 +81556,17 @@ cont {
     lines {
       width: 1.85
       color: 0xaaaaaa
-      priority: 1257
+      priority: 1253
+    }
+    lines {
+      width: 1.0
+      color: 0x333333
+      dashdot {
+        dd: 4.0
+        dd: 5.0
+      }
+      cap: BUTTCAP
+      priority: 1548
     }
   }
   element {
@@ -50465,20 +81574,26 @@ cont {
     lines {
       width: 3.0
       color: 0x888888
-      priority: 1208
+      priority: 1203
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16208
+      priority: 16203
     }
     lines {
       width: 1.8
       color: 0xdddddd
-      priority: 1304
+      priority: 1292
     }
     lines {
       width: 1.8
@@ -50488,7 +81603,7 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1339
+      priority: 1328
     }
   }
   element {
@@ -50496,93 +81611,105 @@ cont {
     lines {
       width: 4.0
       color: 0x666666
-      priority: 1309
+      priority: 1298
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16309
+      priority: 16298
     }
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1380
-    }
-    lines {
-      width: 6.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1370
     }
     lines {
-      width: 2.4
+      width: 8.4
       color: 0x666666
+      priority: 11
       dashdot {
-        dd: 9.0
-        dd: 9.0
+        dd: 5
+        dd: 5
       }
       cap: BUTTCAP
-      priority: 1383
     }
     lines {
-      width: 8.4
+      width: 2.4
       color: 0x666666
-      priority: 10
       dashdot {
-        dd: 5
-        dd: 5
+        dd: 9.0
+        dd: 9.0
       }
       cap: BUTTCAP
+      priority: 1373
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 6.4
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 2.4
       color: 0xdddddd
-      priority: 1635
+      priority: 1629
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16635
+      priority: 16629
     }
     lines {
       width: 4.0
       color: 0x666666
-      priority: 1534
+      priority: 1526
     }
     lines {
-      width: 2.4
+      width: 8.4
       color: 0x666666
+      priority: 11
       dashdot {
-        dd: 12.0
-        dd: 12.0
+        dd: 5
+        dd: 5
       }
       cap: BUTTCAP
-      priority: 1663
     }
     lines {
-      width: 8.4
+      width: 2.4
       color: 0x666666
-      priority: 10
       dashdot {
-        dd: 5
-        dd: 5
+        dd: 12.0
+        dd: 12.0
       }
       cap: BUTTCAP
+      priority: 1657
+    }
+    lines {
+      width: 6.4
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
   }
   element {
@@ -50590,25 +81717,35 @@ cont {
     lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
-      width: 7.2
-      color: 0xeeeeee
-      priority: 13
+      width: 9.2
+      color: 0x666666
+      priority: 11
+      dashdot {
+        dd: 5
+        dd: 5
+      }
       cap: BUTTCAP
     }
     lines {
@@ -50619,16 +81756,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
     }
     lines {
-      width: 9.2
-      color: 0x666666
-      priority: 10
-      dashdot {
-        dd: 5
-        dd: 5
-      }
+      width: 7.2
+      color: 0xeeeeee
+      priority: 13
       cap: BUTTCAP
     }
   }
@@ -50637,25 +81770,35 @@ cont {
     lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
-      width: 7.2
-      color: 0xeeeeee
-      priority: 13
+      width: 9.2
+      color: 0x666666
+      priority: 11
+      dashdot {
+        dd: 5
+        dd: 5
+      }
       cap: BUTTCAP
     }
     lines {
@@ -50666,16 +81809,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
     }
     lines {
-      width: 9.2
-      color: 0x666666
-      priority: 10
-      dashdot {
-        dd: 5
-        dd: 5
-      }
+      width: 7.2
+      color: 0xeeeeee
+      priority: 13
       cap: BUTTCAP
     }
   }
@@ -50684,25 +81823,35 @@ cont {
     lines {
       width: 4.4
       color: 0x666666
-      priority: 1569
+      priority: 1562
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
-      priority: 16569
+      priority: 16562
     }
     lines {
       width: 3.2
       color: 0xdddddd
-      priority: 1693
+      priority: 1688
     }
     lines {
-      width: 7.2
-      color: 0xeeeeee
-      priority: 13
+      width: 9.2
+      color: 0x666666
+      priority: 11
+      dashdot {
+        dd: 5
+        dd: 5
+      }
       cap: BUTTCAP
     }
     lines {
@@ -50713,16 +81862,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1732
     }
     lines {
-      width: 9.2
-      color: 0x666666
-      priority: 10
-      dashdot {
-        dd: 5
-        dd: 5
-      }
+      width: 7.2
+      color: 0xeeeeee
+      priority: 13
       cap: BUTTCAP
     }
   }
@@ -50730,6 +81875,54 @@ cont {
 cont {
   name: "railway-razed"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     lines {
       width: 3.2
@@ -50739,7 +81932,7 @@ cont {
         dd: 2.4
       }
       cap: BUTTCAP
-      priority: 1528
+      priority: 1520
     }
     lines {
       width: 2.4
@@ -50753,12 +81946,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1660
+      priority: 1654
     }
     lines {
       width: 2.4
       color: 0xb3ffffff
-      priority: 1627
+      priority: 1621
     }
   }
   element {
@@ -50775,12 +81968,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1728
+      priority: 1724
     }
     lines {
       width: 2.0
       color: 0xb3ffffff
-      priority: 1687
+      priority: 1682
     }
   }
   element {
@@ -50797,12 +81990,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1728
+      priority: 1724
     }
     lines {
       width: 2.0
       color: 0xb3ffffff
-      priority: 1687
+      priority: 1682
     }
   }
   element {
@@ -50819,23 +82012,62 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1728
+      priority: 1724
     }
     lines {
       width: 2.0
       color: 0xb3ffffff
-      priority: 1687
+      priority: 1682
     }
   }
 }
 cont {
   name: "railway-siding"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1271
+      priority: 1267
     }
   }
   element {
@@ -50843,7 +82075,7 @@ cont {
     lines {
       width: 1.6
       color: 0x888888
-      priority: 1224
+      priority: 1220
     }
     lines {
       width: 1.0
@@ -50853,12 +82085,12 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1358
+      priority: 1348
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 1326
+      priority: 1314
     }
   }
   element {
@@ -50866,7 +82098,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1331
+      priority: 1320
     }
     lines {
       width: 1.4
@@ -50876,12 +82108,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1430
+      priority: 1420
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1400
+      priority: 1389
     }
   }
   element {
@@ -50889,7 +82121,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1547
+      priority: 1540
     }
     lines {
       width: 1.2
@@ -50899,12 +82131,12 @@ cont {
         dd: 16.0
       }
       cap: BUTTCAP
-      priority: 1679
+      priority: 1674
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1652
+      priority: 1646
     }
   }
   element {
@@ -50912,7 +82144,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -50922,12 +82154,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
     }
   }
   element {
@@ -50935,7 +82167,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -50945,12 +82177,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
     }
   }
   element {
@@ -50958,7 +82190,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -50968,23 +82200,62 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
     }
   }
 }
 cont {
   name: "railway-siding-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1271
+      priority: 1267
     }
   }
   element {
@@ -50992,7 +82263,7 @@ cont {
     lines {
       width: 1.6
       color: 0x888888
-      priority: 1224
+      priority: 1220
     }
     lines {
       width: 1.0
@@ -51002,12 +82273,12 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1358
+      priority: 1348
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 1326
+      priority: 1314
     }
   }
   element {
@@ -51015,13 +82286,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1331
-    }
-    lines {
-      width: 5.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1320
     }
     lines {
       width: 1.4
@@ -51031,17 +82296,23 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1430
+      priority: 1420
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1400
+      priority: 1389
+    }
+    lines {
+      width: 5.4
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.4
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51050,13 +82321,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1547
-    }
-    lines {
-      width: 5.2
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1540
     }
     lines {
       width: 1.2
@@ -51066,17 +82331,23 @@ cont {
         dd: 16.0
       }
       cap: BUTTCAP
-      priority: 1679
+      priority: 1674
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1652
+      priority: 1646
+    }
+    lines {
+      width: 5.2
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.2
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51085,13 +82356,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -51101,17 +82366,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51120,13 +82391,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -51136,17 +82401,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51155,13 +82426,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -51171,17 +82436,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51189,11 +82460,50 @@ cont {
 cont {
   name: "railway-siding-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
     scale: 13
     lines {
       width: 1.0
       color: 0xaaaaaa
-      priority: 1271
+      priority: 1267
     }
   }
   element {
@@ -51201,7 +82511,7 @@ cont {
     lines {
       width: 1.6
       color: 0x888888
-      priority: 1224
+      priority: 1220
     }
     lines {
       width: 1.0
@@ -51211,26 +82521,20 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1358
+      priority: 1348
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 1326
+      priority: 1314
     }
   }
   element {
     scale: 15
     lines {
-      width: 5.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 2.4
       color: 0x333333
-      priority: 1331
+      priority: 1320
     }
     lines {
       width: 1.4
@@ -51240,36 +82544,36 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1430
+      priority: 1420
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1400
+      priority: 1389
     }
     lines {
       width: 7.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
-      width: 5.2
+      width: 5.4
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1547
+      priority: 1540
     }
     lines {
       width: 1.2
@@ -51279,36 +82583,36 @@ cont {
         dd: 16.0
       }
       cap: BUTTCAP
-      priority: 1679
+      priority: 1674
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1652
+      priority: 1646
     }
     lines {
       width: 7.2
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
-      width: 5.36
+      width: 5.2
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -51318,36 +82622,36 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 5.36
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -51357,36 +82661,36 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 5.36
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1589
+      priority: 1582
     }
     lines {
       width: 1.36
@@ -51396,33 +82700,81 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1767
+      priority: 1763
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1715
+      priority: 1710
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-spur"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.6
       color: 0xaaaaaa
-      priority: 1219
+      priority: 1214
     }
     lines {
       width: 1.0
@@ -51432,12 +82784,12 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1353
+      priority: 1342
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1320
+      priority: 1309
     }
   }
   element {
@@ -51445,7 +82797,7 @@ cont {
     lines {
       width: 2.4
       color: 0x555555
-      priority: 1326
+      priority: 1314
     }
     lines {
       width: 1.4
@@ -51455,12 +82807,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1424
+      priority: 1415
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1394
+      priority: 1384
     }
   }
   element {
@@ -51468,7 +82820,7 @@ cont {
     lines {
       width: 2.4
       color: 0x555555
-      priority: 1542
+      priority: 1534
     }
     lines {
       width: 1.2
@@ -51478,12 +82830,12 @@ cont {
         dd: 16.0
       }
       cap: BUTTCAP
-      priority: 1673
+      priority: 1668
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1646
+      priority: 1640
     }
   }
   element {
@@ -51491,7 +82843,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51501,12 +82853,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
     }
   }
   element {
@@ -51514,7 +82866,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51524,12 +82876,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
     }
   }
   element {
@@ -51537,7 +82889,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51547,23 +82899,65 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
     }
   }
 }
 cont {
   name: "railway-spur-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.6
       color: 0xaaaaaa
-      priority: 1219
+      priority: 1214
     }
     lines {
       width: 1.0
@@ -51573,12 +82967,12 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1353
+      priority: 1342
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1320
+      priority: 1309
     }
   }
   element {
@@ -51586,13 +82980,7 @@ cont {
     lines {
       width: 2.4
       color: 0x555555
-      priority: 1326
-    }
-    lines {
-      width: 5.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1314
     }
     lines {
       width: 1.4
@@ -51602,17 +82990,23 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1424
+      priority: 1415
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1394
+      priority: 1384
+    }
+    lines {
+      width: 5.4
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.4
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51621,13 +83015,7 @@ cont {
     lines {
       width: 2.4
       color: 0x555555
-      priority: 1542
-    }
-    lines {
-      width: 5.2
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1534
     }
     lines {
       width: 1.2
@@ -51637,17 +83025,23 @@ cont {
         dd: 16.0
       }
       cap: BUTTCAP
-      priority: 1673
+      priority: 1668
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1646
+      priority: 1640
+    }
+    lines {
+      width: 5.2
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.2
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51656,13 +83050,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51672,17 +83060,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51691,13 +83085,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51707,17 +83095,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51726,13 +83120,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51742,17 +83130,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -51760,11 +83154,53 @@ cont {
 cont {
   name: "railway-spur-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.6
       color: 0xaaaaaa
-      priority: 1219
+      priority: 1214
     }
     lines {
       width: 1.0
@@ -51774,26 +83210,20 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1353
+      priority: 1342
     }
     lines {
       width: 1.0
       color: 0x888888
-      priority: 1320
+      priority: 1309
     }
   }
   element {
     scale: 15
     lines {
-      width: 5.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 2.4
       color: 0x555555
-      priority: 1326
+      priority: 1314
     }
     lines {
       width: 1.4
@@ -51803,36 +83233,36 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1424
+      priority: 1415
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1394
+      priority: 1384
     }
     lines {
       width: 7.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
-      width: 5.2
+      width: 5.4
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 2.4
       color: 0x555555
-      priority: 1542
+      priority: 1534
     }
     lines {
       width: 1.2
@@ -51842,36 +83272,36 @@ cont {
         dd: 16.0
       }
       cap: BUTTCAP
-      priority: 1673
+      priority: 1668
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1646
+      priority: 1640
     }
     lines {
       width: 7.2
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
-      width: 5.36
+      width: 5.2
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51881,36 +83311,36 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 5.36
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51920,36 +83350,36 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 5.36
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1583
+      priority: 1576
     }
     lines {
       width: 1.36
@@ -51959,28 +83389,76 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1761
+      priority: 1757
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1709
+      priority: 1704
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-station"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     symbol {
       name: "railway-station-mini"
@@ -51994,9 +83472,15 @@ cont {
       priority: 16169
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52007,70 +83491,130 @@ cont {
     scale: 16
     symbol {
       name: "railway-station"
-      priority: 16180
+      priority: 16181
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15180
+      priority: 15181
     }
   }
   element {
     scale: 17
     symbol {
       name: "railway-station"
-      priority: 16180
+      priority: 16181
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15180
+      priority: 15181
     }
   }
   element {
     scale: 18
     symbol {
       name: "railway-station"
-      priority: 16180
+      priority: 16181
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15180
+      priority: 15181
     }
   }
   element {
     scale: 19
     symbol {
       name: "railway-station"
-      priority: 16180
+      priority: 16181
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15180
+      priority: 15181
     }
   }
 }
 cont {
   name: "railway-station-subway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -52079,13 +83623,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52101,13 +83645,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52123,13 +83667,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52145,13 +83689,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52167,13 +83711,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52189,13 +83733,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52211,13 +83755,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52233,13 +83777,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52250,6 +83794,42 @@ cont {
 cont {
   name: "railway-station-subway-blue"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -52258,13 +83838,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52280,13 +83860,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52302,13 +83882,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52324,13 +83904,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52346,13 +83926,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52368,13 +83948,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52390,13 +83970,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52412,13 +83992,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52429,6 +84009,42 @@ cont {
 cont {
   name: "railway-station-subway-brown"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -52437,13 +84053,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52459,13 +84075,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52481,13 +84097,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52503,13 +84119,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52525,13 +84141,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52547,13 +84163,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52569,13 +84185,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52591,13 +84207,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52608,6 +84224,42 @@ cont {
 cont {
   name: "railway-station-subway-darkgreen"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -52616,13 +84268,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52638,13 +84290,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52660,13 +84312,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52682,13 +84334,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52704,13 +84356,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52726,13 +84378,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52748,13 +84400,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52770,13 +84422,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52787,6 +84439,42 @@ cont {
 cont {
   name: "railway-station-subway-gray"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -52795,13 +84483,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52817,13 +84505,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52839,13 +84527,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52861,13 +84549,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52883,13 +84571,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52905,13 +84593,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52927,13 +84615,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52949,13 +84637,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52966,6 +84654,42 @@ cont {
 cont {
   name: "railway-station-subway-green"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -52974,13 +84698,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -52996,13 +84720,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53018,13 +84742,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53040,13 +84764,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53062,13 +84786,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53084,13 +84808,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53106,13 +84830,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53128,13 +84852,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53145,6 +84869,42 @@ cont {
 cont {
   name: "railway-station-subway-grey"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -53153,13 +84913,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53175,13 +84935,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53197,13 +84957,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53219,13 +84979,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53241,13 +85001,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53263,13 +85023,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53285,13 +85045,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53307,13 +85067,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53324,6 +85084,42 @@ cont {
 cont {
   name: "railway-station-subway-lightblue"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -53332,13 +85128,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53354,13 +85150,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53376,13 +85172,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53398,13 +85194,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53420,13 +85216,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53442,13 +85238,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53464,13 +85260,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53486,13 +85282,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53503,6 +85299,42 @@ cont {
 cont {
   name: "railway-station-subway-lightgreen"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -53511,13 +85343,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53533,13 +85365,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53555,13 +85387,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53577,13 +85409,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53599,13 +85431,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53621,13 +85453,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53643,13 +85475,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53665,13 +85497,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53682,6 +85514,42 @@ cont {
 cont {
   name: "railway-station-subway-orange"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -53690,13 +85558,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53712,13 +85580,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53734,13 +85602,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53756,13 +85624,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53778,13 +85646,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53800,13 +85668,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53822,13 +85690,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53844,13 +85712,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53861,6 +85729,42 @@ cont {
 cont {
   name: "railway-station-subway-purple"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -53869,13 +85773,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53891,13 +85795,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53913,13 +85817,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53935,13 +85839,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53957,13 +85861,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -53979,13 +85883,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54001,13 +85905,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54023,13 +85927,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54040,6 +85944,42 @@ cont {
 cont {
   name: "railway-station-subway-red"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -54048,13 +85988,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54070,13 +86010,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54092,13 +86032,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54114,13 +86054,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54136,13 +86076,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54158,13 +86098,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54180,13 +86120,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54202,13 +86142,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54219,6 +86159,42 @@ cont {
 cont {
   name: "railway-station-subway-violet"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -54227,13 +86203,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54249,13 +86225,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54271,13 +86247,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54293,13 +86269,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54315,13 +86291,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54337,13 +86313,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54359,13 +86335,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54381,13 +86357,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54398,6 +86374,42 @@ cont {
 cont {
   name: "railway-station-subway-yellow"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     symbol {
       name: "subway-station-s"
@@ -54406,13 +86418,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54428,13 +86440,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54450,13 +86462,13 @@ cont {
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54472,13 +86484,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54494,13 +86506,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54516,13 +86528,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54538,13 +86550,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54560,13 +86572,13 @@ cont {
     caption {
       secondary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -54577,6 +86589,42 @@ cont {
 cont {
   name: "railway-subway"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -54586,7 +86634,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54599,7 +86647,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54612,7 +86660,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54625,7 +86673,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54638,7 +86686,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54651,7 +86699,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54664,7 +86712,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54677,13 +86725,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-blue"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -54693,7 +86777,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54706,7 +86790,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54719,7 +86803,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54732,7 +86816,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54745,7 +86829,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54758,7 +86842,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54771,7 +86855,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54784,13 +86868,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -54800,7 +86920,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54813,7 +86933,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54826,7 +86946,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54839,7 +86959,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -54850,7 +86970,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -54864,7 +86984,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -54875,7 +86995,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -54889,7 +87009,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -54900,7 +87020,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -54914,7 +87034,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -54925,7 +87045,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -54939,7 +87059,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -54950,7 +87070,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -54958,6 +87078,42 @@ cont {
 cont {
   name: "railway-subway-brown"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -54967,7 +87123,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54980,7 +87136,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -54993,7 +87149,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55006,7 +87162,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55019,7 +87175,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55032,7 +87188,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55045,7 +87201,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55058,13 +87214,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-darkgreen"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55074,7 +87266,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55087,7 +87279,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55100,7 +87292,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55113,7 +87305,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55126,7 +87318,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55139,7 +87331,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55152,7 +87344,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55165,13 +87357,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-gray"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55181,7 +87409,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55194,7 +87422,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55207,7 +87435,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55220,7 +87448,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55233,7 +87461,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55246,7 +87474,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55259,7 +87487,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55272,13 +87500,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-green"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55288,7 +87552,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55301,7 +87565,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55314,7 +87578,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55327,7 +87591,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55340,7 +87604,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55353,7 +87617,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55366,7 +87630,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55379,13 +87643,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-grey"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55395,7 +87695,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55408,7 +87708,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55421,7 +87721,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55434,7 +87734,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55447,7 +87747,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55460,7 +87760,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55473,7 +87773,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55486,13 +87786,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-lightblue"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55502,7 +87838,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55515,7 +87851,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55528,7 +87864,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55541,7 +87877,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55554,7 +87890,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55567,7 +87903,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55580,7 +87916,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55593,13 +87929,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-lightgreen"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55609,7 +87981,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55622,7 +87994,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55635,7 +88007,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55648,7 +88020,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55661,7 +88033,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55674,7 +88046,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55687,7 +88059,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55700,13 +88072,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-orange"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55716,7 +88124,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55729,7 +88137,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55742,7 +88150,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55755,7 +88163,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55768,7 +88176,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55781,7 +88189,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55794,7 +88202,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55807,13 +88215,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-purple"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55823,7 +88267,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55836,7 +88280,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55849,7 +88293,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55862,7 +88306,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55875,7 +88319,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55888,7 +88332,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55901,7 +88345,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55914,13 +88358,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-red"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -55930,7 +88410,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55943,7 +88423,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55956,7 +88436,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55969,7 +88449,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55982,7 +88462,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -55995,7 +88475,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56008,7 +88488,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56021,13 +88501,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -56037,7 +88553,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56050,7 +88566,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56063,7 +88579,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56076,7 +88592,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -56087,7 +88603,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -56105,7 +88621,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -56116,7 +88632,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -56134,7 +88650,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -56145,7 +88661,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -56163,7 +88679,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -56174,7 +88690,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -56192,7 +88708,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
     lines {
       width: 7
@@ -56203,7 +88719,7 @@ cont {
     lines {
       width: 9
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -56215,6 +88731,42 @@ cont {
 cont {
   name: "railway-subway-violet"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -56224,7 +88776,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56237,7 +88789,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56250,7 +88802,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56263,7 +88815,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56276,7 +88828,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56289,7 +88841,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56302,7 +88854,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56315,13 +88867,49 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway-yellow"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 3.0
@@ -56331,7 +88919,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56344,7 +88932,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56357,7 +88945,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56370,7 +88958,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56383,7 +88971,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56396,7 +88984,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56409,7 +88997,7 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
   element {
@@ -56422,13 +89010,61 @@ cont {
         dd: 3.0
       }
       cap: BUTTCAP
-      priority: 11030
+      priority: 20031
     }
   }
 }
 cont {
   name: "railway-subway_entrance"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "subway"
@@ -56460,6 +89096,48 @@ cont {
 cont {
   name: "railway-tram"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.7
@@ -56469,17 +89147,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1556
+      priority: 1548
     }
     lines {
       width: 2.0
       color: 0x333333
-      priority: 1550
+      priority: 1543
     }
     lines {
       width: 1.7
       color: 0xcccccc
-      priority: 1553
+      priority: 1545
     }
   }
   element {
@@ -56487,7 +89165,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56497,12 +89175,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
   }
   element {
@@ -56510,7 +89188,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56520,12 +89198,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
   }
   element {
@@ -56533,7 +89211,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56543,12 +89221,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
   }
   element {
@@ -56556,7 +89234,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56566,12 +89244,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
   }
   element {
@@ -56579,7 +89257,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56589,18 +89267,60 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
   }
 }
 cont {
   name: "railway-tram-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.7
@@ -56610,17 +89330,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1556
+      priority: 1548
     }
     lines {
       width: 2.0
       color: 0x333333
-      priority: 1550
+      priority: 1543
     }
     lines {
       width: 1.7
       color: 0xcccccc
-      priority: 1553
+      priority: 1545
     }
   }
   element {
@@ -56628,13 +89348,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56644,17 +89358,23 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -56663,13 +89383,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56679,17 +89393,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -56698,13 +89418,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56714,17 +89428,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -56733,13 +89453,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56749,17 +89463,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -56768,13 +89488,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
-    }
-    lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56784,17 +89498,23 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
+    }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -56802,6 +89522,48 @@ cont {
 cont {
   name: "railway-tram-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 1.7
@@ -56811,31 +89573,25 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1556
+      priority: 1548
     }
     lines {
       width: 2.0
       color: 0x333333
-      priority: 1550
+      priority: 1543
     }
     lines {
       width: 1.7
       color: 0xcccccc
-      priority: 1553
+      priority: 1545
     }
   }
   element {
     scale: 15
     lines {
-      width: 6
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56845,36 +89601,36 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56884,36 +89640,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 17
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56923,36 +89679,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -56962,36 +89718,36 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 6
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1545
     }
     lines {
       width: 2.0
@@ -57001,28 +89757,79 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1567
+      priority: 1559
     }
     lines {
       width: 2.0
       color: 0xcccccc
-      priority: 1558
+      priority: 1551
     }
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 6
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "railway-tram_stop"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     symbol {
       name: "tramway-mini"
@@ -57031,13 +89838,13 @@ cont {
     caption {
       secondary {
         height: 9
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57048,22 +89855,22 @@ cont {
     scale: 16
     symbol {
       name: "tramway-mini"
-      priority: 16032
+      priority: 16033
     }
     caption {
       secondary {
         height: 10
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
       primary {
         height: 11
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
-      priority: 15032
+      priority: 15033
     }
   }
   element {
@@ -57073,9 +89880,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57089,9 +89902,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57105,9 +89924,15 @@ cont {
       priority: 16000
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x666666
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57118,11 +89943,47 @@ cont {
 cont {
   name: "railway-yard"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.5
       color: 0x333333
-      priority: 1254
+      priority: 1250
     }
   }
   element {
@@ -57130,7 +89991,7 @@ cont {
     lines {
       width: 0.85
       color: 0x333333
-      priority: 1268
+      priority: 1264
     }
   }
   element {
@@ -57138,7 +89999,7 @@ cont {
     lines {
       width: 1.6
       color: 0x333333
-      priority: 1221
+      priority: 1217
     }
     lines {
       width: 1.0
@@ -57148,12 +90009,12 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1356
+      priority: 1345
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 1323
+      priority: 1311
     }
   }
   element {
@@ -57171,12 +90032,12 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1427
+      priority: 1417
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1397
+      priority: 1387
     }
   }
   element {
@@ -57184,7 +90045,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1545
+      priority: 1537
     }
     lines {
       width: 1.2
@@ -57194,12 +90055,12 @@ cont {
         dd: 16.0
       }
       cap: BUTTCAP
-      priority: 1676
+      priority: 1671
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1649
+      priority: 1643
     }
   }
   element {
@@ -57207,7 +90068,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57217,12 +90078,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
     }
   }
   element {
@@ -57230,7 +90091,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57240,12 +90101,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
     }
   }
   element {
@@ -57253,7 +90114,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57263,23 +90124,59 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
     }
   }
 }
 cont {
   name: "railway-yard-bridge"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.5
       color: 0x333333
-      priority: 1254
+      priority: 1250
     }
   }
   element {
@@ -57287,7 +90184,7 @@ cont {
     lines {
       width: 0.85
       color: 0x333333
-      priority: 1268
+      priority: 1264
     }
   }
   element {
@@ -57295,7 +90192,7 @@ cont {
     lines {
       width: 1.6
       color: 0x333333
-      priority: 1221
+      priority: 1217
     }
     lines {
       width: 1.0
@@ -57305,12 +90202,12 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1356
+      priority: 1345
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 1323
+      priority: 1311
     }
   }
   element {
@@ -57321,12 +90218,6 @@ cont {
       priority: 1000
     }
     lines {
-      width: 5.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 1.4
       color: 0x333333
       dashdot {
@@ -57334,26 +90225,32 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1427
+      priority: 1417
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1397
+      priority: 1387
+    }
+    lines {
+      width: 5.4
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.4
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
   element {
     scale: 16
     lines {
-      width: 2.4
-      color: 0x333333
-      priority: 1545
+      width: 1.2
+      color: 0xdddddd
+      priority: 1643
     }
     lines {
       width: 5.2
@@ -57362,6 +90259,11 @@ cont {
       cap: BUTTCAP
     }
     lines {
+      width: 2.4
+      color: 0x333333
+      priority: 1537
+    }
+    lines {
       width: 1.2
       color: 0x333333
       dashdot {
@@ -57369,17 +90271,12 @@ cont {
         dd: 16.0
       }
       cap: BUTTCAP
-      priority: 1676
-    }
-    lines {
-      width: 1.2
-      color: 0xdddddd
-      priority: 1649
+      priority: 1671
     }
     lines {
       width: 7.2
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -57388,13 +90285,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57404,17 +90295,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -57423,13 +90320,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57439,17 +90330,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -57458,13 +90355,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
-    }
-    lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57474,17 +90365,23 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
+    }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       cap: BUTTCAP
     }
   }
@@ -57492,11 +90389,47 @@ cont {
 cont {
   name: "railway-yard-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.5
       color: 0x333333
-      priority: 1254
+      priority: 1250
     }
   }
   element {
@@ -57504,7 +90437,7 @@ cont {
     lines {
       width: 0.85
       color: 0x333333
-      priority: 1268
+      priority: 1264
     }
   }
   element {
@@ -57512,7 +90445,7 @@ cont {
     lines {
       width: 1.6
       color: 0x333333
-      priority: 1221
+      priority: 1217
     }
     lines {
       width: 1.0
@@ -57522,23 +90455,17 @@ cont {
         dd: 6.0
       }
       cap: BUTTCAP
-      priority: 1356
+      priority: 1345
     }
     lines {
       width: 1.0
       color: 0xdddddd
-      priority: 1323
+      priority: 1311
     }
   }
   element {
     scale: 15
     lines {
-      width: 5.4
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 2.4
       color: 0x333333
       priority: 1000
@@ -57551,75 +90478,75 @@ cont {
         dd: 12.0
       }
       cap: BUTTCAP
-      priority: 1427
+      priority: 1417
     }
     lines {
       width: 1.4
       color: 0xdddddd
-      priority: 1397
+      priority: 1387
     }
     lines {
       width: 7.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 16
     lines {
-      width: 5.2
+      width: 5.4
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 16
     lines {
-      width: 2.4
-      color: 0x333333
-      priority: 1545
-    }
-    lines {
-      width: 1.2
-      color: 0x333333
+      width: 7.2
+      color: 0x666666
+      priority: 11
       dashdot {
-        dd: 8.0
-        dd: 16.0
+        dd: 5
+        dd: 5
       }
       cap: BUTTCAP
-      priority: 1676
     }
     lines {
       width: 1.2
       color: 0xdddddd
-      priority: 1649
+      priority: 1643
     }
     lines {
-      width: 7.2
-      color: 0x666666
-      priority: 10
+      width: 2.4
+      color: 0x333333
+      priority: 1537
+    }
+    lines {
+      width: 5.2
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 0x333333
       dashdot {
-        dd: 5
-        dd: 5
+        dd: 8.0
+        dd: 16.0
       }
       cap: BUTTCAP
+      priority: 1671
     }
   }
   element {
     scale: 17
     lines {
-      width: 5.36
-      color: 0xeeeeee
-      priority: 13
-      cap: BUTTCAP
-    }
-    lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57629,36 +90556,36 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 18
     lines {
       width: 5.36
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 18
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57668,36 +90595,36 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
-  }
-  element {
-    scale: 19
     lines {
       width: 5.36
       color: 0xeeeeee
       priority: 13
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 19
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1586
+      priority: 1579
     }
     lines {
       width: 1.36
@@ -57707,28 +90634,64 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1764
+      priority: 1760
     }
     lines {
       width: 1.36
       color: 0xdddddd
-      priority: 1712
+      priority: 1707
     }
     lines {
       width: 7.36
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
       }
       cap: BUTTCAP
     }
+    lines {
+      width: 5.36
+      color: 0xeeeeee
+      priority: 13
+      cap: BUTTCAP
+    }
   }
 }
 cont {
   name: "route-ferry"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     lines {
       width: 1.0
@@ -57764,7 +90727,7 @@ cont {
         dd: 2.0
       }
       cap: BUTTCAP
-      priority: 1389
+      priority: 1378
     }
   }
   element {
@@ -57777,7 +90740,7 @@ cont {
         dd: 2.0
       }
       cap: BUTTCAP
-      priority: 1424
+      priority: 1415
     }
   }
   element {
@@ -57790,7 +90753,7 @@ cont {
         dd: 2.0
       }
       cap: BUTTCAP
-      priority: 1487
+      priority: 1479
     }
   }
   element {
@@ -57803,7 +90766,7 @@ cont {
         dd: 5.0
       }
       cap: BUTTCAP
-      priority: 1657
+      priority: 1651
     }
   }
   element {
@@ -57816,7 +90779,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1827
+      priority: 1824
     }
   }
   element {
@@ -57829,7 +90792,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1926
+      priority: 1924
     }
   }
   element {
@@ -57842,7 +90805,7 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1926
+      priority: 1924
     }
   }
   element {
@@ -57855,18 +90818,75 @@ cont {
         dd: 8.0
       }
       cap: BUTTCAP
-      priority: 1926
+      priority: 1924
     }
   }
 }
 cont {
   name: "shop"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57876,9 +90896,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57888,9 +90914,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57901,15 +90933,72 @@ cont {
 cont {
   name: "shop-alcohol"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "supermarket"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57923,9 +91012,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57939,9 +91034,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57952,6 +91053,54 @@ cont {
 cont {
   name: "shop-bakery"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "bakery"
@@ -57965,9 +91114,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57981,9 +91136,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -57997,9 +91158,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58010,11 +91177,68 @@ cont {
 cont {
   name: "shop-beverages"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58024,9 +91248,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58036,9 +91266,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58049,6 +91285,54 @@ cont {
 cont {
   name: "shop-bicycle"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "supermarket"
@@ -58062,9 +91346,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58078,9 +91368,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58094,9 +91390,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58107,15 +91409,72 @@ cont {
 cont {
   name: "shop-books"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "supermarket"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58129,9 +91488,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58145,9 +91510,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58158,15 +91529,72 @@ cont {
 cont {
   name: "shop-butcher"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "supermarket"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58180,9 +91608,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58196,9 +91630,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58209,11 +91649,68 @@ cont {
 cont {
   name: "shop-car"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58223,9 +91720,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58235,9 +91738,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58248,6 +91757,54 @@ cont {
 cont {
   name: "shop-car_repair"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "car_repair"
@@ -58261,9 +91818,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58277,9 +91840,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58293,9 +91862,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58306,11 +91881,68 @@ cont {
 cont {
   name: "shop-chemist"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58320,9 +91952,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58332,9 +91970,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58345,6 +91989,54 @@ cont {
 cont {
   name: "shop-clothes"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "clothes"
@@ -58358,9 +92050,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58374,9 +92072,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58390,9 +92094,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58403,11 +92113,68 @@ cont {
 cont {
   name: "shop-computer"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58417,9 +92184,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58429,9 +92202,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58442,11 +92221,68 @@ cont {
 cont {
   name: "shop-confectionery"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58456,9 +92292,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58468,9 +92310,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58481,6 +92329,54 @@ cont {
 cont {
   name: "shop-convenience"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "supermarket"
@@ -58494,9 +92390,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58510,9 +92412,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58526,9 +92434,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58539,6 +92453,54 @@ cont {
 cont {
   name: "shop-department_store"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "supermarket"
@@ -58552,9 +92514,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58568,9 +92536,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58584,9 +92558,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58597,6 +92577,54 @@ cont {
 cont {
   name: "shop-doityourself"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "supermarket"
@@ -58610,9 +92638,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58626,9 +92660,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58642,9 +92682,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58655,15 +92701,72 @@ cont {
 cont {
   name: "shop-electronics"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "supermarket"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58677,9 +92780,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58693,9 +92802,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58706,15 +92821,72 @@ cont {
 cont {
   name: "shop-florist"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "supermarket"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58728,9 +92900,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58744,9 +92922,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58757,11 +92941,68 @@ cont {
 cont {
   name: "shop-garden_centre"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58771,9 +93012,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58783,9 +93030,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58796,11 +93049,68 @@ cont {
 cont {
   name: "shop-gift"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58810,9 +93120,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58822,9 +93138,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58835,11 +93157,68 @@ cont {
 cont {
   name: "shop-greengrocer"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58849,9 +93228,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58861,9 +93246,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58874,6 +93265,54 @@ cont {
 cont {
   name: "shop-hairdresser"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "hairdresser"
@@ -58887,9 +93326,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58903,9 +93348,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58919,9 +93370,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58932,11 +93389,68 @@ cont {
 cont {
   name: "shop-hardware"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58946,9 +93460,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58958,9 +93478,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58971,11 +93497,68 @@ cont {
 cont {
   name: "shop-jewelry"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58985,9 +93568,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -58997,9 +93586,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59010,6 +93605,54 @@ cont {
 cont {
   name: "shop-kiosk"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "kiosk"
@@ -59023,9 +93666,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59039,9 +93688,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59055,9 +93710,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59068,6 +93729,54 @@ cont {
 cont {
   name: "shop-mall"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "supermarket"
@@ -59081,9 +93790,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59097,9 +93812,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59113,9 +93834,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59126,11 +93853,68 @@ cont {
 cont {
   name: "shop-mobile_phone"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59140,9 +93924,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59152,9 +93942,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59165,11 +93961,68 @@ cont {
 cont {
   name: "shop-optician"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59179,9 +94032,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59191,9 +94050,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59204,15 +94069,72 @@ cont {
 cont {
   name: "shop-shoes"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "supermarket"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59226,9 +94148,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59242,9 +94170,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59255,6 +94189,54 @@ cont {
 cont {
   name: "shop-supermarket"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "supermarket"
@@ -59268,9 +94250,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59284,9 +94272,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59300,9 +94294,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59313,11 +94313,68 @@ cont {
 cont {
   name: "shop-toys"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59327,9 +94384,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59339,9 +94402,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59352,6 +94421,57 @@ cont {
 cont {
   name: "sport-american_football"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "football-borderless"
@@ -59376,6 +94496,57 @@ cont {
 cont {
   name: "sport-archery"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "archery-borderless"
@@ -59400,6 +94571,57 @@ cont {
 cont {
   name: "sport-athletics"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "athletics-borderless"
@@ -59424,6 +94646,57 @@ cont {
 cont {
   name: "sport-australian_football"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "football-borderless"
@@ -59448,6 +94721,57 @@ cont {
 cont {
   name: "sport-baseball"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "baseball-borderless"
@@ -59470,8 +94794,122 @@ cont {
   }
 }
 cont {
+  name: "sport-basketball"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "sport-bowls"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "bowls-borderless"
@@ -59496,6 +94934,57 @@ cont {
 cont {
   name: "sport-cricket"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "cricket-borderless"
@@ -59520,6 +95009,57 @@ cont {
 cont {
   name: "sport-curling"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "curling-borderless"
@@ -59544,6 +95084,57 @@ cont {
 cont {
   name: "sport-diving"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "diving-borderless"
@@ -59568,6 +95159,57 @@ cont {
 cont {
   name: "sport-equestrian"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "equestrian-borderless"
@@ -59592,6 +95234,57 @@ cont {
 cont {
   name: "sport-football"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "football-borderless"
@@ -59616,6 +95309,57 @@ cont {
 cont {
   name: "sport-golf"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "golfCourse"
@@ -59640,6 +95384,57 @@ cont {
 cont {
   name: "sport-gymnastics"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "gymnastics-borderless"
@@ -59664,6 +95459,57 @@ cont {
 cont {
   name: "sport-handball"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "handball-borderless"
@@ -59688,6 +95534,57 @@ cont {
 cont {
   name: "sport-multi"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "gymnastics-borderless"
@@ -59712,6 +95609,57 @@ cont {
 cont {
   name: "sport-scuba_diving"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "diving-borderless"
@@ -59734,8 +95682,122 @@ cont {
   }
 }
 cont {
+  name: "sport-shooting"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "sport-skiing"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "gymnastics-borderless"
@@ -59758,8 +95820,122 @@ cont {
   }
 }
 cont {
+  name: "sport-soccer"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "sport-swimming"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "swimming-borderless"
@@ -59782,8 +95958,116 @@ cont {
   }
 }
 cont {
+  name: "sport-tennis"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "tourism-alpine_hut"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     symbol {
       name: "alpine_hut"
@@ -59804,9 +96088,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59820,9 +96110,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59836,9 +96132,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59849,6 +96151,51 @@ cont {
 cont {
   name: "tourism-artwork"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     symbol {
       name: "viewpoint"
@@ -59869,9 +96216,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59885,9 +96238,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59901,9 +96260,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59914,11 +96279,62 @@ cont {
 cont {
   name: "tourism-attraction"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -59931,9 +96347,15 @@ cont {
   element {
     scale: 16
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xeeeeee
       }
       priority: 15000
@@ -59946,9 +96368,15 @@ cont {
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59962,9 +96390,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59978,9 +96412,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -59995,17 +96435,53 @@ cont {
 cont {
   name: "tourism-camp_site"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16534
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16535
+      priority: -16000
     }
   }
   element {
@@ -60016,7 +96492,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16536
+      priority: -16000
     }
   }
   element {
@@ -60027,7 +96503,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16537
+      priority: -16000
     }
   }
   element {
@@ -60038,7 +96514,7 @@ cont {
     }
     area {
       color: 0xcccccc
-      priority: -16538
+      priority: -16000
     }
   }
   element {
@@ -60048,9 +96524,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60068,9 +96550,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60088,9 +96576,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60105,46 +96599,88 @@ cont {
 cont {
   name: "tourism-caravan_site"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16539
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16540
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16541
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16542
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16543
+      priority: -16000
     }
   }
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60158,9 +96694,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60174,9 +96716,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60191,6 +96739,54 @@ cont {
 cont {
   name: "tourism-guest_house"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "hostel"
@@ -60204,9 +96800,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60220,9 +96822,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60236,9 +96844,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60249,6 +96863,54 @@ cont {
 cont {
   name: "tourism-hostel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "hostel"
@@ -60262,9 +96924,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60278,9 +96946,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60294,9 +96968,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60307,6 +96987,54 @@ cont {
 cont {
   name: "tourism-hotel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "hotel"
@@ -60320,9 +97048,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60336,9 +97070,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60352,9 +97092,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60365,15 +97111,72 @@ cont {
 cont {
   name: "tourism-information"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "information"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60387,9 +97190,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60403,9 +97212,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60416,15 +97231,72 @@ cont {
 cont {
   name: "tourism-information-guidepost"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "information"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60438,9 +97310,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60454,9 +97332,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60467,15 +97351,72 @@ cont {
 cont {
   name: "tourism-information-office"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
     scale: 17
     symbol {
       name: "information"
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60489,9 +97430,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60505,9 +97452,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60518,6 +97471,54 @@ cont {
 cont {
   name: "tourism-motel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "hotel"
@@ -60531,9 +97532,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60547,9 +97554,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60563,9 +97576,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60576,6 +97595,54 @@ cont {
 cont {
   name: "tourism-museum"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
     scale: 16
     symbol {
       name: "museum"
@@ -60589,9 +97656,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60605,9 +97678,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60621,9 +97700,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60634,38 +97719,74 @@ cont {
 cont {
   name: "tourism-picnic_site"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16544
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16545
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16546
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16547
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16548
+      priority: -16000
     }
   }
   element {
@@ -60675,9 +97796,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60695,9 +97822,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60715,9 +97848,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60732,6 +97871,51 @@ cont {
 cont {
   name: "tourism-viewpoint"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
     scale: 15
     symbol {
       name: "viewpoint"
@@ -60752,9 +97936,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60768,9 +97958,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60784,9 +97980,15 @@ cont {
       priority: 16008
     }
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60797,46 +97999,88 @@ cont {
 cont {
   name: "tourism-zoo"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     area {
       color: 0xcccccc
-      priority: -16549
+      priority: -16000
     }
   }
   element {
     scale: 13
     area {
       color: 0xcccccc
-      priority: -16550
+      priority: -16000
     }
   }
   element {
     scale: 14
     area {
       color: 0xcccccc
-      priority: -16551
+      priority: -16000
     }
   }
   element {
     scale: 15
     area {
       color: 0xcccccc
-      priority: -16552
+      priority: -16000
     }
   }
   element {
     scale: 16
     area {
       color: 0xcccccc
-      priority: -16553
+      priority: -16000
     }
   }
   element {
     scale: 17
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60850,9 +98094,15 @@ cont {
   element {
     scale: 18
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60866,9 +98116,15 @@ cont {
   element {
     scale: 19
     caption {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 11
-        color: 0x333333
+        color: 0x000000
         stroke_color: 0xeeeeee
         offset_y: 10
       }
@@ -60883,11 +98139,47 @@ cont {
 cont {
   name: "waterway-canal"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 2.5
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -60895,7 +98187,7 @@ cont {
     lines {
       width: 3.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -60903,15 +98195,21 @@ cont {
     lines {
       width: 4.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -60919,15 +98217,21 @@ cont {
     lines {
       width: 4.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -60935,15 +98239,21 @@ cont {
     lines {
       width: 4.8
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -60951,21 +98261,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -60973,21 +98289,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -60995,32 +98317,74 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
 }
 cont {
   name: "waterway-canal-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 2.5
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -61028,7 +98392,7 @@ cont {
     lines {
       width: 3.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -61036,15 +98400,21 @@ cont {
     lines {
       width: 4.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -61052,15 +98422,21 @@ cont {
     lines {
       width: 4.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 8
@@ -61071,7 +98447,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61084,15 +98460,21 @@ cont {
     lines {
       width: 4.8
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 8.8
@@ -61103,7 +98485,7 @@ cont {
     lines {
       width: 10.8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61116,21 +98498,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 10.4
@@ -61141,7 +98529,7 @@ cont {
     lines {
       width: 12.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61154,21 +98542,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 10.4
@@ -61179,7 +98573,7 @@ cont {
     lines {
       width: 12.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61192,21 +98586,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 32
+      priority: 33
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 10.4
@@ -61217,7 +98617,7 @@ cont {
     lines {
       width: 12.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61229,11 +98629,53 @@ cont {
 cont {
   name: "waterway-dam"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 0.38
       color: 0x111111
-      priority: 1142
+      priority: 1144
     }
   }
   element {
@@ -61249,7 +98691,7 @@ cont {
     lines {
       width: 3.0
       color: 0x111111
-      priority: 1156
+      priority: 1155
     }
   }
   element {
@@ -61280,11 +98722,47 @@ cont {
 cont {
   name: "waterway-ditch"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.3
       color: 0xbbbbbb
-      priority: 1076
+      priority: 1080
     }
   }
   element {
@@ -61292,7 +98770,7 @@ cont {
     lines {
       width: 0.4
       color: 0xbbbbbb
-      priority: 1084
+      priority: 1089
     }
   }
   element {
@@ -61300,7 +98778,7 @@ cont {
     lines {
       width: 0.3
       color: 0xbbbbbb
-      priority: 1109
+      priority: 1111
     }
   }
   element {
@@ -61308,7 +98786,7 @@ cont {
     lines {
       width: 0.6
       color: 0xbbbbbb
-      priority: 1117
+      priority: 1119
     }
   }
   element {
@@ -61316,15 +98794,21 @@ cont {
     lines {
       width: 0.6
       color: 0xbbbbbb
-      priority: 1123
+      priority: 1125
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16123
+      priority: 16125
     }
   }
   element {
@@ -61332,15 +98816,21 @@ cont {
     lines {
       width: 0.8
       color: 0xbbbbbb
-      priority: 1128
+      priority: 1130
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16128
+      priority: 16130
     }
   }
   element {
@@ -61348,15 +98838,21 @@ cont {
     lines {
       width: 0.8
       color: 0xbbbbbb
-      priority: 1128
+      priority: 1130
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16128
+      priority: 16130
     }
   }
   element {
@@ -61364,26 +98860,68 @@ cont {
     lines {
       width: 0.8
       color: 0xbbbbbb
-      priority: 1128
+      priority: 1130
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16128
+      priority: 16130
     }
   }
 }
 cont {
   name: "waterway-ditch-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.3
       color: 0xbbbbbb
-      priority: 1076
+      priority: 1080
     }
   }
   element {
@@ -61391,7 +98929,7 @@ cont {
     lines {
       width: 0.4
       color: 0xbbbbbb
-      priority: 1084
+      priority: 1089
     }
   }
   element {
@@ -61399,7 +98937,7 @@ cont {
     lines {
       width: 0.3
       color: 0xbbbbbb
-      priority: 1109
+      priority: 1111
     }
   }
   element {
@@ -61407,7 +98945,7 @@ cont {
     lines {
       width: 0.6
       color: 0xbbbbbb
-      priority: 1117
+      priority: 1119
     }
     lines {
       width: 4.6
@@ -61418,7 +98956,7 @@ cont {
     lines {
       width: 6.6
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61431,15 +98969,21 @@ cont {
     lines {
       width: 0.6
       color: 0xbbbbbb
-      priority: 1123
+      priority: 1125
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16123
+      priority: 16125
     }
     lines {
       width: 4.6
@@ -61450,7 +98994,7 @@ cont {
     lines {
       width: 6.6
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61463,15 +99007,21 @@ cont {
     lines {
       width: 0.8
       color: 0xbbbbbb
-      priority: 1128
+      priority: 1130
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16128
+      priority: 16130
     }
     lines {
       width: 4.8
@@ -61482,7 +99032,7 @@ cont {
     lines {
       width: 6.8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61495,15 +99045,21 @@ cont {
     lines {
       width: 0.8
       color: 0xbbbbbb
-      priority: 1128
+      priority: 1130
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16128
+      priority: 16130
     }
     lines {
       width: 4.8
@@ -61514,7 +99070,7 @@ cont {
     lines {
       width: 6.8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61527,15 +99083,21 @@ cont {
     lines {
       width: 0.8
       color: 0xbbbbbb
-      priority: 1128
+      priority: 1130
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16128
+      priority: 16130
     }
     lines {
       width: 4.8
@@ -61546,7 +99108,7 @@ cont {
     lines {
       width: 6.8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61558,84 +99120,150 @@ cont {
 cont {
   name: "waterway-dock"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 11
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: 1105
+      priority: 1106
     }
   }
 }
 cont {
   name: "waterway-drain"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1073
+      priority: 1077
     }
   }
   element {
@@ -61643,7 +99271,7 @@ cont {
     lines {
       width: 1.5
       color: 0xbbbbbb
-      priority: 1082
+      priority: 1086
     }
   }
   element {
@@ -61659,13 +99287,13 @@ cont {
     lines {
       width: 3.5
       color: 0xaaaaaa
-      priority: 115
+      priority: 116
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 0xbbbbbb
-      priority: 1115
+      priority: 1116
     }
   }
   element {
@@ -61673,21 +99301,27 @@ cont {
     lines {
       width: 5.2
       color: 0xaaaaaa
-      priority: 120
+      priority: 122
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xbbbbbb
-      priority: 1120
+      priority: 1122
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16120
+      priority: 16122
     }
   }
   element {
@@ -61695,21 +99329,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 126
+      priority: 128
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1126
+      priority: 1128
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16126
+      priority: 16128
     }
   }
   element {
@@ -61717,21 +99357,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 126
+      priority: 128
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1126
+      priority: 1128
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16126
+      priority: 16128
     }
   }
   element {
@@ -61739,32 +99385,74 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 126
+      priority: 128
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1126
+      priority: 1128
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16126
+      priority: 16128
     }
   }
 }
 cont {
   name: "waterway-drain-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1073
+      priority: 1077
     }
   }
   element {
@@ -61772,7 +99460,7 @@ cont {
     lines {
       width: 1.5
       color: 0xbbbbbb
-      priority: 1082
+      priority: 1086
     }
   }
   element {
@@ -61788,13 +99476,13 @@ cont {
     lines {
       width: 3.5
       color: 0xaaaaaa
-      priority: 115
+      priority: 116
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 0xbbbbbb
-      priority: 1115
+      priority: 1116
     }
     lines {
       width: 6.8
@@ -61805,7 +99493,7 @@ cont {
     lines {
       width: 8.8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61818,21 +99506,27 @@ cont {
     lines {
       width: 5.2
       color: 0xaaaaaa
-      priority: 120
+      priority: 122
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 0xbbbbbb
-      priority: 1120
+      priority: 1122
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16120
+      priority: 16122
     }
     lines {
       width: 8
@@ -61843,7 +99537,7 @@ cont {
     lines {
       width: 10
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61856,21 +99550,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 126
+      priority: 128
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1126
+      priority: 1128
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16126
+      priority: 16128
     }
     lines {
       width: 10.4
@@ -61881,7 +99581,7 @@ cont {
     lines {
       width: 12.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61894,21 +99594,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 126
+      priority: 128
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1126
+      priority: 1128
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16126
+      priority: 16128
     }
     lines {
       width: 10.4
@@ -61919,7 +99625,7 @@ cont {
     lines {
       width: 12.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61932,21 +99638,27 @@ cont {
     lines {
       width: 8
       color: 0xaaaaaa
-      priority: 126
+      priority: 128
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xbbbbbb
-      priority: 1126
+      priority: 1128
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16126
+      priority: 16128
     }
     lines {
       width: 10.4
@@ -61957,7 +99669,7 @@ cont {
     lines {
       width: 12.4
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -61969,17 +99681,59 @@ cont {
 cont {
   name: "waterway-lock"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
-      width: 6
+      width: 7
       color: 0x111111
-      priority: 87
+      priority: 0
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 0xeeeeee
-      priority: 1087
+      priority: 1000
     }
   }
   element {
@@ -61987,13 +99741,13 @@ cont {
     lines {
       width: 10
       color: 0x111111
-      priority: 93
+      priority: 94
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 0xeeeeee
-      priority: 1093
+      priority: 1094
     }
   }
   element {
@@ -62001,13 +99755,13 @@ cont {
     lines {
       width: 12
       color: 0x111111
-      priority: 95
+      priority: 97
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 0xeeeeee
-      priority: 1095
+      priority: 1097
     }
   }
   element {
@@ -62015,13 +99769,13 @@ cont {
     lines {
       width: 16
       color: 0x111111
-      priority: 98
+      priority: 100
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xeeeeee
-      priority: 1098
+      priority: 1100
     }
   }
   element {
@@ -62029,13 +99783,13 @@ cont {
     lines {
       width: 16
       color: 0x111111
-      priority: 98
+      priority: 100
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xeeeeee
-      priority: 1098
+      priority: 1100
     }
   }
   element {
@@ -62043,24 +99797,117 @@ cont {
     lines {
       width: 16
       color: 0x111111
-      priority: 98
+      priority: 100
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 0xeeeeee
-      priority: 1098
+      priority: 1100
     }
   }
 }
 cont {
+  name: "waterway-lock_gate"
+  element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
+    scale: 14
+  }
+  element {
+    scale: 15
+  }
+  element {
+    scale: 16
+  }
+  element {
+    scale: 17
+  }
+  element {
+    scale: 18
+  }
+  element {
+    scale: 19
+  }
+}
+cont {
   name: "waterway-river"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     lines {
       width: 0.5
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -62068,7 +99915,7 @@ cont {
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -62076,7 +99923,7 @@ cont {
     lines {
       width: 2.5
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -62084,7 +99931,7 @@ cont {
     lines {
       width: 3.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -62092,15 +99939,21 @@ cont {
     lines {
       width: 4.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -62108,15 +99961,21 @@ cont {
     lines {
       width: 5.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -62124,15 +99983,21 @@ cont {
     lines {
       width: 8.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -62140,15 +100005,21 @@ cont {
     lines {
       width: 16.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -62156,15 +100027,21 @@ cont {
     lines {
       width: 16.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -62172,26 +100049,62 @@ cont {
     lines {
       width: 16.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
 }
 cont {
   name: "waterway-river-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     lines {
       width: 0.5
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -62199,7 +100112,7 @@ cont {
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -62207,7 +100120,7 @@ cont {
     lines {
       width: 2.5
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -62215,7 +100128,7 @@ cont {
     lines {
       width: 3.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
   }
   element {
@@ -62223,15 +100136,21 @@ cont {
     lines {
       width: 4.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
   }
   element {
@@ -62239,15 +100158,21 @@ cont {
     lines {
       width: 5.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 9
@@ -62258,7 +100183,7 @@ cont {
     lines {
       width: 11
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62271,15 +100196,21 @@ cont {
     lines {
       width: 8.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 12
@@ -62290,7 +100221,7 @@ cont {
     lines {
       width: 14
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62303,15 +100234,21 @@ cont {
     lines {
       width: 16.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 20
@@ -62322,7 +100259,7 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62335,15 +100272,21 @@ cont {
     lines {
       width: 16.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 20
@@ -62354,7 +100297,7 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62367,15 +100310,21 @@ cont {
     lines {
       width: 16.0
       color: 0xbbbbbb
-      priority: 1032
+      priority: 1033
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x555555
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16032
+      priority: 16033
     }
     lines {
       width: 20
@@ -62386,7 +100335,7 @@ cont {
     lines {
       width: 22
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62398,84 +100347,150 @@ cont {
 cont {
   name: "waterway-riverbank"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
     scale: 10
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 11
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 12
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 13
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 14
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 15
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 16
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 17
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 18
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
   element {
     scale: 19
     area {
       color: 0xbbbbbb
-      priority: 1033
+      priority: 1034
     }
   }
 }
 cont {
   name: "waterway-stream"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.75
       color: 0xbbbbbb
-      priority: 1071
+      priority: 1075
     }
   }
   element {
@@ -62483,7 +100498,7 @@ cont {
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1079
+      priority: 1083
     }
   }
   element {
@@ -62491,7 +100506,7 @@ cont {
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1106
+      priority: 1108
     }
   }
   element {
@@ -62499,7 +100514,7 @@ cont {
     lines {
       width: 2.0
       color: 0xbbbbbb
-      priority: 1112
+      priority: 1114
     }
   }
   element {
@@ -62507,15 +100522,21 @@ cont {
     lines {
       width: 2.0
       color: 0xbbbbbb
-      priority: 1115
+      priority: 1116
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16115
+      priority: 16116
     }
   }
   element {
@@ -62523,15 +100544,21 @@ cont {
     lines {
       width: 2.2
       color: 0xbbbbbb
-      priority: 1120
+      priority: 1122
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16120
+      priority: 16122
     }
   }
   element {
@@ -62539,15 +100566,21 @@ cont {
     lines {
       width: 2.2
       color: 0xbbbbbb
-      priority: 1120
+      priority: 1122
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16120
+      priority: 16122
     }
   }
   element {
@@ -62555,26 +100588,68 @@ cont {
     lines {
       width: 2.2
       color: 0xbbbbbb
-      priority: 1120
+      priority: 1122
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16120
+      priority: 16122
     }
   }
 }
 cont {
   name: "waterway-stream-ephemeral"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.75
       color: 0xbbbbbb
-      priority: 1071
+      priority: 1075
     }
   }
   element {
@@ -62582,7 +100657,7 @@ cont {
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1079
+      priority: 1083
     }
   }
   element {
@@ -62595,7 +100670,7 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1101
+      priority: 1103
     }
   }
   element {
@@ -62608,7 +100683,7 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1109
+      priority: 1111
     }
   }
   element {
@@ -62621,15 +100696,21 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1112
+      priority: 1114
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16112
+      priority: 16114
     }
   }
   element {
@@ -62642,15 +100723,21 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1117
+      priority: 1119
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16117
+      priority: 16119
     }
   }
   element {
@@ -62663,15 +100750,21 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1117
+      priority: 1119
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16117
+      priority: 16119
     }
   }
   element {
@@ -62684,26 +100777,68 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1117
+      priority: 1119
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16117
+      priority: 16119
     }
   }
 }
 cont {
   name: "waterway-stream-intermittent"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.75
       color: 0xbbbbbb
-      priority: 1071
+      priority: 1075
     }
   }
   element {
@@ -62711,7 +100846,7 @@ cont {
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1079
+      priority: 1083
     }
   }
   element {
@@ -62724,7 +100859,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1106
+      priority: 1108
     }
   }
   element {
@@ -62737,7 +100872,7 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1112
+      priority: 1114
     }
   }
   element {
@@ -62750,15 +100885,21 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1115
+      priority: 1116
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16115
+      priority: 16116
     }
   }
   element {
@@ -62771,15 +100912,21 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1115
+      priority: 1116
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16115
+      priority: 16116
     }
   }
   element {
@@ -62792,15 +100939,21 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1115
+      priority: 1116
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16115
+      priority: 16116
     }
   }
   element {
@@ -62813,26 +100966,68 @@ cont {
         dd: 1.0
       }
       cap: BUTTCAP
-      priority: 1115
+      priority: 1116
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16115
+      priority: 16116
     }
   }
 }
 cont {
   name: "waterway-stream-tunnel"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
     scale: 12
     lines {
       width: 0.75
       color: 0xbbbbbb
-      priority: 1071
+      priority: 1075
     }
   }
   element {
@@ -62840,7 +101035,7 @@ cont {
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1079
+      priority: 1083
     }
   }
   element {
@@ -62848,7 +101043,7 @@ cont {
     lines {
       width: 1.0
       color: 0xbbbbbb
-      priority: 1106
+      priority: 1108
     }
   }
   element {
@@ -62856,7 +101051,7 @@ cont {
     lines {
       width: 2.0
       color: 0xbbbbbb
-      priority: 1112
+      priority: 1114
     }
     lines {
       width: 6
@@ -62867,7 +101062,7 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62880,15 +101075,21 @@ cont {
     lines {
       width: 2.0
       color: 0xbbbbbb
-      priority: 1115
+      priority: 1116
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16115
+      priority: 16116
     }
     lines {
       width: 6
@@ -62899,7 +101100,7 @@ cont {
     lines {
       width: 8
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62912,15 +101113,21 @@ cont {
     lines {
       width: 2.2
       color: 0xbbbbbb
-      priority: 1120
+      priority: 1122
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16120
+      priority: 16122
     }
     lines {
       width: 6.2
@@ -62931,7 +101138,7 @@ cont {
     lines {
       width: 8.2
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62944,15 +101151,21 @@ cont {
     lines {
       width: 2.2
       color: 0xbbbbbb
-      priority: 1120
+      priority: 1122
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16120
+      priority: 16122
     }
     lines {
       width: 6.2
@@ -62963,7 +101176,7 @@ cont {
     lines {
       width: 8.2
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -62976,15 +101189,21 @@ cont {
     lines {
       width: 2.2
       color: 0xbbbbbb
-      priority: 1120
+      priority: 1122
     }
     path_text {
+      secondary {
+        height: 10
+        color: 0x000000
+        stroke_color: 0xeeeeee
+        offset_y: 20
+      }
       primary {
         height: 12
-        color: 0x222222
+        color: 0x000000
         stroke_color: 0xbbbbbb
       }
-      priority: 16120
+      priority: 16122
     }
     lines {
       width: 6.2
@@ -62995,7 +101214,7 @@ cont {
     lines {
       width: 8.2
       color: 0x666666
-      priority: 10
+      priority: 11
       dashdot {
         dd: 5
         dd: 5
@@ -63007,11 +101226,53 @@ cont {
 cont {
   name: "waterway-weir"
   element {
+    scale: 0
+  }
+  element {
+    scale: 1
+  }
+  element {
+    scale: 2
+  }
+  element {
+    scale: 3
+  }
+  element {
+    scale: 4
+  }
+  element {
+    scale: 5
+  }
+  element {
+    scale: 6
+  }
+  element {
+    scale: 7
+  }
+  element {
+    scale: 8
+  }
+  element {
+    scale: 9
+  }
+  element {
+    scale: 10
+  }
+  element {
+    scale: 11
+  }
+  element {
+    scale: 12
+  }
+  element {
+    scale: 13
+  }
+  element {
     scale: 14
     lines {
       width: 0.25
       color: 0x111111
-      priority: 1139
+      priority: 1142
     }
   }
   element {