From 34bedede55dcdcfa57ae3a9ad180d07cc7984f3d Mon Sep 17 00:00:00 2001
From: Darafei Praliaskouski <komzpa@gmail.com>
Date: Mon, 1 Apr 2013 21:02:27 +0300
Subject: [PATCH] [style] World map changes

---
 data/classificator.txt  |    1 +
 data/drules_proto.bin   |  Bin 104541 -> 104542 bytes
 data/drules_proto.txt   | 3813 +++++++++++++++++++--------------------
 data/mapcss-mapping.csv |    1 +
 data/normal.mapcss      |  303 ++--
 data/types.txt          |    1 +
 6 files changed, 2075 insertions(+), 2044 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 42fe8d43db..ac738e544b 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -228,6 +228,7 @@ world  +
             bridge  -
             tunnel  -
             {}
+        proposed  -
         raceway  -
         residential  +
             area  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0545e195d56515074003fa6a45b3de1f0af0ad06..dac871eeffee0199f9a6f7754fff212a5a88012d 100644
GIT binary patch
delta 17880
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

delta 17605
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

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 7148f5ec28..4c44b1f705 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5,7 +5,7 @@ cont {
     lines {
       width: 0.8
       color: 0x202020
-      priority: 1592
+      priority: 1590
     }
   }
   element {
@@ -13,7 +13,7 @@ cont {
     lines {
       width: 1.6
       color: 0x202020
-      priority: 1763
+      priority: 1762
     }
   }
   element {
@@ -32,7 +32,7 @@ cont {
     lines {
       width: 0.8
       color: 0x202020
-      priority: 1597
+      priority: 1595
     }
   }
   element {
@@ -40,7 +40,7 @@ cont {
     lines {
       width: 1.6
       color: 0x202020
-      priority: 1768
+      priority: 1767
     }
   }
   element {
@@ -59,7 +59,7 @@ cont {
     lines {
       width: 0.8
       color: 0x202020
-      priority: 1595
+      priority: 1593
     }
   }
   element {
@@ -67,7 +67,7 @@ cont {
     lines {
       width: 1.6
       color: 0x202020
-      priority: 1765
+      priority: 1764
     }
   }
   element {
@@ -75,7 +75,7 @@ cont {
     lines {
       width: 3.2
       color: 0x202020
-      priority: 1851
+      priority: 1850
     }
   }
 }
@@ -86,7 +86,7 @@ cont {
     lines {
       width: 0.8
       color: 0x202020
-      priority: 1600
+      priority: 1598
     }
   }
   element {
@@ -94,7 +94,7 @@ cont {
     lines {
       width: 1.6
       color: 0x202020
-      priority: 1770
+      priority: 1769
     }
   }
   element {
@@ -102,7 +102,7 @@ cont {
     lines {
       width: 3.2
       color: 0x202020
-      priority: 1853
+      priority: 1852
     }
   }
 }
@@ -403,7 +403,7 @@ cont {
     lines {
       width: 3
       color: 0x202020
-      priority: 236
+      priority: 235
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -412,7 +412,7 @@ cont {
       color: 0xD4DCBD
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1236
+      priority: 1235
     }
   }
   element {
@@ -420,7 +420,7 @@ cont {
     lines {
       width: 3.5
       color: 0x202020
-      priority: 248
+      priority: 247
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -429,7 +429,7 @@ cont {
       color: 0xD4DCBD
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1248
+      priority: 1247
     }
   }
   element {
@@ -437,7 +437,7 @@ cont {
     lines {
       width: 14
       color: 0x202020
-      priority: 341
+      priority: 340
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -446,7 +446,7 @@ cont {
       color: 0xD4DCBD
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1341
+      priority: 1340
     }
   }
   element {
@@ -508,7 +508,7 @@ cont {
     lines {
       width: 0.74
       color: 0x202020
-      priority: 239
+      priority: 237
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -517,7 +517,7 @@ cont {
       color: 0xD4DCBD
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1239
+      priority: 1237
     }
   }
   element {
@@ -525,7 +525,7 @@ cont {
     lines {
       width: 1.5
       color: 0x202020
-      priority: 251
+      priority: 250
       cap: BUTTCAP
       join: BEVELJOIN
     }
@@ -534,7 +534,7 @@ cont {
       color: 0xD4DCBD
       cap: BUTTCAP
       join: BEVELJOIN
-      priority: 1251
+      priority: 1250
     }
   }
   element {
@@ -1214,11 +1214,11 @@ cont {
     scale: 16
     symbol {
       name: "fountain"
-      priority: 16085
+      priority: 16083
     }
     area {
       color: 0xCDE5EA
-      priority: 1086
+      priority: 1084
     }
   }
   element {
@@ -1238,7 +1238,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: 1086
+      priority: 1084
     }
   }
 }
@@ -2593,21 +2593,21 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1393
     }
   }
   element {
     scale: 16
     area {
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1393
     }
   }
   element {
     scale: 17
     area {
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1393
     }
   }
@@ -2835,7 +2835,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1846
+      priority: 1845
     }
   }
   element {
@@ -2848,7 +2848,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1951
+      priority: 1950
     }
   }
 }
@@ -2869,7 +2869,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1826
+      priority: 1825
     }
   }
   element {
@@ -2882,7 +2882,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1939
+      priority: 1938
     }
   }
 }
@@ -2908,7 +2908,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1817
+      priority: 1816
     }
   }
   element {
@@ -2954,7 +2954,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1841
+      priority: 1840
     }
   }
   element {
@@ -3016,7 +3016,7 @@ cont {
     lines {
       width: 1
       color: 0xB0B0B0
-      priority: 1831
+      priority: 1830
     }
   }
   element {
@@ -3040,7 +3040,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11687
+      priority: 11686
     }
   }
   element {
@@ -3053,7 +3053,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11873
+      priority: 11872
     }
   }
   element {
@@ -3066,7 +3066,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11956
+      priority: 11955
     }
   }
 }
@@ -3098,7 +3098,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 1109
+      priority: 1107
     }
   }
   element {
@@ -3111,7 +3111,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 1109
+      priority: 1107
     }
   }
   element {
@@ -3124,12 +3124,12 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 1121
+      priority: 1120
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1119
+      priority: 1117
     }
   }
   element {
@@ -3137,7 +3137,7 @@ cont {
     lines {
       width: 2.73
       color: 0xFFFF00
-      priority: 1121
+      priority: 1120
     }
     lines {
       width: 1.95
@@ -3147,7 +3147,7 @@ cont {
         dd: 4.69
       }
       cap: BUTTCAP
-      priority: 1124
+      priority: 1122
     }
   }
   element {
@@ -3155,7 +3155,7 @@ cont {
     lines {
       width: 3.12
       color: 0xFFFF00
-      priority: 1121
+      priority: 1120
     }
     lines {
       width: 2.34
@@ -3165,7 +3165,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 1124
+      priority: 1122
     }
   }
   element {
@@ -3173,7 +3173,7 @@ cont {
     lines {
       width: 3.12
       color: 0xFFFF00
-      priority: 1121
+      priority: 1120
     }
     lines {
       width: 2.34
@@ -3183,7 +3183,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 1124
+      priority: 1122
     }
   }
   element {
@@ -3191,7 +3191,7 @@ cont {
     lines {
       width: 3.12
       color: 0xFFFF00
-      priority: 1121
+      priority: 1120
     }
     lines {
       width: 2.34
@@ -3201,7 +3201,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 1124
+      priority: 1122
     }
   }
   element {
@@ -3209,7 +3209,7 @@ cont {
     lines {
       width: 3.12
       color: 0xFFFF00
-      priority: 1121
+      priority: 1120
     }
     lines {
       width: 2.34
@@ -3219,7 +3219,7 @@ cont {
         dd: 3.12
       }
       cap: BUTTCAP
-      priority: 1124
+      priority: 1122
     }
   }
   element {
@@ -3237,7 +3237,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11407
+      priority: 11406
     }
   }
   element {
@@ -3255,7 +3255,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11434
+      priority: 11433
     }
   }
   element {
@@ -3263,7 +3263,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11480
+      priority: 11477
     }
     lines {
       width: 2
@@ -3273,7 +3273,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11482
+      priority: 11480
     }
   }
   element {
@@ -3281,7 +3281,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11707
+      priority: 11705
     }
     lines {
       width: 2
@@ -3291,7 +3291,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11709
+      priority: 11708
     }
   }
   element {
@@ -3299,7 +3299,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11890
+      priority: 11889
     }
     lines {
       width: 2
@@ -3343,7 +3343,7 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
   }
   element {
@@ -3356,7 +3356,7 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
   }
   element {
@@ -3369,12 +3369,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3387,12 +3387,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3405,12 +3405,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3423,12 +3423,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3441,12 +3441,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3459,12 +3459,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3477,12 +3477,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3495,12 +3495,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3513,12 +3513,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3531,12 +3531,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3549,12 +3549,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
   element {
@@ -3567,12 +3567,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1119
+      priority: 1117
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1117
+      priority: 1115
     }
   }
 }
@@ -3588,7 +3588,7 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
   }
   element {
@@ -3601,12 +3601,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1112
+      priority: 1110
     }
   }
   element {
@@ -3619,12 +3619,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1112
+      priority: 1110
     }
   }
   element {
@@ -3637,12 +3637,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1112
+      priority: 1110
     }
   }
   element {
@@ -3655,12 +3655,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1112
+      priority: 1110
     }
   }
   element {
@@ -3673,12 +3673,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
     lines {
       width: 1.2
       color: 0xEEEEDD
-      priority: 1112
+      priority: 1110
     }
   }
   element {
@@ -3696,7 +3696,7 @@ cont {
     lines {
       width: 2
       color: 0xEEEEDD
-      priority: 11395
+      priority: 11394
     }
   }
 }
@@ -3712,12 +3712,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1112
+      priority: 1110
     }
   }
   element {
@@ -3730,12 +3730,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1112
+      priority: 1110
     }
   }
   element {
@@ -3748,12 +3748,12 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1114
+      priority: 1112
     }
     lines {
       width: 1
       color: 0xEEEEDD
-      priority: 1112
+      priority: 1110
     }
   }
   element {
@@ -3778,7 +3778,7 @@ cont {
         dd: 0.12
       }
       cap: BUTTCAP
-      priority: 1043
+      priority: 1044
     }
   }
   element {
@@ -3791,7 +3791,7 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1051
+      priority: 1049
     }
     lines {
       width: 0.25
@@ -3803,7 +3803,7 @@ cont {
         dd: 0.25
       }
       cap: BUTTCAP
-      priority: 1053
+      priority: 1051
     }
   }
   element {
@@ -3816,7 +3816,7 @@ cont {
         dd: 0.6
       }
       cap: BUTTCAP
-      priority: 1051
+      priority: 1049
     }
     lines {
       width: 0.5
@@ -3828,7 +3828,7 @@ cont {
         dd: 0.5
       }
       cap: BUTTCAP
-      priority: 1053
+      priority: 1051
     }
   }
   element {
@@ -3853,7 +3853,7 @@ cont {
         dd: 1
       }
       cap: BUTTCAP
-      priority: 11153
+      priority: 11151
     }
   }
   element {
@@ -3861,7 +3861,7 @@ cont {
     lines {
       width: 10
       color: 0xFFFF00
-      priority: 1151
+      priority: 1149
     }
     lines {
       width: 2
@@ -3873,7 +3873,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1153
+      priority: 1151
     }
   }
   element {
@@ -3903,7 +3903,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11439
+      priority: 11438
     }
   }
   element {
@@ -3918,7 +3918,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11492
+      priority: 11490
     }
   }
   element {
@@ -3933,7 +3933,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11731
+      priority: 11730
     }
   }
   element {
@@ -3948,7 +3948,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11907
+      priority: 11906
     }
   }
   element {
@@ -3979,7 +3979,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11478
+      priority: 11475
     }
   }
   element {
@@ -3992,7 +3992,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11700
+      priority: 11698
     }
   }
   element {
@@ -4005,7 +4005,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11885
+      priority: 11884
     }
   }
   element {
@@ -4034,7 +4034,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11475
+      priority: 11473
     }
   }
   element {
@@ -4047,7 +4047,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11697
+      priority: 11696
     }
   }
   element {
@@ -4084,7 +4084,7 @@ cont {
     lines {
       width: 1
       color: 0xF9574B
-      priority: 11695
+      priority: 11693
     }
   }
   element {
@@ -4092,7 +4092,7 @@ cont {
     lines {
       width: 1
       color: 0xF9574B
-      priority: 11880
+      priority: 11879
     }
   }
   element {
@@ -4133,7 +4133,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11878
+      priority: 11877
     }
   }
   element {
@@ -4164,7 +4164,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11690
+      priority: 11688
     }
   }
   element {
@@ -4208,7 +4208,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11721
+      priority: 11720
     }
   }
   element {
@@ -4223,7 +4223,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11900
+      priority: 11899
     }
   }
   element {
@@ -4238,7 +4238,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11978
+      priority: 11977
     }
   }
 }
@@ -4285,7 +4285,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11497
+      priority: 11495
     }
     lines {
       width: 2
@@ -4295,7 +4295,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11502
+      priority: 11500
     }
   }
   element {
@@ -4303,7 +4303,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11736
+      priority: 11735
     }
     lines {
       width: 2
@@ -4313,7 +4313,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11741
+      priority: 11740
     }
   }
   element {
@@ -4321,7 +4321,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11912
+      priority: 11911
     }
     lines {
       width: 2
@@ -4331,7 +4331,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11917
+      priority: 11916
     }
   }
   element {
@@ -4365,7 +4365,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11487
+      priority: 11485
     }
   }
   element {
@@ -4378,7 +4378,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11724
+      priority: 11723
     }
   }
   element {
@@ -4391,7 +4391,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11902
+      priority: 11901
     }
   }
   element {
@@ -4422,7 +4422,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11719
+      priority: 11718
     }
   }
   element {
@@ -4463,7 +4463,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11417
+      priority: 11416
     }
     lines {
       width: 2
@@ -4499,7 +4499,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11495
+      priority: 11492
     }
     lines {
       width: 2
@@ -4509,7 +4509,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11500
+      priority: 11497
     }
   }
   element {
@@ -4517,7 +4517,7 @@ cont {
     lines {
       width: 6
       color: 0xFFFF00
-      priority: 11734
+      priority: 11732
     }
     lines {
       width: 2
@@ -4527,7 +4527,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 11739
+      priority: 11737
     }
   }
   element {
@@ -4581,7 +4581,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11412
+      priority: 11411
     }
   }
   element {
@@ -4611,7 +4611,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11490
+      priority: 11487
     }
   }
   element {
@@ -4626,7 +4626,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11729
+      priority: 11727
     }
   }
   element {
@@ -4687,7 +4687,7 @@ cont {
         dd: 0.12
       }
       cap: BUTTCAP
-      priority: 1043
+      priority: 1044
     }
   }
   element {
@@ -4695,7 +4695,7 @@ cont {
     lines {
       width: 1.25
       color: 0xFFFF00
-      priority: 1051
+      priority: 1049
     }
     lines {
       width: 0.25
@@ -4707,7 +4707,7 @@ cont {
         dd: 0.25
       }
       cap: BUTTCAP
-      priority: 1053
+      priority: 1051
     }
   }
   element {
@@ -4715,7 +4715,7 @@ cont {
     lines {
       width: 1
       color: 0xFFFF00
-      priority: 1051
+      priority: 1049
     }
     lines {
       width: 0.5
@@ -4727,7 +4727,7 @@ cont {
         dd: 0.5
       }
       cap: BUTTCAP
-      priority: 1053
+      priority: 1051
     }
   }
   element {
@@ -4735,7 +4735,7 @@ cont {
     lines {
       width: 5
       color: 0xFFFF00
-      priority: 1151
+      priority: 1149
     }
     lines {
       width: 1
@@ -4747,7 +4747,7 @@ cont {
         dd: 1
       }
       cap: BUTTCAP
-      priority: 1153
+      priority: 1151
     }
   }
   element {
@@ -4755,7 +4755,7 @@ cont {
     lines {
       width: 10
       color: 0xFFFF00
-      priority: 1151
+      priority: 1149
     }
     lines {
       width: 2
@@ -4767,7 +4767,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1153
+      priority: 1151
     }
   }
   element {
@@ -4797,7 +4797,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11439
+      priority: 11438
     }
   }
   element {
@@ -4812,7 +4812,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11492
+      priority: 11490
     }
   }
   element {
@@ -4827,7 +4827,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11731
+      priority: 11730
     }
   }
   element {
@@ -4842,7 +4842,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11907
+      priority: 11906
     }
   }
   element {
@@ -4873,7 +4873,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11717
+      priority: 11715
     }
   }
   element {
@@ -4886,7 +4886,7 @@ cont {
         dd: 20
       }
       cap: BUTTCAP
-      priority: 11895
+      priority: 11894
     }
   }
   element {
@@ -4917,7 +4917,7 @@ cont {
         dd: 1
       }
       cap: BUTTCAP
-      priority: 11156
+      priority: 11154
     }
   }
   element {
@@ -4932,7 +4932,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 11156
+      priority: 11154
     }
   }
   element {
@@ -4962,7 +4962,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11451
+      priority: 11450
     }
   }
   element {
@@ -4977,7 +4977,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11504
+      priority: 11502
     }
   }
   element {
@@ -4992,7 +4992,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 11743
+      priority: 11742
     }
   }
   element {
@@ -5151,7 +5151,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80FFFFFF
-      priority: 1795
+      priority: 1794
     }
     lines {
       width: 0.4
@@ -5161,7 +5161,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1800
+      priority: 1799
     }
   }
   element {
@@ -5169,7 +5169,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80FFFFFF
-      priority: 1880
+      priority: 1879
     }
     lines {
       width: 0.8
@@ -5199,7 +5199,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1795
+      priority: 1794
     }
     lines {
       width: 0.4
@@ -5209,7 +5209,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1800
+      priority: 1799
     }
   }
   element {
@@ -5294,7 +5294,7 @@ cont {
         dd: 3
       }
       cap: BUTTCAP
-      priority: 1175
+      priority: 1174
     }
   }
   element {
@@ -5307,7 +5307,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1263
+      priority: 1262
     }
   }
   element {
@@ -5315,7 +5315,7 @@ cont {
     lines {
       width: 3.2
       color: 0xD3CB98
-      priority: 1351
+      priority: 1350
     }
   }
   element {
@@ -5324,14 +5324,14 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
     lines {
       width: 6.4
       color: 0xD3CB98
-      priority: 1578
+      priority: 1575
     }
   }
   element {
@@ -5345,7 +5345,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
@@ -5363,7 +5363,7 @@ cont {
         dd: 3
       }
       cap: BUTTCAP
-      priority: 1175
+      priority: 1174
     }
   }
   element {
@@ -5376,7 +5376,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1263
+      priority: 1262
     }
   }
   element {
@@ -5384,7 +5384,7 @@ cont {
     lines {
       width: 3.2
       color: 0xD3CB98
-      priority: 1351
+      priority: 1350
     }
   }
   element {
@@ -5393,7 +5393,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
@@ -5406,7 +5406,7 @@ cont {
     lines {
       width: 6.4
       color: 0xD3CB98
-      priority: 1578
+      priority: 1575
     }
     lines {
       width: 16.4
@@ -5426,7 +5426,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
@@ -5456,7 +5456,7 @@ cont {
         dd: 3
       }
       cap: BUTTCAP
-      priority: 1175
+      priority: 1174
     }
   }
   element {
@@ -5469,7 +5469,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1263
+      priority: 1262
     }
   }
   element {
@@ -5477,7 +5477,7 @@ cont {
     lines {
       width: 3.2
       color: 0xD3CB98
-      priority: 1351
+      priority: 1350
     }
   }
   element {
@@ -5486,14 +5486,14 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
     lines {
       width: 6.4
       color: 0xD3CB98
-      priority: 1578
+      priority: 1575
     }
   }
   element {
@@ -5507,7 +5507,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
@@ -5525,7 +5525,7 @@ cont {
         dd: 3
       }
       cap: BUTTCAP
-      priority: 1175
+      priority: 1174
     }
   }
   element {
@@ -5538,7 +5538,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1263
+      priority: 1262
     }
   }
   element {
@@ -5546,7 +5546,7 @@ cont {
     lines {
       width: 3.2
       color: 0xD3CB98
-      priority: 1351
+      priority: 1350
     }
   }
   element {
@@ -5555,14 +5555,14 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
     lines {
       width: 6.4
       color: 0xD3CB98
-      priority: 1578
+      priority: 1575
     }
   }
   element {
@@ -5576,7 +5576,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
@@ -5594,7 +5594,7 @@ cont {
         dd: 3
       }
       cap: BUTTCAP
-      priority: 1175
+      priority: 1174
     }
   }
   element {
@@ -5607,7 +5607,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1263
+      priority: 1262
     }
   }
   element {
@@ -5615,7 +5615,7 @@ cont {
     lines {
       width: 3.2
       color: 0xD3CB98
-      priority: 1351
+      priority: 1350
     }
   }
   element {
@@ -5624,7 +5624,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
@@ -5637,7 +5637,7 @@ cont {
     lines {
       width: 6.4
       color: 0xD3CB98
-      priority: 1578
+      priority: 1575
     }
     lines {
       width: 16.4
@@ -5661,7 +5661,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD3CB98
       }
       priority: 16000
     }
@@ -5691,14 +5691,14 @@ cont {
       name: "bus-mini"
       priority: 16017
     }
-    caption {
+    path_text {
       primary {
         height: 10
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 15017
+      priority: 16017
     }
   }
   element {
@@ -5707,14 +5707,14 @@ cont {
       name: "bus"
       priority: 16017
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 15017
+      priority: 16017
     }
   }
 }
@@ -5833,7 +5833,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -5849,7 +5849,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -5902,7 +5902,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -5930,7 +5930,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -5995,7 +5995,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -6011,7 +6011,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -6064,7 +6064,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -6080,7 +6080,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -6133,7 +6133,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -6165,7 +6165,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
       priority: 16024
     }
@@ -6194,7 +6194,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6202,15 +6202,15 @@ cont {
     lines {
       width: 2
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6218,15 +6218,15 @@ cont {
     lines {
       width: 3
       color: 0xC0BCAC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6237,7 +6237,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6245,15 +6245,15 @@ cont {
     lines {
       width: 1.2
       color: 0x0000FF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x0000FF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6261,15 +6261,15 @@ cont {
     lines {
       width: 3
       color: 0xC0BCAC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6279,7 +6279,7 @@ cont {
     scale: 15
     area {
       color: 0xD0CCBC
-      priority: 1022
+      priority: 1023
     }
   }
   element {
@@ -6288,13 +6288,13 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
     area {
       color: 0xD0CCBC
-      priority: 1022
+      priority: 1023
     }
   }
   element {
@@ -6303,13 +6303,13 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
     area {
       color: 0xC0BCAC
-      priority: 1022
+      priority: 1023
     }
   }
 }
@@ -6320,7 +6320,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6328,15 +6328,15 @@ cont {
     lines {
       width: 2
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 10
@@ -6356,15 +6356,15 @@ cont {
     lines {
       width: 3
       color: 0xC0BCAC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 11
@@ -6387,7 +6387,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6400,15 +6400,15 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x0000FF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6421,15 +6421,15 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6440,7 +6440,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6453,15 +6453,15 @@ cont {
         dd: 2.4
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6474,15 +6474,15 @@ cont {
         dd: 1.2
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6493,7 +6493,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6506,15 +6506,15 @@ cont {
         dd: 2.4
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x0000FF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6527,15 +6527,15 @@ cont {
         dd: 1.2
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6546,7 +6546,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6554,15 +6554,15 @@ cont {
     lines {
       width: 2
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6570,15 +6570,15 @@ cont {
     lines {
       width: 3
       color: 0xC0BCAC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6589,7 +6589,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6602,15 +6602,15 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFF0000
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6623,15 +6623,15 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFF0000
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6642,7 +6642,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6650,15 +6650,15 @@ cont {
     lines {
       width: 2
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6666,15 +6666,15 @@ cont {
     lines {
       width: 3
       color: 0xC0BCAC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6685,7 +6685,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6693,15 +6693,15 @@ cont {
     lines {
       width: 2
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6709,15 +6709,15 @@ cont {
     lines {
       width: 3
       color: 0xC0BCAC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6728,7 +6728,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6736,15 +6736,15 @@ cont {
     lines {
       width: 2
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6752,15 +6752,15 @@ cont {
     lines {
       width: 3
       color: 0xC0BCAC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -6771,7 +6771,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6779,15 +6779,15 @@ cont {
     lines {
       width: 2
       color: 0xD0CCBC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCBC
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 10
@@ -6811,15 +6811,15 @@ cont {
     lines {
       width: 3
       color: 0xC0BCAC
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0BCAC
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 11
@@ -6846,13 +6846,13 @@ cont {
     lines {
       width: 2.99
       color: 0x202020
-      priority: 168
+      priority: 166
       cap: BUTTCAP
     }
     lines {
       width: 2.75
       color: 0xCDE5EA
-      priority: 1168
+      priority: 1166
     }
   }
   element {
@@ -6860,13 +6860,13 @@ cont {
     lines {
       width: 4.5
       color: 0x101010
-      priority: 253
+      priority: 252
       cap: BUTTCAP
     }
     lines {
       width: 3.5
       color: 0xCDE5EA
-      priority: 1253
+      priority: 1252
     }
   }
   element {
@@ -6874,13 +6874,13 @@ cont {
     lines {
       width: 8.4
       color: 0x707070
-      priority: 346
+      priority: 345
       cap: BUTTCAP
     }
     lines {
       width: 7
       color: 0xCDE5EA
-      priority: 1346
+      priority: 1345
     }
   }
   element {
@@ -6888,13 +6888,13 @@ cont {
     lines {
       width: 10.4
       color: 0x707070
-      priority: 573
+      priority: 571
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0xCDE5EA
-      priority: 1573
+      priority: 1571
     }
   }
   element {
@@ -6902,13 +6902,13 @@ cont {
     lines {
       width: 13.2
       color: 0x707070
-      priority: 602
+      priority: 600
       cap: BUTTCAP
     }
     lines {
       width: 10
       color: 0xCDE5EA
-      priority: 1602
+      priority: 1600
     }
   }
 }
@@ -6919,7 +6919,7 @@ cont {
     lines {
       width: 1
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6927,13 +6927,13 @@ cont {
     lines {
       width: 5
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -6941,13 +6941,13 @@ cont {
     lines {
       width: 6
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 4
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -6955,7 +6955,7 @@ cont {
         color: 0x202020
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6963,13 +6963,13 @@ cont {
     lines {
       width: 10
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -6977,7 +6977,7 @@ cont {
         color: 0x606060
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -6985,13 +6985,13 @@ cont {
     lines {
       width: 12
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -6999,7 +6999,7 @@ cont {
         color: 0x606060
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -7010,7 +7010,7 @@ cont {
     lines {
       width: 1
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -7018,13 +7018,13 @@ cont {
     lines {
       width: 5
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -7032,13 +7032,13 @@ cont {
     lines {
       width: 6
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 4
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -7046,7 +7046,7 @@ cont {
         color: 0x202020
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -7054,13 +7054,13 @@ cont {
     lines {
       width: 10
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -7068,7 +7068,7 @@ cont {
         color: 0x606060
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 14
@@ -7088,13 +7088,13 @@ cont {
     lines {
       width: 12
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -7102,7 +7102,7 @@ cont {
         color: 0x606060
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 16
@@ -7125,7 +7125,7 @@ cont {
     lines {
       width: 1
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -7133,13 +7133,13 @@ cont {
     lines {
       width: 5
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -7147,13 +7147,13 @@ cont {
     lines {
       width: 6
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 4
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -7161,7 +7161,7 @@ cont {
         color: 0x202020
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -7169,13 +7169,13 @@ cont {
     lines {
       width: 10
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 6
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -7183,7 +7183,7 @@ cont {
         color: 0x606060
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 14
@@ -7207,13 +7207,13 @@ cont {
     lines {
       width: 12
       color: 0xC8C8AF
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 8
       color: 0xFFFFFF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
@@ -7221,7 +7221,7 @@ cont {
         color: 0x606060
         stroke_color: 0xFFFFFF
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 16
@@ -7342,13 +7342,13 @@ cont {
     lines {
       width: 16
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 12
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
   }
   element {
@@ -7364,13 +7364,13 @@ cont {
     lines {
       width: 20
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 16
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
   }
   element {
@@ -7386,13 +7386,13 @@ cont {
     lines {
       width: 20
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 16
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
   }
   element {
@@ -7519,13 +7519,13 @@ cont {
     lines {
       width: 16
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 12
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
   }
   element {
@@ -7541,13 +7541,13 @@ cont {
     lines {
       width: 20
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 16
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
   }
   element {
@@ -7569,13 +7569,13 @@ cont {
     lines {
       width: 20
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 16
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
     lines {
       width: 26
@@ -7720,13 +7720,13 @@ cont {
     lines {
       width: 16
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 12
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
   }
   element {
@@ -7742,13 +7742,13 @@ cont {
     lines {
       width: 20
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 16
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
   }
   element {
@@ -7770,13 +7770,13 @@ cont {
     lines {
       width: 20
       color: 0xB87C04
-      priority: 504
+      priority: 502
       cap: BUTTCAP
     }
     lines {
       width: 16
       color: 0xF08800
-      priority: 1504
+      priority: 1502
     }
     lines {
       width: 26
@@ -7888,10 +7888,26 @@ cont {
 }
 cont {
   name: "highway-motorway_link"
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xF08800
+      priority: 1039
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xF08800
+      priority: 1039
+    }
+  }
   element {
     scale: 14
     lines {
-      width: 5.5
+      width: 4
       color: 0xF08800
       priority: 1039
     }
@@ -7899,26 +7915,26 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
   }
   element {
     scale: 15
+    lines {
+      width: 8
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
-    lines {
-      width: 9
-      color: 0xF08800
-      priority: 1485
-    }
   }
   element {
     scale: 16
@@ -7931,7 +7947,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
@@ -7947,7 +7963,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
@@ -7955,10 +7971,26 @@ cont {
 }
 cont {
   name: "highway-motorway_link-bridge"
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xF08800
+      priority: 1039
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xF08800
+      priority: 1039
+    }
+  }
   element {
     scale: 14
     lines {
-      width: 5.5
+      width: 4
       color: 0xF08800
       priority: 1039
     }
@@ -7966,26 +7998,26 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
   }
   element {
     scale: 15
+    lines {
+      width: 8
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
-    lines {
-      width: 9
-      color: 0xF08800
-      priority: 1485
-    }
   }
   element {
     scale: 16
@@ -7998,7 +8030,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
@@ -8026,7 +8058,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
@@ -8046,10 +8078,26 @@ cont {
 }
 cont {
   name: "highway-motorway_link-tunnel"
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xF08800
+      priority: 1039
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xF08800
+      priority: 1039
+    }
+  }
   element {
     scale: 14
     lines {
-      width: 5.5
+      width: 4
       color: 0xF08800
       priority: 1039
     }
@@ -8057,26 +8105,26 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
   }
   element {
     scale: 15
+    lines {
+      width: 8
+      color: 0xF08800
+      priority: 1039
+    }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
-    lines {
-      width: 9
-      color: 0xF08800
-      priority: 1485
-    }
   }
   element {
     scale: 16
@@ -8089,7 +8137,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
@@ -8121,7 +8169,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xF08800
       }
       priority: 16039
     }
@@ -8150,7 +8198,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8158,15 +8206,15 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8174,15 +8222,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8193,7 +8241,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8201,15 +8249,15 @@ cont {
     lines {
       width: 1.2
       color: 0x0000FF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x0000FF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8217,15 +8265,15 @@ cont {
     lines {
       width: 0.8
       color: 0x0000FF
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x0000FF
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8236,7 +8284,7 @@ cont {
     lines {
       width: 1
       color: 0x90BC90
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8244,15 +8292,15 @@ cont {
     lines {
       width: 2
       color: 0x90BC90
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8260,15 +8308,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8279,7 +8327,7 @@ cont {
     lines {
       width: 1
       color: 0x90BC90
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8287,15 +8335,15 @@ cont {
     lines {
       width: 2
       color: 0x90BC90
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 10
@@ -8315,15 +8363,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 11
@@ -8346,7 +8394,7 @@ cont {
     lines {
       width: 1
       color: 0x90BC90
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8354,15 +8402,15 @@ cont {
     lines {
       width: 2
       color: 0x90BC90
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x90BC90
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 10
@@ -8386,15 +8434,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 11
@@ -8421,7 +8469,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8429,15 +8477,15 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 10
@@ -8457,15 +8505,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 11
@@ -8488,7 +8536,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8501,15 +8549,15 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x0000FF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8522,15 +8570,15 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8541,7 +8589,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8554,15 +8602,15 @@ cont {
         dd: 2.4
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8575,15 +8623,15 @@ cont {
         dd: 1.2
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8594,7 +8642,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8607,15 +8655,15 @@ cont {
         dd: 2.4
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x0000FF
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8628,15 +8676,15 @@ cont {
         dd: 1.2
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0x0000FF
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8647,7 +8695,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8655,15 +8703,15 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8671,15 +8719,15 @@ cont {
     lines {
       width: 0.8
       color: 0xFF0000
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFF0000
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8690,7 +8738,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8698,15 +8746,15 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8714,15 +8762,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8733,7 +8781,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8746,15 +8794,15 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8767,15 +8815,15 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8786,7 +8834,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8794,15 +8842,15 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8810,15 +8858,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8829,7 +8877,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8837,15 +8885,15 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8853,15 +8901,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8872,7 +8920,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8880,15 +8928,15 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -8896,15 +8944,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -8915,7 +8963,7 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8923,15 +8971,15 @@ cont {
     lines {
       width: 2
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 10
@@ -8955,15 +9003,15 @@ cont {
     lines {
       width: 3
       color: 0xC0C0C0
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0C0C0
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 11
@@ -8990,7 +9038,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCAC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -8998,13 +9046,13 @@ cont {
     lines {
       width: 5
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -9012,21 +9060,21 @@ cont {
     lines {
       width: 6
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 4
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xE8E8E8
       }
-      priority: 16021
+      priority: 16022
     }
   }
   element {
@@ -9034,21 +9082,21 @@ cont {
     lines {
       width: 9
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 7
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xE8E8E8
       }
-      priority: 16021
+      priority: 16022
     }
   }
 }
@@ -9058,14 +9106,14 @@ cont {
     scale: 14
     area {
       color: 0xD0CCAC
-      priority: 1022
+      priority: 1023
     }
   }
   element {
     scale: 15
     area {
       color: 0xE8E8E8
-      priority: 1022
+      priority: 1023
     }
   }
   element {
@@ -9074,13 +9122,13 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xE8E8E8
       }
-      priority: 16021
+      priority: 16022
     }
     area {
       color: 0xE8E8E8
-      priority: 1022
+      priority: 1023
     }
   }
   element {
@@ -9089,13 +9137,13 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xE8E8E8
       }
-      priority: 16021
+      priority: 16022
     }
     area {
       color: 0xE8E8E8
-      priority: 1022
+      priority: 1023
     }
   }
 }
@@ -9106,7 +9154,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCAC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -9114,13 +9162,13 @@ cont {
     lines {
       width: 5
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -9128,21 +9176,21 @@ cont {
     lines {
       width: 6
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 4
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xE8E8E8
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 12
@@ -9162,21 +9210,21 @@ cont {
     lines {
       width: 9
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 7
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xE8E8E8
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 15
@@ -9199,7 +9247,7 @@ cont {
     lines {
       width: 1
       color: 0xD0CCAC
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -9207,13 +9255,13 @@ cont {
     lines {
       width: 5
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 3
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
   }
   element {
@@ -9221,21 +9269,21 @@ cont {
     lines {
       width: 6
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 4
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xE8E8E8
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 12
@@ -9259,21 +9307,21 @@ cont {
     lines {
       width: 9
       color: 0xC0BC9C
-      priority: 21
+      priority: 22
       cap: BUTTCAP
     }
     lines {
       width: 7
       color: 0xE8E8E8
-      priority: 1021
+      priority: 1022
     }
     path_text {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xE8E8E8
       }
-      priority: 16021
+      priority: 16022
     }
     lines {
       width: 15
@@ -9295,38 +9343,11 @@ cont {
 }
 cont {
   name: "highway-primary"
-  element {
-    scale: 7
-    lines {
-      width: 1
-      color: 0xEED4A6
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 2
-      color: 0xF7D396
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 2
-      color: 0xFFC444
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
   element {
     scale: 10
     lines {
-      width: 3
-      color: 0xFFC444
+      width: 1
+      color: 0xFDE066
       cap: BUTTCAP
       priority: 1036
     }
@@ -9334,8 +9355,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 3
-      color: 0xFFC444
+      width: 2
+      color: 0xFDE066
       cap: BUTTCAP
       priority: 1036
     }
@@ -9350,14 +9371,14 @@ cont {
     }
     lines {
       width: 3
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9372,14 +9393,14 @@ cont {
     }
     lines {
       width: 5
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9394,14 +9415,14 @@ cont {
     }
     lines {
       width: 7
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 14
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9416,17 +9437,9 @@ cont {
     }
     lines {
       width: 8
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16036
-    }
   }
   element {
     scale: 16
@@ -9438,14 +9451,14 @@ cont {
     }
     lines {
       width: 14
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 17
         color: 0x404040
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9460,14 +9473,14 @@ cont {
     }
     lines {
       width: 16
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 17
         color: 0x404040
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9475,38 +9488,11 @@ cont {
 }
 cont {
   name: "highway-primary-bridge"
-  element {
-    scale: 7
-    lines {
-      width: 1
-      color: 0xEED4A6
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 2
-      color: 0xF7D396
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 2
-      color: 0xFFC444
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
   element {
     scale: 10
     lines {
-      width: 3
-      color: 0xFFC444
+      width: 1
+      color: 0xFDE066
       cap: BUTTCAP
       priority: 1036
     }
@@ -9514,8 +9500,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 3
-      color: 0xFFC444
+      width: 2
+      color: 0xFDE066
       cap: BUTTCAP
       priority: 1036
     }
@@ -9530,14 +9516,14 @@ cont {
     }
     lines {
       width: 3
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9552,14 +9538,14 @@ cont {
     }
     lines {
       width: 5
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9574,14 +9560,14 @@ cont {
     }
     lines {
       width: 7
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 14
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9596,17 +9582,9 @@ cont {
     }
     lines {
       width: 8
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16036
-    }
   }
   element {
     scale: 16
@@ -9618,14 +9596,14 @@ cont {
     }
     lines {
       width: 14
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 17
         color: 0x404040
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9652,14 +9630,14 @@ cont {
     }
     lines {
       width: 16
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 17
         color: 0x404040
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9679,38 +9657,11 @@ cont {
 }
 cont {
   name: "highway-primary-tunnel"
-  element {
-    scale: 7
-    lines {
-      width: 1
-      color: 0xEED4A6
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 2
-      color: 0xF7D396
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 2
-      color: 0xFFC444
-      cap: BUTTCAP
-      priority: 1036
-    }
-  }
   element {
     scale: 10
     lines {
-      width: 3
-      color: 0xFFC444
+      width: 1
+      color: 0xFDE066
       cap: BUTTCAP
       priority: 1036
     }
@@ -9718,8 +9669,8 @@ cont {
   element {
     scale: 11
     lines {
-      width: 3
-      color: 0xFFC444
+      width: 2
+      color: 0xFDE066
       cap: BUTTCAP
       priority: 1036
     }
@@ -9734,14 +9685,14 @@ cont {
     }
     lines {
       width: 3
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9756,14 +9707,14 @@ cont {
     }
     lines {
       width: 5
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9778,14 +9729,14 @@ cont {
     }
     lines {
       width: 7
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 14
         color: 0x303030
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9800,17 +9751,9 @@ cont {
     }
     lines {
       width: 8
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16036
-    }
   }
   element {
     scale: 16
@@ -9822,14 +9765,14 @@ cont {
     }
     lines {
       width: 14
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 17
         color: 0x404040
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9860,14 +9803,14 @@ cont {
     }
     lines {
       width: 16
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 17
         color: 0x404040
-        stroke_color: 0xFFC444
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9891,27 +9834,35 @@ cont {
 }
 cont {
   name: "highway-primary_link"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFDE066
+      priority: 1036
+    }
+  }
   element {
     scale: 11
     lines {
-      width: 1.62
-      color: 0xFFC444
+      width: 1
+      color: 0xFDE066
       priority: 1036
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.69
-      color: 0xFFC444
+      width: 3
+      color: 0xFDE066
       priority: 1036
     }
   }
   element {
     scale: 13
     lines {
-      width: 2.75
-      color: 0xFFC444
+      width: 3
+      color: 0xFDE066
       priority: 1036
     }
   }
@@ -9919,14 +9870,14 @@ cont {
     scale: 14
     lines {
       width: 4.5
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9935,14 +9886,14 @@ cont {
     scale: 15
     lines {
       width: 9
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9951,14 +9902,14 @@ cont {
     scale: 16
     lines {
       width: 12
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9967,14 +9918,14 @@ cont {
     scale: 17
     lines {
       width: 12
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -9982,27 +9933,35 @@ cont {
 }
 cont {
   name: "highway-primary_link-bridge"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFDE066
+      priority: 1036
+    }
+  }
   element {
     scale: 11
     lines {
-      width: 1.62
-      color: 0xFFC444
+      width: 1
+      color: 0xFDE066
       priority: 1036
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.69
-      color: 0xFFC444
+      width: 3
+      color: 0xFDE066
       priority: 1036
     }
   }
   element {
     scale: 13
     lines {
-      width: 2.75
-      color: 0xFFC444
+      width: 3
+      color: 0xFDE066
       priority: 1036
     }
   }
@@ -10010,14 +9969,14 @@ cont {
     scale: 14
     lines {
       width: 4.5
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -10026,14 +9985,14 @@ cont {
     scale: 15
     lines {
       width: 9
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -10042,14 +10001,14 @@ cont {
     scale: 16
     lines {
       width: 12
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -10070,14 +10029,14 @@ cont {
     scale: 17
     lines {
       width: 12
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -10097,27 +10056,35 @@ cont {
 }
 cont {
   name: "highway-primary_link-tunnel"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFDE066
+      priority: 1036
+    }
+  }
   element {
     scale: 11
     lines {
-      width: 1.62
-      color: 0xFFC444
+      width: 1
+      color: 0xFDE066
       priority: 1036
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.69
-      color: 0xFFC444
+      width: 3
+      color: 0xFDE066
       priority: 1036
     }
   }
   element {
     scale: 13
     lines {
-      width: 2.75
-      color: 0xFFC444
+      width: 3
+      color: 0xFDE066
       priority: 1036
     }
   }
@@ -10125,14 +10092,14 @@ cont {
     scale: 14
     lines {
       width: 4.5
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -10141,14 +10108,14 @@ cont {
     scale: 15
     lines {
       width: 9
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -10157,14 +10124,14 @@ cont {
     scale: 16
     lines {
       width: 12
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -10189,14 +10156,14 @@ cont {
     scale: 17
     lines {
       width: 12
-      color: 0xFFC444
+      color: 0xFDE066
       priority: 1036
     }
     path_text {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFDE066
       }
       priority: 16036
     }
@@ -10218,6 +10185,22 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-proposed"
+  element {
+    scale: 17
+    lines {
+      width: 10
+      color: 0xD0D0D0
+      dashdot {
+        dd: 4
+        dd: 4
+      }
+      cap: BUTTCAP
+      priority: 1000
+    }
+  }
+}
 cont {
   name: "highway-raceway"
   element {
@@ -10225,7 +10208,7 @@ cont {
     lines {
       width: 0.38
       color: 0xE8E4D4
-      priority: 1158
+      priority: 1156
     }
   }
   element {
@@ -10233,7 +10216,7 @@ cont {
     lines {
       width: 0.75
       color: 0xE8E4D4
-      priority: 1170
+      priority: 1169
     }
   }
   element {
@@ -10241,7 +10224,7 @@ cont {
     lines {
       width: 3
       color: 0xE8E4D4
-      priority: 1256
+      priority: 1254
     }
   }
   element {
@@ -10249,7 +10232,7 @@ cont {
     lines {
       width: 3.4
       color: 0xFFFFFF
-      priority: 1163
+      priority: 1161
     }
     lines {
       width: 3.4
@@ -10259,7 +10242,7 @@ cont {
         dd: 0.4
       }
       cap: BUTTCAP
-      priority: 1165
+      priority: 1164
     }
   }
   element {
@@ -10267,7 +10250,7 @@ cont {
     lines {
       width: 12
       color: 0xE8E4D4
-      priority: 1575
+      priority: 1573
     }
     lines {
       width: 6.8
@@ -10277,12 +10260,12 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1456
+      priority: 1455
     }
     lines {
       width: 6
       color: 0xE8E4D4
-      priority: 1580
+      priority: 1578
     }
   }
   element {
@@ -10305,7 +10288,7 @@ cont {
     lines {
       width: 12
       color: 0xE8E4D4
-      priority: 1624
+      priority: 1622
     }
   }
 }
@@ -10804,7 +10787,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10820,7 +10803,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10836,7 +10819,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10852,7 +10835,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10871,7 +10854,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10887,7 +10870,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10903,7 +10886,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10931,7 +10914,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10962,7 +10945,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10978,7 +10961,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -10994,7 +10977,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -11026,7 +11009,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0D0D0
       }
       priority: 16000
     }
@@ -11535,6 +11518,38 @@ cont {
 }
 cont {
   name: "highway-secondary_link"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
   element {
     scale: 14
     lines {
@@ -11546,7 +11561,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11562,7 +11577,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11578,7 +11593,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11594,7 +11609,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11602,6 +11617,38 @@ cont {
 }
 cont {
   name: "highway-secondary_link-bridge"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
   element {
     scale: 14
     lines {
@@ -11613,7 +11660,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11629,7 +11676,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11645,7 +11692,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11673,7 +11720,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11693,6 +11740,38 @@ cont {
 }
 cont {
   name: "highway-secondary_link-tunnel"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xFFFB80
+      priority: 1034
+    }
+  }
   element {
     scale: 14
     lines {
@@ -11704,7 +11783,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11720,7 +11799,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11736,7 +11815,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -11768,7 +11847,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFB80
       }
       priority: 16034
     }
@@ -12335,7 +12414,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCAC
       }
       priority: 16026
     }
@@ -12347,7 +12426,7 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
   }
   element {
@@ -12361,7 +12440,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCAC
       }
       priority: 16026
     }
@@ -12373,7 +12452,7 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1737
     }
   }
 }
@@ -12411,7 +12490,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCAC
       }
       priority: 16026
     }
@@ -12429,7 +12508,7 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 14
@@ -12449,7 +12528,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCAC
       }
       priority: 16026
     }
@@ -12467,7 +12546,7 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1737
     }
     lines {
       width: 14
@@ -12511,7 +12590,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCAC
       }
       priority: 16026
     }
@@ -12529,7 +12608,7 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 14
@@ -12553,7 +12632,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD0CCAC
       }
       priority: 16026
     }
@@ -12571,7 +12650,7 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1737
     }
     lines {
       width: 14
@@ -13003,7 +13082,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.44
+      width: 1
       color: 0xFFFF90
       priority: 1031
     }
@@ -13035,7 +13114,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13051,7 +13130,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13067,7 +13146,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13078,7 +13157,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.44
+      width: 1
       color: 0xFFFF90
       priority: 1031
     }
@@ -13110,7 +13189,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13126,7 +13205,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13154,7 +13233,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13177,7 +13256,7 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.44
+      width: 1
       color: 0xFFFF90
       priority: 1031
     }
@@ -13209,7 +13288,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13225,7 +13304,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13257,7 +13336,7 @@ cont {
       primary {
         height: 12
         color: 0x202020
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xFFFF90
       }
       priority: 16031
     }
@@ -13326,7 +13405,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13342,7 +13421,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13377,7 +13456,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13392,7 +13471,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13449,7 +13528,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13477,7 +13556,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13550,7 +13629,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13566,7 +13645,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xD79331
       }
       priority: 16024
     }
@@ -13632,7 +13711,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13648,7 +13727,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13714,7 +13793,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13730,7 +13809,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13796,7 +13875,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13812,7 +13891,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13878,7 +13957,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13894,7 +13973,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13960,7 +14039,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -13976,7 +14055,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14046,7 +14125,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14062,7 +14141,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14132,7 +14211,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14148,7 +14227,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14218,7 +14297,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14234,7 +14313,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14304,7 +14383,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14320,7 +14399,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14386,7 +14465,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14402,7 +14481,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14468,7 +14547,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14484,7 +14563,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14550,7 +14629,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14566,7 +14645,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14632,7 +14711,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14648,7 +14727,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14701,7 +14780,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14717,7 +14796,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14770,7 +14849,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14786,7 +14865,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14839,7 +14918,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14855,7 +14934,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14908,7 +14987,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -14940,7 +15019,7 @@ cont {
       primary {
         height: 12
         color: 0x606060
-        stroke_color: 0xFFFFFF
+        stroke_color: 0xC0A87C
       }
       priority: 16024
     }
@@ -15088,14 +15167,6 @@ cont {
       color: 0xFFC444
       priority: 1041
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16041
-    }
   }
   element {
     scale: 16
@@ -15268,14 +15339,6 @@ cont {
       color: 0xFFC444
       priority: 1041
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16041
-    }
   }
   element {
     scale: 16
@@ -15472,14 +15535,6 @@ cont {
       color: 0xFFC444
       priority: 1041
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16041
-    }
   }
   element {
     scale: 16
@@ -15560,6 +15615,52 @@ cont {
 }
 cont {
   name: "highway-trunk_link"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 6
+      color: 0xD8A050
+      priority: 41
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
   element {
     scale: 15
     lines {
@@ -15573,14 +15674,6 @@ cont {
       color: 0xFFC444
       priority: 1041
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16041
-    }
   }
   element {
     scale: 16
@@ -15629,6 +15722,52 @@ cont {
 }
 cont {
   name: "highway-trunk_link-bridge"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 6
+      color: 0xD8A050
+      priority: 41
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
   element {
     scale: 15
     lines {
@@ -15642,14 +15781,6 @@ cont {
       color: 0xFFC444
       priority: 1041
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16041
-    }
   }
   element {
     scale: 16
@@ -15722,6 +15853,52 @@ cont {
 }
 cont {
   name: "highway-trunk_link-tunnel"
+  element {
+    scale: 10
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 11
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 12
+    lines {
+      width: 1
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 13
+    lines {
+      width: 2
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
+  element {
+    scale: 14
+    lines {
+      width: 6
+      color: 0xD8A050
+      priority: 41
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4
+      color: 0xFFC444
+      priority: 1041
+    }
+  }
   element {
     scale: 15
     lines {
@@ -15735,14 +15912,6 @@ cont {
       color: 0xFFC444
       priority: 1041
     }
-    path_text {
-      primary {
-        height: 16
-        color: 0x303030
-        stroke_color: 0xFFC444
-      }
-      priority: 16041
-    }
   }
   element {
     scale: 16
@@ -16532,21 +16701,21 @@ cont {
     scale: 12
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 13
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 14
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -16560,7 +16729,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -16574,7 +16743,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -16588,7 +16757,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -17107,21 +17276,21 @@ cont {
   element {
     scale: 12
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16101
     }
   }
   element {
     scale: 13
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16102
     }
   }
   element {
     scale: 14
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16103
     }
   }
@@ -17135,7 +17304,7 @@ cont {
       priority: 15000
     }
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16104
     }
   }
@@ -17149,7 +17318,7 @@ cont {
       priority: 15000
     }
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16105
     }
   }
@@ -17163,7 +17332,7 @@ cont {
       priority: 15000
     }
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16106
     }
   }
@@ -17173,21 +17342,21 @@ cont {
   element {
     scale: 12
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16107
     }
   }
   element {
     scale: 13
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16108
     }
   }
   element {
     scale: 14
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16109
     }
   }
@@ -17201,7 +17370,7 @@ cont {
       priority: 15000
     }
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16110
     }
   }
@@ -17215,7 +17384,7 @@ cont {
       priority: 15000
     }
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16111
     }
   }
@@ -17229,7 +17398,7 @@ cont {
       priority: 15000
     }
     area {
-      color: 0xD0E8C4
+      color: 0xDFDF97
       priority: -16112
     }
   }
@@ -18371,21 +18540,21 @@ cont {
     scale: 12
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 13
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 14
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -18399,7 +18568,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -18413,7 +18582,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -18427,7 +18596,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -19653,35 +19822,35 @@ cont {
     scale: 13
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 14
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 15
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 16
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 17
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -19837,7 +20006,7 @@ cont {
     lines {
       width: 4
       color: 0x707070
-      priority: 1773
+      priority: 1772
     }
   }
   element {
@@ -19845,7 +20014,7 @@ cont {
     lines {
       width: 6.4
       color: 0x707070
-      priority: 1856
+      priority: 1855
     }
   }
 }
@@ -19872,7 +20041,7 @@ cont {
         dd: 3
       }
       cap: BUTTCAP
-      priority: 1160
+      priority: 1159
     }
   }
   element {
@@ -19885,7 +20054,7 @@ cont {
         dd: 3
       }
       cap: BUTTCAP
-      priority: 1173
+      priority: 1171
     }
   }
   element {
@@ -19898,7 +20067,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1260
+      priority: 1259
     }
   }
   element {
@@ -19922,7 +20091,7 @@ cont {
     lines {
       width: 1
       color: 0xB0AC8C
-      priority: 1275
+      priority: 1274
     }
   }
   element {
@@ -19938,7 +20107,7 @@ cont {
     lines {
       width: 3
       color: 0xB0AC8C
-      priority: 1275
+      priority: 1274
     }
   }
 }
@@ -19959,12 +20128,12 @@ cont {
     lines {
       width: 0.1
       color: 0xD0D0D0
-      priority: 1468
+      priority: 1465
     }
     lines {
       width: 0.6
       color: 0xE4E4E4
-      priority: 1470
+      priority: 1468
     }
     lines {
       width: 0.8
@@ -19977,17 +20146,17 @@ cont {
     lines {
       width: 0.2
       color: 0xD0D0D0
-      priority: 1614
+      priority: 1612
     }
     lines {
       width: 1.2
       color: 0xE4E4E4
-      priority: 1619
+      priority: 1617
     }
     lines {
       width: 1.6
       color: 0xD0D0D0
-      priority: 1617
+      priority: 1615
     }
   }
   element {
@@ -19995,12 +20164,12 @@ cont {
     lines {
       width: 0.4
       color: 0xD0D0D0
-      priority: 1775
+      priority: 1774
     }
     lines {
       width: 2.4
       color: 0xE4E4E4
-      priority: 1778
+      priority: 1776
     }
     lines {
       width: 3.2
@@ -20013,12 +20182,12 @@ cont {
     lines {
       width: 0.4
       color: 0xD0D0D0
-      priority: 1858
+      priority: 1857
     }
     lines {
       width: 2.4
       color: 0xE4E4E4
-      priority: 1863
+      priority: 1862
     }
     lines {
       width: 3.2
@@ -20034,7 +20203,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80FFFFFF
-      priority: 1802
+      priority: 1801
     }
     lines {
       width: 0.8
@@ -20048,7 +20217,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1807
+      priority: 1806
     }
   }
   element {
@@ -20086,7 +20255,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1802
+      priority: 1801
     }
     lines {
       width: 0.8
@@ -20100,7 +20269,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1807
+      priority: 1806
     }
   }
   element {
@@ -20306,7 +20475,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -20320,7 +20489,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -20334,7 +20503,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -20348,7 +20517,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -20452,126 +20621,126 @@ cont {
     scale: 0
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 1
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 2
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 3
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 4
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 5
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 6
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 7
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 8
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 9
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 10
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 11
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 12
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 13
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 14
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 15
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 16
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 17
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -20764,60 +20933,32 @@ cont {
 }
 cont {
   name: "natural-lake"
-  element {
-    scale: 6
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
   element {
     scale: 10
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 11
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 12
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 13
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -20831,7 +20972,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -20845,7 +20986,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -20859,7 +21000,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -20873,7 +21014,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -21117,46 +21258,18 @@ cont {
 }
 cont {
   name: "natural-pond"
-  element {
-    scale: 6
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
   element {
     scale: 10
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 11
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -21170,7 +21283,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -21184,7 +21297,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -21198,28 +21311,28 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 15
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 16
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 17
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -21305,12 +21418,12 @@ cont {
   name: "natural-spring"
   element {
     scale: 14
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0x507CEA
       }
-      priority: 16000
+      priority: 15000
     }
     lines {
       width: 4
@@ -21325,12 +21438,12 @@ cont {
       color: 0xCDE5EA
       priority: 1000
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0x507CEA
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
@@ -21340,12 +21453,12 @@ cont {
       color: 0xCDE5EA
       priority: 1000
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0x507CEA
       }
-      priority: 16000
+      priority: 15000
     }
   }
   element {
@@ -21355,12 +21468,12 @@ cont {
       color: 0xCDE5EA
       priority: 1000
     }
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0x507CEA
       }
-      priority: 16000
+      priority: 15000
     }
   }
 }
@@ -21495,60 +21608,32 @@ cont {
 }
 cont {
   name: "natural-water"
-  element {
-    scale: 6
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
   element {
     scale: 10
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 11
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 12
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 13
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -21562,7 +21647,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -21576,7 +21661,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -21590,7 +21675,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
@@ -21604,7 +21689,7 @@ cont {
     }
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -21953,12 +22038,12 @@ cont {
   name: "piste:lift-j-bar"
   element {
     scale: 14
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0x202020
       }
-      priority: 16000
+      priority: 15000
     }
     lines {
       width: 0.4
@@ -21991,7 +22076,7 @@ cont {
         dd: 40
       }
       cap: BUTTCAP
-      priority: 1582
+      priority: 1580
     }
   }
   element {
@@ -22009,7 +22094,7 @@ cont {
         dd: 40
       }
       cap: BUTTCAP
-      priority: 1582
+      priority: 1580
     }
   }
   element {
@@ -22027,7 +22112,7 @@ cont {
         dd: 40
       }
       cap: BUTTCAP
-      priority: 1582
+      priority: 1580
     }
   }
 }
@@ -22062,12 +22147,12 @@ cont {
   name: "piste:lift-platter"
   element {
     scale: 14
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0x202020
       }
-      priority: 16000
+      priority: 15000
     }
     lines {
       width: 4
@@ -22096,7 +22181,7 @@ cont {
       width: 8
       color: 0x202020
       dashdot {
-        dd: 0.8
+        dd: 1
         dd: 40
       }
       cap: BUTTCAP
@@ -22114,7 +22199,7 @@ cont {
       width: 8
       color: 0x202020
       dashdot {
-        dd: 0.8
+        dd: 1
         dd: 40
       }
       cap: BUTTCAP
@@ -22132,7 +22217,7 @@ cont {
       width: 8
       color: 0x202020
       dashdot {
-        dd: 0.8
+        dd: 1
         dd: 40
       }
       cap: BUTTCAP
@@ -22152,7 +22237,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1587
+      priority: 1585
     }
   }
   element {
@@ -22186,12 +22271,12 @@ cont {
   name: "piste:lift-t-bar"
   element {
     scale: 14
-    path_text {
+    caption {
       primary {
         height: 12
         color: 0x202020
       }
-      priority: 16000
+      priority: 15000
     }
     lines {
       width: 0.4
@@ -22664,7 +22749,7 @@ cont {
     lines {
       width: 10
       color: 0xF0E0DC
-      priority: 1760
+      priority: 1759
     }
   }
   element {
@@ -23338,26 +23423,6 @@ cont {
 }
 cont {
   name: "place-island"
-  element {
-    scale: 8
-    caption {
-      primary {
-        height: 12
-        color: 0x505050
-      }
-      priority: 15000
-    }
-  }
-  element {
-    scale: 9
-    caption {
-      primary {
-        height: 12
-        color: 0x505050
-      }
-      priority: 15000
-    }
-  }
   element {
     scale: 10
     caption {
@@ -24158,7 +24223,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80FFFFFF
-      priority: 1780
+      priority: 1779
     }
     lines {
       width: 0.8
@@ -24168,7 +24233,7 @@ cont {
         dd: 8
       }
       cap: BUTTCAP
-      priority: 1785
+      priority: 1784
     }
   }
   element {
@@ -24176,7 +24241,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80FFFFFF
-      priority: 1780
+      priority: 1779
     }
     lines {
       width: 0.8
@@ -24186,7 +24251,7 @@ cont {
         dd: 8
       }
       cap: BUTTCAP
-      priority: 1785
+      priority: 1784
     }
   }
 }
@@ -24206,7 +24271,7 @@ cont {
         dd: 8.8
       }
       cap: BUTTCAP
-      priority: 1782
+      priority: 1781
     }
     lines {
       width: 0.8
@@ -24216,7 +24281,7 @@ cont {
         dd: 8
       }
       cap: BUTTCAP
-      priority: 1785
+      priority: 1784
     }
   }
   element {
@@ -24233,7 +24298,7 @@ cont {
         dd: 8.8
       }
       cap: BUTTCAP
-      priority: 1782
+      priority: 1781
     }
     lines {
       width: 0.8
@@ -24243,7 +24308,7 @@ cont {
         dd: 8
       }
       cap: BUTTCAP
-      priority: 1785
+      priority: 1784
     }
   }
 }
@@ -24254,7 +24319,7 @@ cont {
     lines {
       width: 1.6
       color: 0x80FFFFFF
-      priority: 1787
+      priority: 1786
     }
     lines {
       width: 0.8
@@ -24264,7 +24329,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1792
+      priority: 1791
     }
     lines {
       width: 0.8
@@ -24278,7 +24343,7 @@ cont {
         dd: 4.4
       }
       cap: BUTTCAP
-      priority: 1790
+      priority: 1789
     }
   }
   element {
@@ -24296,7 +24361,7 @@ cont {
         dd: 4
       }
       cap: BUTTCAP
-      priority: 1868
+      priority: 1867
     }
     lines {
       width: 0.8
@@ -24417,7 +24482,7 @@ cont {
     lines {
       width: 0.25
       color: 0xb3B2B2B2
-      priority: 1212
+      priority: 1210
     }
   }
   element {
@@ -24425,7 +24490,7 @@ cont {
     lines {
       width: 0.55
       color: 0xb3B2B2B2
-      priority: 1229
+      priority: 1227
     }
   }
   element {
@@ -24433,7 +24498,7 @@ cont {
     lines {
       width: 1.6
       color: 0x99B2B2B2
-      priority: 1180
+      priority: 1178
     }
     lines {
       width: 1
@@ -24443,12 +24508,12 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1319
+      priority: 1318
     }
     lines {
       width: 1
       color: 0x99FFFFFF
-      priority: 1285
+      priority: 1284
     }
   }
   element {
@@ -24456,7 +24521,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1290
+      priority: 1289
     }
     lines {
       width: 2
@@ -24466,12 +24531,12 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1395
+      priority: 1394
     }
     lines {
       width: 2
       color: 0x99FFFFFF
-      priority: 1368
+      priority: 1367
     }
   }
   element {
@@ -24479,7 +24544,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1514
+      priority: 1512
     }
     lines {
       width: 2.4
@@ -24489,12 +24554,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1643
+      priority: 1642
     }
     lines {
       width: 2.4
       color: 0x99FFFFFF
-      priority: 1612
+      priority: 1610
     }
   }
   element {
@@ -24502,7 +24567,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1543
+      priority: 1541
     }
     lines {
       width: 2
@@ -24512,12 +24577,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1707
+      priority: 1705
     }
     lines {
       width: 2
       color: 0x99FFFFFF
-      priority: 1670
+      priority: 1669
     }
   }
 }
@@ -24528,7 +24593,7 @@ cont {
     lines {
       width: 0.25
       color: 0xb3B2B2B2
-      priority: 1212
+      priority: 1210
     }
   }
   element {
@@ -24536,7 +24601,7 @@ cont {
     lines {
       width: 0.55
       color: 0xb3B2B2B2
-      priority: 1229
+      priority: 1227
     }
   }
   element {
@@ -24544,7 +24609,7 @@ cont {
     lines {
       width: 1.6
       color: 0x99B2B2B2
-      priority: 1180
+      priority: 1178
     }
     lines {
       width: 1
@@ -24554,12 +24619,12 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1319
+      priority: 1318
     }
     lines {
       width: 1
       color: 0x99FFFFFF
-      priority: 1285
+      priority: 1284
     }
   }
   element {
@@ -24567,7 +24632,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1290
+      priority: 1289
     }
     lines {
       width: 2
@@ -24577,12 +24642,12 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1395
+      priority: 1394
     }
     lines {
       width: 2
       color: 0x99FFFFFF
-      priority: 1368
+      priority: 1367
     }
   }
   element {
@@ -24590,7 +24655,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1514
+      priority: 1512
     }
     lines {
       width: 10.4
@@ -24606,12 +24671,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1643
+      priority: 1642
     }
     lines {
       width: 2.4
       color: 0x99FFFFFF
-      priority: 1612
+      priority: 1610
     }
     lines {
       width: 12.4
@@ -24625,7 +24690,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1543
+      priority: 1541
     }
     lines {
       width: 10
@@ -24641,12 +24706,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1707
+      priority: 1705
     }
     lines {
       width: 2
       color: 0x99FFFFFF
-      priority: 1670
+      priority: 1669
     }
     lines {
       width: 12
@@ -24663,7 +24728,7 @@ cont {
     lines {
       width: 0.25
       color: 0xb3B2B2B2
-      priority: 1212
+      priority: 1210
     }
   }
   element {
@@ -24671,7 +24736,7 @@ cont {
     lines {
       width: 0.55
       color: 0xb3B2B2B2
-      priority: 1229
+      priority: 1227
     }
   }
   element {
@@ -24679,7 +24744,7 @@ cont {
     lines {
       width: 1.6
       color: 0x99B2B2B2
-      priority: 1180
+      priority: 1178
     }
     lines {
       width: 1
@@ -24689,12 +24754,12 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1319
+      priority: 1318
     }
     lines {
       width: 1
       color: 0x99FFFFFF
-      priority: 1285
+      priority: 1284
     }
   }
   element {
@@ -24702,7 +24767,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1290
+      priority: 1289
     }
     lines {
       width: 2
@@ -24712,12 +24777,12 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1395
+      priority: 1394
     }
     lines {
       width: 2
       color: 0x99FFFFFF
-      priority: 1368
+      priority: 1367
     }
   }
   element {
@@ -24731,7 +24796,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1514
+      priority: 1512
     }
     lines {
       width: 2.4
@@ -24741,12 +24806,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1643
+      priority: 1642
     }
     lines {
       width: 2.4
       color: 0x99FFFFFF
-      priority: 1612
+      priority: 1610
     }
     lines {
       width: 12.4
@@ -24770,7 +24835,7 @@ cont {
     lines {
       width: 3.2
       color: 0x99B2B2B2
-      priority: 1543
+      priority: 1541
     }
     lines {
       width: 2
@@ -24780,12 +24845,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1707
+      priority: 1705
     }
     lines {
       width: 2
       color: 0x99FFFFFF
-      priority: 1670
+      priority: 1669
     }
     lines {
       width: 12
@@ -24823,7 +24888,7 @@ cont {
     lines {
       width: 0.5
       color: 0x80808080
-      priority: 1209
+      priority: 1208
     }
   }
   element {
@@ -24831,7 +24896,7 @@ cont {
     lines {
       width: 0.85
       color: 0x80808080
-      priority: 1226
+      priority: 1225
     }
   }
   element {
@@ -24839,7 +24904,7 @@ cont {
     lines {
       width: 1.6
       color: 0x4d808080
-      priority: 1178
+      priority: 1176
     }
     lines {
       width: 1
@@ -24849,12 +24914,12 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1317
+      priority: 1316
     }
     lines {
       width: 1
       color: 0x4dF2F2F2
-      priority: 1282
+      priority: 1281
     }
   }
   element {
@@ -24862,7 +24927,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4d808080
-      priority: 1287
+      priority: 1286
     }
     lines {
       width: 2
@@ -24885,7 +24950,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4d808080
-      priority: 1509
+      priority: 1507
     }
     lines {
       width: 2.4
@@ -24895,12 +24960,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1639
+      priority: 1637
     }
     lines {
       width: 2.4
       color: 0x4dF2F2F2
-      priority: 1607
+      priority: 1605
     }
   }
   element {
@@ -24908,7 +24973,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4d808080
-      priority: 1541
+      priority: 1539
     }
     lines {
       width: 2
@@ -24918,12 +24983,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1702
+      priority: 1700
     }
     lines {
       width: 2
       color: 0x4dF2F2F2
-      priority: 1665
+      priority: 1664
     }
   }
 }
@@ -24934,7 +24999,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1224
+      priority: 1223
     }
   }
   element {
@@ -24942,7 +25007,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1241
+      priority: 1240
     }
   }
   element {
@@ -24950,12 +25015,12 @@ cont {
     lines {
       width: 2.4
       color: 0x590909
-      priority: 1197
+      priority: 1196
     }
     lines {
       width: 0.4
       color: 0x590909
-      priority: 1331
+      priority: 1330
     }
     lines {
       width: 1.7
@@ -24965,7 +25030,7 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1302
+      priority: 1301
     }
   }
   element {
@@ -24973,12 +25038,12 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1304
+      priority: 1303
     }
     lines {
       width: 0.5
       color: 0x4C0F0F
-      priority: 1407
+      priority: 1406
     }
     lines {
       width: 2
@@ -24988,7 +25053,7 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1380
+      priority: 1379
     }
   }
   element {
@@ -24996,12 +25061,12 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1521
+      priority: 1519
     }
     lines {
       width: 0.6
       color: 0x4C0F0F
-      priority: 1653
+      priority: 1651
     }
     lines {
       width: 2
@@ -25011,7 +25076,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1626
+      priority: 1625
     }
   }
   element {
@@ -25019,12 +25084,12 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1560
+      priority: 1558
     }
     lines {
       width: 0.64
       color: 0x4C0F0F
-      priority: 1729
+      priority: 1727
     }
     lines {
       width: 2
@@ -25034,7 +25099,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1685
+      priority: 1683
     }
   }
 }
@@ -25045,7 +25110,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1224
+      priority: 1223
     }
   }
   element {
@@ -25053,7 +25118,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1241
+      priority: 1240
     }
   }
   element {
@@ -25061,12 +25126,12 @@ cont {
     lines {
       width: 2.4
       color: 0x590909
-      priority: 1197
+      priority: 1196
     }
     lines {
       width: 0.4
       color: 0x590909
-      priority: 1331
+      priority: 1330
     }
     lines {
       width: 1.7
@@ -25076,7 +25141,7 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1302
+      priority: 1301
     }
   }
   element {
@@ -25084,12 +25149,12 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1304
+      priority: 1303
     }
     lines {
       width: 0.5
       color: 0x4C0F0F
-      priority: 1407
+      priority: 1406
     }
     lines {
       width: 2
@@ -25099,7 +25164,7 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1380
+      priority: 1379
     }
   }
   element {
@@ -25107,7 +25172,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1521
+      priority: 1519
     }
     lines {
       width: 8.6
@@ -25118,7 +25183,7 @@ cont {
     lines {
       width: 0.6
       color: 0x4C0F0F
-      priority: 1653
+      priority: 1651
     }
     lines {
       width: 2
@@ -25128,7 +25193,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1626
+      priority: 1625
     }
     lines {
       width: 10.6
@@ -25142,7 +25207,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1560
+      priority: 1558
     }
     lines {
       width: 8.64
@@ -25153,7 +25218,7 @@ cont {
     lines {
       width: 0.64
       color: 0x4C0F0F
-      priority: 1729
+      priority: 1727
     }
     lines {
       width: 2
@@ -25163,7 +25228,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1685
+      priority: 1683
     }
     lines {
       width: 10.64
@@ -25180,7 +25245,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1224
+      priority: 1223
     }
   }
   element {
@@ -25188,7 +25253,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1241
+      priority: 1240
     }
   }
   element {
@@ -25196,12 +25261,12 @@ cont {
     lines {
       width: 2.4
       color: 0x590909
-      priority: 1197
+      priority: 1196
     }
     lines {
       width: 0.4
       color: 0x590909
-      priority: 1331
+      priority: 1330
     }
     lines {
       width: 1.7
@@ -25211,7 +25276,7 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1302
+      priority: 1301
     }
   }
   element {
@@ -25219,12 +25284,12 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1304
+      priority: 1303
     }
     lines {
       width: 0.5
       color: 0x4C0F0F
-      priority: 1407
+      priority: 1406
     }
     lines {
       width: 2
@@ -25234,7 +25299,7 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1380
+      priority: 1379
     }
   }
   element {
@@ -25248,12 +25313,12 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1521
+      priority: 1519
     }
     lines {
       width: 0.6
       color: 0x4C0F0F
-      priority: 1653
+      priority: 1651
     }
     lines {
       width: 2
@@ -25263,7 +25328,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1626
+      priority: 1625
     }
     lines {
       width: 10.6
@@ -25287,12 +25352,12 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F0F
-      priority: 1560
+      priority: 1558
     }
     lines {
       width: 0.64
       color: 0x4C0F0F
-      priority: 1729
+      priority: 1727
     }
     lines {
       width: 2
@@ -25302,7 +25367,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1685
+      priority: 1683
     }
     lines {
       width: 10.64
@@ -25322,39 +25387,39 @@ cont {
     scale: 14
     symbol {
       name: "railway-station-mini"
-      priority: 16148
+      priority: 16147
     }
   }
   element {
     scale: 15
     symbol {
       name: "railway-station-mini"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
   element {
     scale: 16
     symbol {
       name: "railway-station-mini"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
   element {
@@ -25363,14 +25428,14 @@ cont {
       name: "railway-station"
       priority: 16000
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 15000
+      priority: 16000
     }
   }
 }
@@ -25398,7 +25463,7 @@ cont {
     lines {
       width: 1
       color: 0x90D090
-      priority: 1682
+      priority: 1681
     }
   }
   element {
@@ -25406,7 +25471,7 @@ cont {
     lines {
       width: 1
       color: 0x90D090
-      priority: 1726
+      priority: 1725
     }
   }
   element {
@@ -25414,7 +25479,7 @@ cont {
     lines {
       width: 2.4
       color: 0x095909
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 1.7
@@ -25424,12 +25489,12 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 1.7
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
   }
   element {
@@ -25437,7 +25502,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 2
@@ -25447,12 +25512,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
   }
   element {
@@ -25460,7 +25525,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 2
@@ -25470,12 +25535,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
   }
   element {
@@ -25483,7 +25548,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1558
+      priority: 1556
     }
     lines {
       width: 2
@@ -25493,12 +25558,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1719
+      priority: 1718
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1680
+      priority: 1678
     }
   }
 }
@@ -25509,7 +25574,7 @@ cont {
     lines {
       width: 1
       color: 0x90D090
-      priority: 1682
+      priority: 1681
     }
   }
   element {
@@ -25517,7 +25582,7 @@ cont {
     lines {
       width: 1
       color: 0x90D090
-      priority: 1726
+      priority: 1725
     }
   }
   element {
@@ -25525,7 +25590,7 @@ cont {
     lines {
       width: 2.4
       color: 0x095909
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 1.7
@@ -25535,12 +25600,12 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 1.7
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
   }
   element {
@@ -25548,7 +25613,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 2
@@ -25558,12 +25623,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
   }
   element {
@@ -25571,7 +25636,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 10
@@ -25587,12 +25652,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
     lines {
       width: 12
@@ -25606,7 +25671,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1558
+      priority: 1556
     }
     lines {
       width: 10
@@ -25622,12 +25687,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1719
+      priority: 1718
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1680
+      priority: 1678
     }
     lines {
       width: 12
@@ -25644,7 +25709,7 @@ cont {
     lines {
       width: 1
       color: 0x90D090
-      priority: 1682
+      priority: 1681
     }
   }
   element {
@@ -25652,7 +25717,7 @@ cont {
     lines {
       width: 1
       color: 0x90D090
-      priority: 1726
+      priority: 1725
     }
   }
   element {
@@ -25660,7 +25725,7 @@ cont {
     lines {
       width: 2.4
       color: 0x095909
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 1.7
@@ -25670,12 +25735,12 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 1.7
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
   }
   element {
@@ -25683,7 +25748,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 2
@@ -25693,12 +25758,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
   }
   element {
@@ -25712,7 +25777,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1682
+      priority: 1681
     }
     lines {
       width: 2
@@ -25722,12 +25787,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1726
+      priority: 1725
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1702
+      priority: 1700
     }
     lines {
       width: 12
@@ -25751,7 +25816,7 @@ cont {
     lines {
       width: 3.2
       color: 0x0F4C0F
-      priority: 1558
+      priority: 1556
     }
     lines {
       width: 2
@@ -25761,12 +25826,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1719
+      priority: 1718
     }
     lines {
       width: 2
       color: 0xB7E6E6
-      priority: 1680
+      priority: 1678
     }
     lines {
       width: 12
@@ -25787,7 +25852,7 @@ cont {
     lines {
       width: 1
       color: 0xD08080
-      priority: 1226
+      priority: 1225
     }
   }
   element {
@@ -25808,17 +25873,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1536
+      priority: 1534
     }
     lines {
       width: 2
       color: 0x590959
-      priority: 1531
+      priority: 1529
     }
     lines {
       width: 1.7
       color: 0xD08080
-      priority: 1534
+      priority: 1531
     }
   }
   element {
@@ -25826,7 +25891,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -25836,12 +25901,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
   }
   element {
@@ -25849,7 +25914,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -25859,12 +25924,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
   }
   element {
@@ -25872,7 +25937,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -25882,12 +25947,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
   }
 }
@@ -25898,7 +25963,7 @@ cont {
     lines {
       width: 1
       color: 0xD08080
-      priority: 1226
+      priority: 1225
     }
   }
   element {
@@ -25919,17 +25984,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1536
+      priority: 1534
     }
     lines {
       width: 2
       color: 0x590959
-      priority: 1531
+      priority: 1529
     }
     lines {
       width: 1.7
       color: 0xD08080
-      priority: 1534
+      priority: 1531
     }
   }
   element {
@@ -25937,7 +26002,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -25947,12 +26012,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
   }
   element {
@@ -25960,7 +26025,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 10
@@ -25976,12 +26041,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
     lines {
       width: 12
@@ -25995,7 +26060,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 10
@@ -26011,12 +26076,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
     lines {
       width: 12
@@ -26033,7 +26098,7 @@ cont {
     lines {
       width: 1
       color: 0xD08080
-      priority: 1226
+      priority: 1225
     }
   }
   element {
@@ -26054,17 +26119,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1536
+      priority: 1534
     }
     lines {
       width: 2
       color: 0x590959
-      priority: 1531
+      priority: 1529
     }
     lines {
       width: 1.7
       color: 0xD08080
-      priority: 1534
+      priority: 1531
     }
   }
   element {
@@ -26072,7 +26137,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -26082,12 +26147,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
   }
   element {
@@ -26101,7 +26166,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -26111,12 +26176,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
     lines {
       width: 12
@@ -26140,7 +26205,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -26150,12 +26215,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xD08080
-      priority: 1539
+      priority: 1536
     }
     lines {
       width: 12
@@ -26176,7 +26241,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1217
+      priority: 1215
     }
   }
   element {
@@ -26184,7 +26249,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1236
+      priority: 1235
     }
   }
   element {
@@ -26192,7 +26257,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1185
+      priority: 1183
     }
     lines {
       width: 1.7
@@ -26202,12 +26267,12 @@ cont {
         dd: 5.5
       }
       cap: BUTTCAP
-      priority: 1324
+      priority: 1323
     }
     lines {
       width: 1.7
       color: 0xE6E6E6
-      priority: 1292
+      priority: 1291
     }
   }
   element {
@@ -26215,7 +26280,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1297
+      priority: 1296
     }
     lines {
       width: 2
@@ -26225,12 +26290,12 @@ cont {
         dd: 11
       }
       cap: BUTTCAP
-      priority: 1400
+      priority: 1399
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1373
+      priority: 1372
     }
   }
   element {
@@ -26238,7 +26303,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1519
+      priority: 1517
     }
     lines {
       width: 2
@@ -26248,12 +26313,12 @@ cont {
         dd: 14
       }
       cap: BUTTCAP
-      priority: 1648
+      priority: 1647
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1619
+      priority: 1617
     }
   }
   element {
@@ -26261,7 +26326,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1551
     }
     lines {
       width: 2
@@ -26271,12 +26336,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1714
+      priority: 1713
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1675
+      priority: 1674
     }
   }
 }
@@ -26287,7 +26352,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1217
+      priority: 1215
     }
   }
   element {
@@ -26295,7 +26360,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1236
+      priority: 1235
     }
   }
   element {
@@ -26303,7 +26368,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1185
+      priority: 1183
     }
     lines {
       width: 1.7
@@ -26313,12 +26378,12 @@ cont {
         dd: 5.5
       }
       cap: BUTTCAP
-      priority: 1324
+      priority: 1323
     }
     lines {
       width: 1.7
       color: 0xE6E6E6
-      priority: 1292
+      priority: 1291
     }
   }
   element {
@@ -26326,7 +26391,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1297
+      priority: 1296
     }
     lines {
       width: 2
@@ -26336,12 +26401,12 @@ cont {
         dd: 11
       }
       cap: BUTTCAP
-      priority: 1400
+      priority: 1399
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1373
+      priority: 1372
     }
   }
   element {
@@ -26349,7 +26414,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1519
+      priority: 1517
     }
     lines {
       width: 11.2
@@ -26365,12 +26430,12 @@ cont {
         dd: 14
       }
       cap: BUTTCAP
-      priority: 1648
+      priority: 1647
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1619
+      priority: 1617
     }
     lines {
       width: 13.2
@@ -26384,7 +26449,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1551
     }
     lines {
       width: 10
@@ -26400,12 +26465,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1714
+      priority: 1713
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1675
+      priority: 1674
     }
     lines {
       width: 12
@@ -26422,7 +26487,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1217
+      priority: 1215
     }
   }
   element {
@@ -26430,7 +26495,7 @@ cont {
     lines {
       width: 1
       color: 0xA0A0A0
-      priority: 1236
+      priority: 1235
     }
   }
   element {
@@ -26438,7 +26503,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1185
+      priority: 1183
     }
     lines {
       width: 1.7
@@ -26448,12 +26513,12 @@ cont {
         dd: 5.5
       }
       cap: BUTTCAP
-      priority: 1324
+      priority: 1323
     }
     lines {
       width: 1.7
       color: 0xE6E6E6
-      priority: 1292
+      priority: 1291
     }
   }
   element {
@@ -26461,7 +26526,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1297
+      priority: 1296
     }
     lines {
       width: 2
@@ -26471,12 +26536,12 @@ cont {
         dd: 11
       }
       cap: BUTTCAP
-      priority: 1400
+      priority: 1399
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1373
+      priority: 1372
     }
   }
   element {
@@ -26490,7 +26555,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1519
+      priority: 1517
     }
     lines {
       width: 2
@@ -26500,12 +26565,12 @@ cont {
         dd: 14
       }
       cap: BUTTCAP
-      priority: 1648
+      priority: 1647
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1619
+      priority: 1617
     }
     lines {
       width: 13.2
@@ -26529,7 +26594,7 @@ cont {
     lines {
       width: 3.2
       color: 0x333333
-      priority: 1553
+      priority: 1551
     }
     lines {
       width: 2
@@ -26539,12 +26604,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1714
+      priority: 1713
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1675
+      priority: 1674
     }
     lines {
       width: 12
@@ -26565,7 +26630,7 @@ cont {
     lines {
       width: 4
       color: 0xBBBBBB
-      priority: 1570
+      priority: 1568
     }
     area {
       color: 0xBBBBBB
@@ -26592,7 +26657,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1219
+      priority: 1218
     }
   }
   element {
@@ -26600,7 +26665,7 @@ cont {
     lines {
       width: 1.35
       color: 0xB0B0B0
-      priority: 1239
+      priority: 1237
     }
   }
   element {
@@ -26608,7 +26673,7 @@ cont {
     lines {
       width: 2.4
       color: 0x909090
-      priority: 1187
+      priority: 1186
     }
     lines {
       width: 1.7
@@ -26618,7 +26683,7 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1326
+      priority: 1325
     }
     lines {
       width: 1.7
@@ -26631,7 +26696,7 @@ cont {
     lines {
       width: 3.2
       color: 0x909090
-      priority: 1300
+      priority: 1299
     }
     lines {
       width: 2
@@ -26641,7 +26706,7 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1402
+      priority: 1401
     }
     lines {
       width: 2
@@ -26664,12 +26729,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1651
+      priority: 1649
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1621
+      priority: 1620
     }
   }
   element {
@@ -26677,7 +26742,7 @@ cont {
     lines {
       width: 3.2
       color: 0x909090
-      priority: 1556
+      priority: 1553
     }
     lines {
       width: 2
@@ -26687,12 +26752,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1717
+      priority: 1715
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1678
+      priority: 1676
     }
   }
 }
@@ -26703,7 +26768,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1219
+      priority: 1218
     }
   }
   element {
@@ -26711,7 +26776,7 @@ cont {
     lines {
       width: 1.35
       color: 0xB0B0B0
-      priority: 1239
+      priority: 1237
     }
   }
   element {
@@ -26719,7 +26784,7 @@ cont {
     lines {
       width: 2.4
       color: 0x909090
-      priority: 1187
+      priority: 1186
     }
     lines {
       width: 1.7
@@ -26729,7 +26794,7 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1326
+      priority: 1325
     }
     lines {
       width: 1.7
@@ -26742,7 +26807,7 @@ cont {
     lines {
       width: 3.2
       color: 0x909090
-      priority: 1300
+      priority: 1299
     }
     lines {
       width: 2
@@ -26752,7 +26817,7 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1402
+      priority: 1401
     }
     lines {
       width: 2
@@ -26781,12 +26846,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1651
+      priority: 1649
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1621
+      priority: 1620
     }
     lines {
       width: 13.2
@@ -26800,7 +26865,7 @@ cont {
     lines {
       width: 3.2
       color: 0x909090
-      priority: 1556
+      priority: 1553
     }
     lines {
       width: 10
@@ -26816,12 +26881,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1717
+      priority: 1715
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1678
+      priority: 1676
     }
     lines {
       width: 12
@@ -26838,7 +26903,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1219
+      priority: 1218
     }
   }
   element {
@@ -26846,7 +26911,7 @@ cont {
     lines {
       width: 1.35
       color: 0xB0B0B0
-      priority: 1239
+      priority: 1237
     }
   }
   element {
@@ -26854,7 +26919,7 @@ cont {
     lines {
       width: 2.4
       color: 0x909090
-      priority: 1187
+      priority: 1186
     }
     lines {
       width: 1.7
@@ -26864,7 +26929,7 @@ cont {
         dd: 4.5
       }
       cap: BUTTCAP
-      priority: 1326
+      priority: 1325
     }
     lines {
       width: 1.7
@@ -26877,7 +26942,7 @@ cont {
     lines {
       width: 3.2
       color: 0x909090
-      priority: 1300
+      priority: 1299
     }
     lines {
       width: 2
@@ -26887,7 +26952,7 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1402
+      priority: 1401
     }
     lines {
       width: 2
@@ -26916,12 +26981,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1651
+      priority: 1649
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1621
+      priority: 1620
     }
     lines {
       width: 13.2
@@ -26945,7 +27010,7 @@ cont {
     lines {
       width: 3.2
       color: 0x909090
-      priority: 1556
+      priority: 1553
     }
     lines {
       width: 2
@@ -26955,12 +27020,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1717
+      priority: 1715
     }
     lines {
       width: 2
       color: 0xE6E6E6
-      priority: 1678
+      priority: 1676
     }
     lines {
       width: 12
@@ -26976,20 +27041,12 @@ cont {
 }
 cont {
   name: "railway-rail"
-  element {
-    scale: 9
-    lines {
-      width: 1.56
-      color: 0xB0B0B0
-      priority: 1046
-    }
-  }
   element {
     scale: 10
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1141
+      priority: 1139
     }
   }
   element {
@@ -26997,7 +27054,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1141
+      priority: 1139
     }
   }
   element {
@@ -27005,7 +27062,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1214
+      priority: 1213
     }
   }
   element {
@@ -27013,28 +27070,28 @@ cont {
     lines {
       width: 1.85
       color: 0xB0B0B0
-      priority: 1234
+      priority: 1232
     }
   }
   element {
     scale: 14
-    caption {
+    lines {
+      width: 3
+      color: 0x888888
+      priority: 1181
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
+      priority: 16181
     }
     lines {
       width: 1.8
       color: 0xE6E6E6
-      priority: 1290
-    }
-    lines {
-      width: 3
-      color: 0x888888
-      priority: 1182
+      priority: 1289
     }
     lines {
       width: 1.8
@@ -27049,24 +27106,24 @@ cont {
   }
   element {
     scale: 15
-    caption {
+    lines {
+      width: 4
+      color: 0x666666
+      priority: 1294
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
+      priority: 16294
     }
     lines {
       width: 2.4
       color: 0xE6E6E6
       priority: 1370
     }
-    lines {
-      width: 4
-      color: 0x666666
-      priority: 1295
-    }
     lines {
       width: 2.4
       color: 0x666666
@@ -27075,28 +27132,28 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1373
+      priority: 1372
     }
   }
   element {
     scale: 16
-    caption {
+    lines {
+      width: 2.4
+      color: 0xE6E6E6
+      priority: 1615
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
-    }
-    lines {
-      width: 2.4
-      color: 0xE6E6E6
-      priority: 1617
+      priority: 16615
     }
     lines {
       width: 4
       color: 0x666666
-      priority: 1517
+      priority: 1514
     }
     lines {
       width: 2.4
@@ -27106,28 +27163,28 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1646
+      priority: 1644
     }
   }
   element {
     scale: 17
-    caption {
+    lines {
+      width: 4.4
+      color: 0x666666
+      priority: 1549
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
+      priority: 16549
     }
     lines {
       width: 3.2
       color: 0xE6E6E6
-      priority: 1673
-    }
-    lines {
-      width: 4.4
-      color: 0x666666
-      priority: 1551
+      priority: 1671
     }
     lines {
       width: 3.2
@@ -27137,26 +27194,18 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1712
+      priority: 1710
     }
   }
 }
 cont {
   name: "railway-rail-bridge"
-  element {
-    scale: 9
-    lines {
-      width: 1.56
-      color: 0xB0B0B0
-      priority: 1046
-    }
-  }
   element {
     scale: 10
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1141
+      priority: 1139
     }
   }
   element {
@@ -27164,7 +27213,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1141
+      priority: 1139
     }
   }
   element {
@@ -27172,7 +27221,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1214
+      priority: 1213
     }
   }
   element {
@@ -27180,28 +27229,28 @@ cont {
     lines {
       width: 1.85
       color: 0xB0B0B0
-      priority: 1234
+      priority: 1232
     }
   }
   element {
     scale: 14
-    caption {
+    lines {
+      width: 3
+      color: 0x888888
+      priority: 1181
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
+      priority: 16181
     }
     lines {
       width: 1.8
       color: 0xE6E6E6
-      priority: 1290
-    }
-    lines {
-      width: 3
-      color: 0x888888
-      priority: 1182
+      priority: 1289
     }
     lines {
       width: 1.8
@@ -27216,24 +27265,24 @@ cont {
   }
   element {
     scale: 15
-    caption {
+    lines {
+      width: 4
+      color: 0x666666
+      priority: 1294
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
+      priority: 16294
     }
     lines {
       width: 2.4
       color: 0xE6E6E6
       priority: 1370
     }
-    lines {
-      width: 4
-      color: 0x666666
-      priority: 1295
-    }
     lines {
       width: 2.4
       color: 0x666666
@@ -27242,38 +27291,23 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1373
+      priority: 1372
     }
   }
   element {
     scale: 16
-    caption {
+    lines {
+      width: 2.4
+      color: 0xE6E6E6
+      priority: 1615
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
-    }
-    lines {
-      width: 2.4
-      color: 0xE6E6E6
-      priority: 1617
-    }
-    lines {
-      width: 4
-      color: 0x666666
-      priority: 1517
-    }
-    lines {
-      width: 2.4
-      color: 0x666666
-      dashdot {
-        dd: 12
-        dd: 12
-      }
-      cap: BUTTCAP
-      priority: 1646
+      priority: 16615
     }
     lines {
       width: 10.4
@@ -27281,6 +27315,21 @@ cont {
       priority: 7
       cap: BUTTCAP
     }
+    lines {
+      width: 4
+      color: 0x666666
+      priority: 1514
+    }
+    lines {
+      width: 2.4
+      color: 0x666666
+      dashdot {
+        dd: 12
+        dd: 12
+      }
+      cap: BUTTCAP
+      priority: 1644
+    }
     lines {
       width: 12.4
       color: 0x707070
@@ -27290,23 +27339,29 @@ cont {
   }
   element {
     scale: 17
-    caption {
+    lines {
+      width: 11.2
+      color: 0xFFFFFF
+      priority: 7
+      cap: BUTTCAP
+    }
+    lines {
+      width: 4.4
+      color: 0x666666
+      priority: 1549
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
+      priority: 16549
     }
     lines {
       width: 3.2
       color: 0xE6E6E6
-      priority: 1673
-    }
-    lines {
-      width: 4.4
-      color: 0x666666
-      priority: 1551
+      priority: 1671
     }
     lines {
       width: 3.2
@@ -27316,13 +27371,7 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1712
-    }
-    lines {
-      width: 11.2
-      color: 0xFFFFFF
-      priority: 7
-      cap: BUTTCAP
+      priority: 1710
     }
     lines {
       width: 13.2
@@ -27334,20 +27383,12 @@ cont {
 }
 cont {
   name: "railway-rail-tunnel"
-  element {
-    scale: 9
-    lines {
-      width: 1.56
-      color: 0xB0B0B0
-      priority: 1046
-    }
-  }
   element {
     scale: 10
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1141
+      priority: 1139
     }
   }
   element {
@@ -27355,7 +27396,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1141
+      priority: 1139
     }
   }
   element {
@@ -27363,7 +27404,7 @@ cont {
     lines {
       width: 1
       color: 0xC0C0C0
-      priority: 1214
+      priority: 1213
     }
   }
   element {
@@ -27371,28 +27412,28 @@ cont {
     lines {
       width: 1.85
       color: 0xB0B0B0
-      priority: 1234
+      priority: 1232
     }
   }
   element {
     scale: 14
-    caption {
+    lines {
+      width: 3
+      color: 0x888888
+      priority: 1181
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
+      priority: 16181
     }
     lines {
       width: 1.8
       color: 0xE6E6E6
-      priority: 1290
-    }
-    lines {
-      width: 3
-      color: 0x888888
-      priority: 1182
+      priority: 1289
     }
     lines {
       width: 1.8
@@ -27407,24 +27448,24 @@ cont {
   }
   element {
     scale: 15
-    caption {
+    lines {
+      width: 4
+      color: 0x666666
+      priority: 1294
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
+      priority: 16294
     }
     lines {
       width: 2.4
       color: 0xE6E6E6
       priority: 1370
     }
-    lines {
-      width: 4
-      color: 0x666666
-      priority: 1295
-    }
     lines {
       width: 2.4
       color: 0x666666
@@ -27433,28 +27474,44 @@ cont {
         dd: 9
       }
       cap: BUTTCAP
-      priority: 1373
+      priority: 1372
     }
   }
   element {
     scale: 16
-    caption {
+    lines {
+      width: 10.4
+      color: 0xFFFFFF
+      priority: 7
+      cap: BUTTCAP
+    }
+    lines {
+      width: 2.4
+      color: 0xE6E6E6
+      priority: 1615
+    }
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
       }
-      priority: 15000
-    }
-    lines {
-      width: 2.4
-      color: 0xE6E6E6
-      priority: 1617
+      priority: 16615
     }
     lines {
       width: 4
       color: 0x666666
-      priority: 1517
+      priority: 1514
+    }
+    lines {
+      width: 2.4
+      color: 0x666666
+      dashdot {
+        dd: 12
+        dd: 12
+      }
+      cap: BUTTCAP
+      priority: 1644
     }
     lines {
       width: 12.4
@@ -27466,42 +27523,42 @@ cont {
       }
       cap: BUTTCAP
     }
+  }
+  element {
+    scale: 17
     lines {
-      width: 2.4
+      width: 4.4
+      color: 0x666666
+      priority: 1549
+    }
+    path_text {
+      primary {
+        height: 12
+        color: 0x3050D8
+        stroke_color: 0xFFFFFF
+      }
+      priority: 16549
+    }
+    lines {
+      width: 3.2
+      color: 0xE6E6E6
+      priority: 1671
+    }
+    lines {
+      width: 11.2
+      color: 0xFFFFFF
+      priority: 7
+      cap: BUTTCAP
+    }
+    lines {
+      width: 3.2
       color: 0x666666
       dashdot {
         dd: 12
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1646
-    }
-    lines {
-      width: 10.4
-      color: 0xFFFFFF
-      priority: 7
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 12
-        color: 0x3050D8
-        stroke_color: 0xFFFFFF
-      }
-      priority: 15000
-    }
-    lines {
-      width: 3.2
-      color: 0xE6E6E6
-      priority: 1673
-    }
-    lines {
-      width: 4.4
-      color: 0x666666
-      priority: 1551
+      priority: 1710
     }
     lines {
       width: 13.2
@@ -27513,22 +27570,6 @@ cont {
       }
       cap: BUTTCAP
     }
-    lines {
-      width: 3.2
-      color: 0x666666
-      dashdot {
-        dd: 12
-        dd: 12
-      }
-      cap: BUTTCAP
-      priority: 1712
-    }
-    lines {
-      width: 11.2
-      color: 0xFFFFFF
-      priority: 7
-      cap: BUTTCAP
-    }
   }
 }
 cont {
@@ -27543,7 +27584,7 @@ cont {
         dd: 2.4
       }
       cap: BUTTCAP
-      priority: 1512
+      priority: 1509
     }
     lines {
       width: 2.4
@@ -27557,12 +27598,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1641
+      priority: 1639
     }
     lines {
       width: 2.4
       color: 0xb3FFFFFF
-      priority: 1609
+      priority: 1607
     }
   }
   element {
@@ -27575,7 +27616,7 @@ cont {
         dd: 2.4
       }
       cap: BUTTCAP
-      priority: 1548
+      priority: 1546
     }
     lines {
       width: 2
@@ -27589,12 +27630,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1704
+      priority: 1703
     }
     lines {
       width: 2
       color: 0xb3FFFFFF
-      priority: 1668
+      priority: 1666
     }
   }
 }
@@ -27605,7 +27646,7 @@ cont {
     lines {
       width: 1
       color: 0xB0B0B0
-      priority: 1246
+      priority: 1245
     }
   }
   element {
@@ -27613,7 +27654,7 @@ cont {
     lines {
       width: 1.6
       color: 0x909090
-      priority: 1204
+      priority: 1203
     }
     lines {
       width: 1
@@ -27623,12 +27664,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1339
+      priority: 1338
     }
     lines {
       width: 1
       color: 0xE6E6E6
-      priority: 1309
+      priority: 1308
     }
   }
   element {
@@ -27636,7 +27677,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1314
+      priority: 1313
     }
     lines {
       width: 1.4
@@ -27659,7 +27700,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1529
+      priority: 1526
     }
     lines {
       width: 1.2
@@ -27669,12 +27710,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1660
+      priority: 1659
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1634
+      priority: 1632
     }
   }
   element {
@@ -27682,7 +27723,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1568
+      priority: 1566
     }
     lines {
       width: 1.36
@@ -27692,12 +27733,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1737
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1692
+      priority: 1691
     }
   }
 }
@@ -27708,7 +27749,7 @@ cont {
     lines {
       width: 1
       color: 0xB0B0B0
-      priority: 1246
+      priority: 1245
     }
   }
   element {
@@ -27716,7 +27757,7 @@ cont {
     lines {
       width: 1.6
       color: 0x909090
-      priority: 1204
+      priority: 1203
     }
     lines {
       width: 1
@@ -27726,12 +27767,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1339
+      priority: 1338
     }
     lines {
       width: 1
       color: 0xE6E6E6
-      priority: 1309
+      priority: 1308
     }
   }
   element {
@@ -27739,7 +27780,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1314
+      priority: 1313
     }
     lines {
       width: 1.4
@@ -27762,7 +27803,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1529
+      priority: 1526
     }
     lines {
       width: 9.2
@@ -27778,12 +27819,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1660
+      priority: 1659
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1634
+      priority: 1632
     }
     lines {
       width: 11.2
@@ -27797,7 +27838,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1568
+      priority: 1566
     }
     lines {
       width: 10.4
@@ -27813,12 +27854,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1737
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1692
+      priority: 1691
     }
     lines {
       width: 12.4
@@ -27835,7 +27876,7 @@ cont {
     lines {
       width: 1
       color: 0xB0B0B0
-      priority: 1246
+      priority: 1245
     }
   }
   element {
@@ -27843,7 +27884,7 @@ cont {
     lines {
       width: 1.6
       color: 0x909090
-      priority: 1204
+      priority: 1203
     }
     lines {
       width: 1
@@ -27853,12 +27894,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1339
+      priority: 1338
     }
     lines {
       width: 1
       color: 0xE6E6E6
-      priority: 1309
+      priority: 1308
     }
   }
   element {
@@ -27866,7 +27907,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1314
+      priority: 1313
     }
     lines {
       width: 1.4
@@ -27895,7 +27936,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1529
+      priority: 1526
     }
     lines {
       width: 1.2
@@ -27905,12 +27946,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1660
+      priority: 1659
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1634
+      priority: 1632
     }
     lines {
       width: 11.2
@@ -27934,7 +27975,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1568
+      priority: 1566
     }
     lines {
       width: 1.36
@@ -27944,12 +27985,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1739
+      priority: 1737
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1692
+      priority: 1691
     }
     lines {
       width: 12.4
@@ -27970,7 +28011,7 @@ cont {
     lines {
       width: 1.6
       color: 0xB0B0B0
-      priority: 1200
+      priority: 1198
     }
     lines {
       width: 1
@@ -27980,12 +28021,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1334
+      priority: 1333
     }
     lines {
       width: 1
       color: 0x909090
-      priority: 1304
+      priority: 1303
     }
   }
   element {
@@ -27993,7 +28034,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1309
+      priority: 1308
     }
     lines {
       width: 1.4
@@ -28016,7 +28057,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1524
+      priority: 1522
     }
     lines {
       width: 1.2
@@ -28026,12 +28067,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1656
+      priority: 1654
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1629
+      priority: 1627
     }
   }
   element {
@@ -28039,7 +28080,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1563
+      priority: 1561
     }
     lines {
       width: 1.36
@@ -28049,12 +28090,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1734
+      priority: 1732
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1687
+      priority: 1686
     }
   }
 }
@@ -28065,7 +28106,7 @@ cont {
     lines {
       width: 1.6
       color: 0xB0B0B0
-      priority: 1200
+      priority: 1198
     }
     lines {
       width: 1
@@ -28075,12 +28116,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1334
+      priority: 1333
     }
     lines {
       width: 1
       color: 0x909090
-      priority: 1304
+      priority: 1303
     }
   }
   element {
@@ -28088,7 +28129,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1309
+      priority: 1308
     }
     lines {
       width: 1.4
@@ -28111,7 +28152,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1524
+      priority: 1522
     }
     lines {
       width: 9.2
@@ -28127,12 +28168,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1656
+      priority: 1654
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1629
+      priority: 1627
     }
     lines {
       width: 11.2
@@ -28146,7 +28187,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1563
+      priority: 1561
     }
     lines {
       width: 9.36
@@ -28162,12 +28203,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1734
+      priority: 1732
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1687
+      priority: 1686
     }
     lines {
       width: 11.36
@@ -28184,7 +28225,7 @@ cont {
     lines {
       width: 1.6
       color: 0xB0B0B0
-      priority: 1200
+      priority: 1198
     }
     lines {
       width: 1
@@ -28194,12 +28235,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1334
+      priority: 1333
     }
     lines {
       width: 1
       color: 0x909090
-      priority: 1304
+      priority: 1303
     }
   }
   element {
@@ -28207,7 +28248,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1309
+      priority: 1308
     }
     lines {
       width: 1.4
@@ -28236,7 +28277,7 @@ cont {
     lines {
       width: 2.4
       color: 0x606060
-      priority: 1524
+      priority: 1522
     }
     lines {
       width: 1.2
@@ -28246,12 +28287,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1656
+      priority: 1654
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1629
+      priority: 1627
     }
     lines {
       width: 11.2
@@ -28275,7 +28316,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1563
+      priority: 1561
     }
     lines {
       width: 1.36
@@ -28285,12 +28326,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1734
+      priority: 1732
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1687
+      priority: 1686
     }
     lines {
       width: 11.36
@@ -28310,55 +28351,55 @@ cont {
     scale: 14
     symbol {
       name: "railway-station-mini"
-      priority: 16148
+      priority: 16147
     }
   }
   element {
     scale: 15
     symbol {
       name: "railway-station-mini"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xF8FCFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
   element {
     scale: 16
     symbol {
       name: "railway-station"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xF8FCFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
   element {
     scale: 17
     symbol {
       name: "railway-station"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xF8FCFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
 }
@@ -28368,80 +28409,80 @@ cont {
     scale: 13
     symbol {
       name: "subway-station-s"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xF8FCFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
   element {
     scale: 14
     symbol {
       name: "subway-station-s"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xF8FCFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
   element {
     scale: 15
     symbol {
       name: "subway-station-m"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xF8FCFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
   element {
     scale: 16
     symbol {
       name: "subway-station-l"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xF8FCFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
   element {
     scale: 17
     symbol {
       name: "subway-station-l"
-      priority: 16148
+      priority: 16147
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xF8FCFF
         offset_y: 14
       }
-      priority: 15148
+      priority: 16147
     }
   }
 }
@@ -28457,7 +28498,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
   }
   element {
@@ -28470,7 +28511,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
   }
   element {
@@ -28483,7 +28524,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
   }
 }
@@ -28499,7 +28540,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
   }
   element {
@@ -28512,7 +28553,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
     lines {
       width: 10
@@ -28537,7 +28578,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
     lines {
       width: 10
@@ -28565,7 +28606,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
   }
   element {
@@ -28578,7 +28619,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
     lines {
       width: 10
@@ -28607,7 +28648,7 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1724
+      priority: 1723
     }
     lines {
       width: 10
@@ -28656,17 +28697,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1536
+      priority: 1534
     }
     lines {
       width: 2
       color: 0x590959
-      priority: 1531
+      priority: 1529
     }
     lines {
       width: 1.7
       color: 0xE6B7E6
-      priority: 1534
+      priority: 1531
     }
   }
   element {
@@ -28674,7 +28715,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -28684,12 +28725,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
   }
   element {
@@ -28697,7 +28738,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -28707,12 +28748,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
   }
   element {
@@ -28720,7 +28761,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -28730,12 +28771,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
   }
 }
@@ -28751,17 +28792,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1536
+      priority: 1534
     }
     lines {
       width: 2
       color: 0x590959
-      priority: 1531
+      priority: 1529
     }
     lines {
       width: 1.7
       color: 0xE6B7E6
-      priority: 1534
+      priority: 1531
     }
   }
   element {
@@ -28769,7 +28810,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -28779,12 +28820,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
   }
   element {
@@ -28792,7 +28833,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 10
@@ -28808,12 +28849,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
     lines {
       width: 12
@@ -28827,7 +28868,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 10
@@ -28843,12 +28884,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
     lines {
       width: 12
@@ -28870,17 +28911,17 @@ cont {
         dd: 5.4
       }
       cap: BUTTCAP
-      priority: 1536
+      priority: 1534
     }
     lines {
       width: 2
       color: 0x590959
-      priority: 1531
+      priority: 1529
     }
     lines {
       width: 1.7
       color: 0xE6B7E6
-      priority: 1534
+      priority: 1531
     }
   }
   element {
@@ -28888,7 +28929,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -28898,12 +28939,12 @@ cont {
         dd: 10.8
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
   }
   element {
@@ -28917,7 +28958,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -28927,12 +28968,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
     lines {
       width: 12
@@ -28956,7 +28997,7 @@ cont {
     lines {
       width: 3.2
       color: 0x4C0F4C
-      priority: 1534
+      priority: 1531
     }
     lines {
       width: 2
@@ -28966,12 +29007,12 @@ cont {
         dd: 14.4
       }
       cap: BUTTCAP
-      priority: 1546
+      priority: 1544
     }
     lines {
       width: 2
       color: 0xE6B7E6
-      priority: 1539
+      priority: 1536
     }
     lines {
       width: 12
@@ -28989,14 +29030,14 @@ cont {
   name: "railway-tram_stop"
   element {
     scale: 15
-    caption {
+    path_text {
       primary {
         height: 10
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 15000
+      priority: 16000
     }
     symbol {
       name: "tramway-mini"
@@ -29005,14 +29046,14 @@ cont {
   }
   element {
     scale: 16
-    caption {
+    path_text {
       primary {
         height: 11
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 15000
+      priority: 16000
     }
     symbol {
       name: "tramway-mini"
@@ -29025,14 +29066,14 @@ cont {
       name: "tramway"
       priority: 16000
     }
-    caption {
+    path_text {
       primary {
         height: 12
         color: 0x3050D8
         stroke_color: 0xFFFFFF
         offset_y: 14
       }
-      priority: 15000
+      priority: 16000
     }
   }
 }
@@ -29043,7 +29084,7 @@ cont {
     lines {
       width: 0.5
       color: 0x404040
-      priority: 1231
+      priority: 1230
     }
   }
   element {
@@ -29051,7 +29092,7 @@ cont {
     lines {
       width: 0.85
       color: 0x404040
-      priority: 1243
+      priority: 1242
     }
   }
   element {
@@ -29059,7 +29100,7 @@ cont {
     lines {
       width: 1.6
       color: 0x404040
-      priority: 1202
+      priority: 1200
     }
     lines {
       width: 1
@@ -29069,12 +29110,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1335
     }
     lines {
       width: 1
       color: 0xE6E6E6
-      priority: 1307
+      priority: 1306
     }
   }
   element {
@@ -29092,12 +29133,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1412
+      priority: 1411
     }
     lines {
       width: 1.4
       color: 0xE6E6E6
-      priority: 1385
+      priority: 1384
     }
   }
   element {
@@ -29105,7 +29146,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1526
+      priority: 1524
     }
     lines {
       width: 1.2
@@ -29115,12 +29156,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1658
+      priority: 1656
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1631
+      priority: 1629
     }
   }
   element {
@@ -29128,7 +29169,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1565
+      priority: 1563
     }
     lines {
       width: 1.36
@@ -29138,12 +29179,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1735
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1690
+      priority: 1688
     }
   }
 }
@@ -29154,7 +29195,7 @@ cont {
     lines {
       width: 0.5
       color: 0x404040
-      priority: 1231
+      priority: 1230
     }
   }
   element {
@@ -29162,7 +29203,7 @@ cont {
     lines {
       width: 0.85
       color: 0x404040
-      priority: 1243
+      priority: 1242
     }
   }
   element {
@@ -29170,7 +29211,7 @@ cont {
     lines {
       width: 1.6
       color: 0x404040
-      priority: 1202
+      priority: 1200
     }
     lines {
       width: 1
@@ -29180,12 +29221,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1335
     }
     lines {
       width: 1
       color: 0xE6E6E6
-      priority: 1307
+      priority: 1306
     }
   }
   element {
@@ -29203,12 +29244,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1412
+      priority: 1411
     }
     lines {
       width: 1.4
       color: 0xE6E6E6
-      priority: 1385
+      priority: 1384
     }
   }
   element {
@@ -29216,7 +29257,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1526
+      priority: 1524
     }
     lines {
       width: 9.2
@@ -29232,12 +29273,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1658
+      priority: 1656
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1631
+      priority: 1629
     }
     lines {
       width: 11.2
@@ -29251,7 +29292,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1565
+      priority: 1563
     }
     lines {
       width: 9.36
@@ -29267,12 +29308,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1735
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1690
+      priority: 1688
     }
     lines {
       width: 11.36
@@ -29289,7 +29330,7 @@ cont {
     lines {
       width: 0.5
       color: 0x404040
-      priority: 1231
+      priority: 1230
     }
   }
   element {
@@ -29297,7 +29338,7 @@ cont {
     lines {
       width: 0.85
       color: 0x404040
-      priority: 1243
+      priority: 1242
     }
   }
   element {
@@ -29305,7 +29346,7 @@ cont {
     lines {
       width: 1.6
       color: 0x404040
-      priority: 1202
+      priority: 1200
     }
     lines {
       width: 1
@@ -29315,12 +29356,12 @@ cont {
         dd: 6
       }
       cap: BUTTCAP
-      priority: 1336
+      priority: 1335
     }
     lines {
       width: 1
       color: 0xE6E6E6
-      priority: 1307
+      priority: 1306
     }
   }
   element {
@@ -29338,12 +29379,12 @@ cont {
         dd: 12
       }
       cap: BUTTCAP
-      priority: 1412
+      priority: 1411
     }
     lines {
       width: 1.4
       color: 0xE6E6E6
-      priority: 1385
+      priority: 1384
     }
   }
   element {
@@ -29357,7 +29398,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1526
+      priority: 1524
     }
     lines {
       width: 1.2
@@ -29367,12 +29408,12 @@ cont {
         dd: 16
       }
       cap: BUTTCAP
-      priority: 1658
+      priority: 1656
     }
     lines {
       width: 1.2
       color: 0xE6E6E6
-      priority: 1631
+      priority: 1629
     }
     lines {
       width: 11.2
@@ -29396,7 +29437,7 @@ cont {
     lines {
       width: 2.4
       color: 0x333333
-      priority: 1565
+      priority: 1563
     }
     lines {
       width: 1.36
@@ -29406,12 +29447,12 @@ cont {
         dd: 16.8
       }
       cap: BUTTCAP
-      priority: 1736
+      priority: 1735
     }
     lines {
       width: 1.36
       color: 0xE6E6E6
-      priority: 1690
+      priority: 1688
     }
     lines {
       width: 11.36
@@ -29437,7 +29478,7 @@ cont {
         dd: 1
       }
       cap: BUTTCAP
-      priority: 1143
+      priority: 1142
     }
   }
   element {
@@ -29450,7 +29491,7 @@ cont {
         dd: 1
       }
       cap: BUTTCAP
-      priority: 1143
+      priority: 1142
     }
   }
   element {
@@ -29463,7 +29504,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1048
+      priority: 1046
     }
   }
   element {
@@ -29476,7 +29517,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1146
+      priority: 1144
     }
   }
   element {
@@ -29489,7 +29530,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1146
+      priority: 1144
     }
   }
   element {
@@ -29502,7 +29543,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1378
+      priority: 1377
     }
   }
   element {
@@ -29528,7 +29569,7 @@ cont {
         dd: 2
       }
       cap: BUTTCAP
-      priority: 1473
+      priority: 1470
     }
   }
   element {
@@ -29541,7 +29582,7 @@ cont {
         dd: 5
       }
       cap: BUTTCAP
-      priority: 1639
+      priority: 1637
     }
   }
   element {
@@ -29554,7 +29595,7 @@ cont {
         dd: 8
       }
       cap: BUTTCAP
-      priority: 1809
+      priority: 1808
     }
   }
   element {
@@ -29567,7 +29608,7 @@ cont {
         dd: 8
       }
       cap: BUTTCAP
-      priority: 1929
+      priority: 1928
     }
   }
 }
@@ -30780,7 +30821,7 @@ cont {
     lines {
       width: 0.38
       color: 0x202020
-      priority: 1121
+      priority: 1120
     }
   }
   element {
@@ -30788,7 +30829,7 @@ cont {
     lines {
       width: 1.5
       color: 0x202020
-      priority: 1129
+      priority: 1127
     }
   }
   element {
@@ -30796,7 +30837,7 @@ cont {
     lines {
       width: 3
       color: 0x202020
-      priority: 1134
+      priority: 1132
     }
   }
   element {
@@ -30804,7 +30845,7 @@ cont {
     lines {
       width: 4
       color: 0x202020
-      priority: 1139
+      priority: 1137
     }
   }
 }
@@ -30815,7 +30856,7 @@ cont {
     lines {
       width: 0.3
       color: 0xCDE5EA
-      priority: 1060
+      priority: 1058
     }
   }
   element {
@@ -30823,7 +30864,7 @@ cont {
     lines {
       width: 0.4
       color: 0xCDE5EA
-      priority: 1068
+      priority: 1066
     }
   }
   element {
@@ -30831,7 +30872,7 @@ cont {
     lines {
       width: 0.3
       color: 0xCDE5EA
-      priority: 1090
+      priority: 1088
     }
   }
   element {
@@ -30839,7 +30880,7 @@ cont {
     lines {
       width: 0.6
       color: 0xCDE5EA
-      priority: 1097
+      priority: 1095
     }
   }
   element {
@@ -30847,14 +30888,14 @@ cont {
     lines {
       width: 0.6
       color: 0xCDE5EA
-      priority: 1102
+      priority: 1100
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16102
+      priority: 16100
     }
   }
   element {
@@ -30862,14 +30903,14 @@ cont {
     lines {
       width: 0.8
       color: 0xCDE5EA
-      priority: 1107
+      priority: 1105
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16107
+      priority: 16105
     }
   }
 }
@@ -30880,7 +30921,7 @@ cont {
     lines {
       width: 0.3
       color: 0xCDE5EA
-      priority: 1060
+      priority: 1058
     }
   }
   element {
@@ -30888,7 +30929,7 @@ cont {
     lines {
       width: 0.4
       color: 0xCDE5EA
-      priority: 1068
+      priority: 1066
     }
   }
   element {
@@ -30896,7 +30937,7 @@ cont {
     lines {
       width: 0.3
       color: 0xCDE5EA
-      priority: 1090
+      priority: 1088
     }
   }
   element {
@@ -30904,7 +30945,7 @@ cont {
     lines {
       width: 0.6
       color: 0xCDE5EA
-      priority: 1097
+      priority: 1095
     }
   }
   element {
@@ -30912,14 +30953,14 @@ cont {
     lines {
       width: 0.6
       color: 0xCDE5EA
-      priority: 1102
+      priority: 1100
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16102
+      priority: 16100
     }
     lines {
       width: 8.6
@@ -30943,14 +30984,14 @@ cont {
     lines {
       width: 0.8
       color: 0xCDE5EA
-      priority: 1107
+      priority: 1105
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16107
+      priority: 16105
     }
     lines {
       width: 8.8
@@ -30972,88 +31013,60 @@ cont {
 }
 cont {
   name: "waterway-dock"
-  element {
-    scale: 6
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 0xCDE5EA
-      priority: -15915
-    }
-  }
   element {
     scale: 10
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 11
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 12
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 13
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 14
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 15
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 16
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
   element {
     scale: 17
     area {
       color: 0xCDE5EA
-      priority: -15915
+      priority: -15917
     }
   }
 }
@@ -31064,7 +31077,7 @@ cont {
     lines {
       width: 1
       color: 0xCDE5EA
-      priority: 1058
+      priority: 1056
     }
   }
   element {
@@ -31072,7 +31085,7 @@ cont {
     lines {
       width: 1.5
       color: 0xCDE5EA
-      priority: 1065
+      priority: 1063
     }
   }
   element {
@@ -31088,13 +31101,13 @@ cont {
     lines {
       width: 3.5
       color: 0xB0B0B0
-      priority: 95
+      priority: 93
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 0xCDE5EA
-      priority: 1095
+      priority: 1093
     }
   }
   element {
@@ -31109,13 +31122,13 @@ cont {
     lines {
       width: 5.2
       color: 0xB0B0B0
-      priority: 100
+      priority: 98
       cap: BUTTCAP
     }
     lines {
       width: 4
       color: 0xCDE5EA
-      priority: 1100
+      priority: 1098
     }
   }
   element {
@@ -31123,20 +31136,20 @@ cont {
     lines {
       width: 8
       color: 0xB0B0B0
-      priority: 104
+      priority: 102
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xCDE5EA
-      priority: 1104
+      priority: 1102
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16104
+      priority: 16102
     }
   }
 }
@@ -31147,7 +31160,7 @@ cont {
     lines {
       width: 1
       color: 0xCDE5EA
-      priority: 1058
+      priority: 1056
     }
   }
   element {
@@ -31155,7 +31168,7 @@ cont {
     lines {
       width: 1.5
       color: 0xCDE5EA
-      priority: 1065
+      priority: 1063
     }
   }
   element {
@@ -31171,13 +31184,13 @@ cont {
     lines {
       width: 3.5
       color: 0xB0B0B0
-      priority: 95
+      priority: 93
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 0xCDE5EA
-      priority: 1095
+      priority: 1093
     }
   }
   element {
@@ -31198,13 +31211,13 @@ cont {
     lines {
       width: 5.2
       color: 0xB0B0B0
-      priority: 100
+      priority: 98
       cap: BUTTCAP
     }
     lines {
       width: 4
       color: 0xCDE5EA
-      priority: 1100
+      priority: 1098
     }
     lines {
       width: 14
@@ -31222,20 +31235,20 @@ cont {
     lines {
       width: 8
       color: 0xB0B0B0
-      priority: 104
+      priority: 102
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 0xCDE5EA
-      priority: 1104
+      priority: 1102
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16104
+      priority: 16102
     }
     lines {
       width: 14.4
@@ -31262,13 +31275,13 @@ cont {
     lines {
       width: 6
       color: 0x202020
-      priority: 70
+      priority: 68
       cap: BUTTCAP
     }
     lines {
       width: 5
       color: 0xF8F8F8
-      priority: 1070
+      priority: 1068
     }
   }
   element {
@@ -31276,13 +31289,13 @@ cont {
     lines {
       width: 10
       color: 0x202020
-      priority: 75
+      priority: 73
       cap: BUTTCAP
     }
     lines {
       width: 9
       color: 0xF8F8F8
-      priority: 1075
+      priority: 1073
     }
   }
   element {
@@ -31290,13 +31303,13 @@ cont {
     lines {
       width: 12
       color: 0x202020
-      priority: 78
+      priority: 75
       cap: BUTTCAP
     }
     lines {
       width: 10
       color: 0xF8F8F8
-      priority: 1078
+      priority: 1075
     }
   }
   element {
@@ -31304,13 +31317,13 @@ cont {
     lines {
       width: 16
       color: 0x202020
-      priority: 80
+      priority: 78
       cap: BUTTCAP
     }
     lines {
       width: 12
       color: 0xF8F8F8
-      priority: 1080
+      priority: 1078
     }
   }
 }
@@ -31538,34 +31551,6 @@ cont {
 }
 cont {
   name: "waterway-riverbank"
-  element {
-    scale: 6
-    area {
-      color: 0xCDE5EA
-      priority: -15983
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 0xCDE5EA
-      priority: -15983
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 0xCDE5EA
-      priority: -15983
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 0xCDE5EA
-      priority: -15983
-    }
-  }
   element {
     scale: 10
     area {
@@ -31630,7 +31615,7 @@ cont {
     lines {
       width: 0.75
       color: 0xCDE5EA
-      priority: 1056
+      priority: 1053
     }
   }
   element {
@@ -31638,7 +31623,7 @@ cont {
     lines {
       width: 1
       color: 0xCDE5EA
-      priority: 1063
+      priority: 1061
     }
   }
   element {
@@ -31646,7 +31631,7 @@ cont {
     lines {
       width: 1
       color: 0xCDE5EA
-      priority: 1087
+      priority: 1085
     }
   }
   element {
@@ -31654,7 +31639,7 @@ cont {
     lines {
       width: 2
       color: 0xCDE5EA
-      priority: 1092
+      priority: 1090
     }
   }
   element {
@@ -31669,7 +31654,7 @@ cont {
     lines {
       width: 2
       color: 0xCDE5EA
-      priority: 1095
+      priority: 1093
     }
   }
   element {
@@ -31684,7 +31669,7 @@ cont {
     lines {
       width: 2.2
       color: 0xCDE5EA
-      priority: 1100
+      priority: 1098
     }
   }
 }
@@ -31695,7 +31680,7 @@ cont {
     lines {
       width: 0.75
       color: 0xCDE5EA
-      priority: 1056
+      priority: 1053
     }
   }
   element {
@@ -31703,7 +31688,7 @@ cont {
     lines {
       width: 1
       color: 0xCDE5EA
-      priority: 1063
+      priority: 1061
     }
   }
   element {
@@ -31716,7 +31701,7 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1082
+      priority: 1080
     }
   }
   element {
@@ -31729,7 +31714,7 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1090
+      priority: 1088
     }
   }
   element {
@@ -31742,19 +31727,19 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1092
+      priority: 1090
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16092
+      priority: 16090
     }
     lines {
       width: 2
       color: 0xCDE5EA
-      priority: 1095
+      priority: 1093
     }
   }
   element {
@@ -31767,19 +31752,19 @@ cont {
         dd: 1.6
       }
       cap: BUTTCAP
-      priority: 1097
+      priority: 1095
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16097
+      priority: 16095
     }
     lines {
       width: 2.2
       color: 0xCDE5EA
-      priority: 1100
+      priority: 1098
     }
   }
 }
@@ -31790,7 +31775,7 @@ cont {
     lines {
       width: 0.75
       color: 0xCDE5EA
-      priority: 1056
+      priority: 1053
     }
   }
   element {
@@ -31798,7 +31783,7 @@ cont {
     lines {
       width: 1
       color: 0xCDE5EA
-      priority: 1063
+      priority: 1061
     }
   }
   element {
@@ -31811,7 +31796,7 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1087
+      priority: 1085
     }
   }
   element {
@@ -31824,7 +31809,7 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1092
+      priority: 1090
     }
   }
   element {
@@ -31849,7 +31834,7 @@ cont {
     lines {
       width: 2
       color: 0xCDE5EA
-      priority: 1095
+      priority: 1093
     }
   }
   element {
@@ -31862,19 +31847,19 @@ cont {
         dd: 0.8
       }
       cap: BUTTCAP
-      priority: 1095
+      priority: 1093
     }
     path_text {
       primary {
         height: 12
         color: 0xFFFFFF
       }
-      priority: 16095
+      priority: 16093
     }
     lines {
       width: 2.2
       color: 0xCDE5EA
-      priority: 1100
+      priority: 1098
     }
   }
 }
@@ -31885,7 +31870,7 @@ cont {
     lines {
       width: 0.75
       color: 0xCDE5EA
-      priority: 1056
+      priority: 1053
     }
   }
   element {
@@ -31893,7 +31878,7 @@ cont {
     lines {
       width: 1
       color: 0xCDE5EA
-      priority: 1063
+      priority: 1061
     }
   }
   element {
@@ -31901,7 +31886,7 @@ cont {
     lines {
       width: 1
       color: 0xCDE5EA
-      priority: 1087
+      priority: 1085
     }
   }
   element {
@@ -31909,7 +31894,7 @@ cont {
     lines {
       width: 2
       color: 0xCDE5EA
-      priority: 1092
+      priority: 1090
     }
   }
   element {
@@ -31930,7 +31915,7 @@ cont {
     lines {
       width: 2
       color: 0xCDE5EA
-      priority: 1095
+      priority: 1093
     }
     lines {
       width: 12
@@ -31961,7 +31946,7 @@ cont {
     lines {
       width: 2.2
       color: 0xCDE5EA
-      priority: 1100
+      priority: 1098
     }
     lines {
       width: 12.2
@@ -31982,7 +31967,7 @@ cont {
     lines {
       width: 0.25
       color: 0x000044
-      priority: 1119
+      priority: 1117
     }
   }
   element {
@@ -31990,7 +31975,7 @@ cont {
     lines {
       width: 1
       color: 0x000044
-      priority: 1126
+      priority: 1125
     }
   }
   element {
@@ -31998,7 +31983,7 @@ cont {
     lines {
       width: 2
       color: 0x000044
-      priority: 1131
+      priority: 1129
     }
   }
   element {
@@ -32006,7 +31991,7 @@ cont {
     lines {
       width: 3
       color: 0x000044
-      priority: 1136
+      priority: 1134
     }
   }
 }
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 089b4d372a..2eb55cd2d1 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -881,3 +881,4 @@ area:highway|trunk;[area:highway=trunk];;name;int_name;880;
 area:highway|residental;[area:highway=residental];x;name;int_name;881;
 entrance;[entrance];;ref;addr:flats;882;
 oneway;[oneway?];;name;int_name;883;
+highway|proposed;[highway=proposed];;name;int_name;884;
diff --git a/data/normal.mapcss b/data/normal.mapcss
index ace7f360ab..57f2764400 100644
--- a/data/normal.mapcss
+++ b/data/normal.mapcss
@@ -56,12 +56,12 @@ area|z12-14[landuse=basin],
 area|z12-14[landuse=reservoir],
 area|z13-[leisure=swimming_pool],
 area[natural=ocean],
-area|z6-13[natural=lake],
-area|z6-11[natural=pond],
+area|z10-13[natural=lake],
+area|z10-11[natural=pond],
 area|z15-[natural=pond],
-area|z6-13[natural=water],
-area|z6-[waterway=dock],
-area|z6-[waterway=riverbank],
+area|z10-13[natural=water],
+area|z10-[waterway=dock],
+area|z10-[waterway=riverbank],
 area|z17-[amenity=fountain]::d1p2,
 area|z15-[landuse=basin]::d1p2,
 area|z15-[landuse=reservoir]::d1p2,
@@ -351,7 +351,6 @@ node|z7[place=country]::d1p3
   font-size:	14;
   text-color:	#a0a090;
 }
-line|z7[highway=primary],
 line|z7[highway=trunk]
 {
   color:	#eed4a6;
@@ -400,7 +399,6 @@ line|z8-11[boundary=administrative][admin_level=2]::d2p2
   dashes:	3.12,3.12;
   linecap:	butt;
 }
-line|z8[highway=primary],
 line|z8[highway=trunk]
 {
   color:	#f7d396;
@@ -448,8 +446,8 @@ node|z16[place=locality]
   text-color:	#606060;
   text-halo-color:	#eeeedd;
 }
-area|z8-14[place=island],
-node|z8-14[place=island]
+area|z10-14[place=island],
+node|z10-14[place=island]
 {
   text:	name;
   font-size:	12;
@@ -489,7 +487,6 @@ node|z13[aeroway=aerodrome]::d1p3
 {
   icon-image:	airport.svg;
 }
-line|z9[highway=primary],
 line|z9-10[highway=trunk]
 {
   color:	#ffc444;
@@ -571,12 +568,6 @@ line|z9[boundary=administrative][border_type=state]::d2p2
   dashes:	2.5,0.5,0.5,0.5;
   linecap:	butt;
 }
-line|z9[railway=rail]
-{
-  color:	#b0b0b0;
-  width:	1.56;
-  z-index:	59;
-}
 line|z10[highway=secondary]
 {
   color:	#fffb80;
@@ -667,54 +658,26 @@ line|z10[boundary=administrative][border_type=state]::d2p2
   dashes:	5,1,1,1;
   linecap:	butt;
 }
+area|z12-[landuse=farm],
+area|z12-[landuse=farmland]
+{
+  fill-color: #DFDF97;
+}
 area|z13-[amenity=grave_yard],
-area|z12-14[landuse=allotments],
-area|z13-14[landuse=cemetery],
-area|z12-14[landuse=farm],
-area|z12-14[landuse=farmland],
+area|z12-[landuse=allotments],
+area|z13-[landuse=cemetery],
 area|z12-[landuse=field],
-area|z10-14[landuse=forest],
-area|z15[landuse=forest][wood=deciduous],
-area|z17-[landuse=forest][wood=deciduous],
-area|z10-14[landuse=forest][wood=mixed],
-area|z12-14[landuse=grass],
-area|z12-14[landuse=meadow],
-area|z12-14[landuse=recreation_ground],
-area|z12-14[landuse=village_green],
-area|z12-16[leisure=sports_centre],
-area|z12-16[leisure=stadium],
+area|z10-[landuse=forest],
+area|z12-[landuse=grass],
+area|z12-[landuse=meadow],
+area|z12-[landuse=recreation_ground],
+area|z12-[landuse=village_green],
+area|z12-[leisure=sports_centre],
+area|z12-[leisure=stadium],
 area|z12-[leisure=track],
 area|z13-[leisure=water_park],
 area|z12-[natural=scrub],
-area|z10-[natural=wood],
-area|z15-[landuse=allotments]::d1p2,
-area|z15-[landuse=cemetery]::d1p2,
-area|z15-[landuse=farm]::d1p2,
-area|z15-[landuse=farmland]::d1p2,
-area|z15-[landuse=forest]::d1p2,
-area|z15-[landuse=grass]::d1p2,
-area|z15-[landuse=meadow]::d1p2,
-area|z15-[landuse=recreation_ground]::d1p2,
-area|z15-[landuse=village_green]::d1p2,
-area|z17-[leisure=sports_centre]::d1p2,
-area|z17-[leisure=stadium]::d1p2,
-area|z15-[landuse=forest][wood=coniferous]::d2p2,
-area|z16[landuse=forest][wood=deciduous]::d2p2,
-area|z15-[landuse=forest][wood=mixed]::d2p2,
-node|z15-[landuse=allotments]::d1p2,
-node|z15-[landuse=cemetery]::d1p2,
-node|z15-[landuse=farm]::d1p2,
-node|z15-[landuse=farmland]::d1p2,
-node|z15-[landuse=forest]::d1p2,
-node|z15-[landuse=grass]::d1p2,
-node|z15-[landuse=meadow]::d1p2,
-node|z15-[landuse=recreation_ground]::d1p2,
-node|z15-[landuse=village_green]::d1p2,
-node|z17-[leisure=sports_centre]::d1p2,
-node|z17-[leisure=stadium]::d1p2,
-node|z15-[landuse=forest][wood=coniferous]::d2p2,
-node|z16[landuse=forest][wood=deciduous]::d2p2,
-node|z15-[landuse=forest][wood=mixed]::d2p2
+area|z10-[natural=wood]
 {
   fill-color:	#d0e8c4;
 }
@@ -756,12 +719,23 @@ line|z10[boundary=national_park]
   z-index:	154;
   dashes:	5,1,1,1;
 }
-line|z10-11[highway=primary],
+line|z10[highway=primary]
+{
+  color:    #FDE066;
+  width:    1;
+  linecap:  butt;
+}
+line|z11[highway=primary]
+{
+  color:    #FDE066;
+  width:    2;
+  linecap:  butt;
+}
 line|z11[highway=trunk]
 {
-  color:	#ffc444;
-  width:	3;
-  linecap:	butt;
+  color:    #ffc444;
+  width:    3;
+  linecap:  butt;
 }
 area|z13-[amenity=college],
 area|z13-[amenity=kindergarten],
@@ -799,10 +773,10 @@ line|z11[boundary=administrative][border_type=state]
   width:	10;
   z-index:	152;
 }
-line|z11[highway=primary_link]
+line|z10-11[highway=primary_link]
 {
-  color:	#ffc444;
-  width:	1.62;
+  color:	#FDE066;
+  width:	1;
 }
 line|z11[boundary=national_park]
 {
@@ -968,12 +942,18 @@ line|z12[man_made=cutline]
   dashes:	2.25,3;
   linecap:	butt;
 }
-line|z12[highway=primary],
+line|z12[highway=primary]
+{
+  color:    #FDE066;
+  width:    3;
+  casing-linecap:    butt;
+  casing-width: 1;
+  casing-color: #d8a050;
+}
 line|z12[highway=trunk]
 {
   color:	#ffc444;
   width:	3;
-  z-index:	482;
   casing-linecap:	 butt;
   casing-width:	1;
   casing-color:	#d8a050;
@@ -1190,7 +1170,6 @@ line|z12-13[highway=trunk]
   font-size:	12;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#303030;
   text-halo-color:	#ffc444;
 }
@@ -1218,8 +1197,8 @@ line|z12[boundary=national_park]
 }
 line|z12[highway=primary_link]
 {
-  color:	#ffc444;
-  width:	1.69;
+  color:	#FDE066;
+  width:	3;
 }
 line|z12[highway=raceway]
 {
@@ -1239,7 +1218,7 @@ line|z12[boundary=administrative][admin_level=2]::d2p2
 line|z12[highway=tertiary_link]
 {
   color:	#ffff90;
-  width:	1.44;
+  width:	1;
 }
 line|z12[waterway=canal]
 {
@@ -1512,9 +1491,7 @@ line|z13-15[highway=secondary]
   font-size:	12;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#404040;
-  text-halo-color:	#fffb80;
 }
 line|z13[highway=raceway]
 {
@@ -1538,8 +1515,8 @@ line|z13[highway=track][tracktype=grade5]
 }
 line|z13[highway=primary_link]
 {
-  color:	#ffc444;
-  width:	2.75;
+  color:	#FDE066;
+  width:	3;
 }
 line|z13[railway=funicular]
 {
@@ -1652,9 +1629,7 @@ line|z13-14[highway=motorway]
   font-size:	16;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#202020;
-  text-halo-color:	#f08800;
 }
 line|z13[highway=cycleway]
 {
@@ -1748,7 +1723,14 @@ line|z13[piste:type=downhill][piste:difficulty=advanced]
   color:	#202020;
   width:	2.5;
 }
-line|z13[highway=primary],
+line|z13[highway=primary]
+{
+  color:    #FDE066;
+  width:    5;
+  casing-linecap:    butt;
+  casing-width: 1;
+  casing-color: #d8a050;
+}
 line|z13[highway=trunk]
 {
   color:	#ffc444;
@@ -1991,9 +1973,7 @@ line|z14-[highway=tertiary]
   font-size:	12;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#404040;
-  text-halo-color:	#ffff90;
 }
 area|z14-[natural=cave_entrance]::d1p2,
 node|z14-[natural=cave_entrance]::d1p2
@@ -2051,7 +2031,6 @@ line|z14[piste:lift=t-bar]
 {
   text:	name;
   font-size:	12;
-  text-position:	line;
   text-color:	#202020;
 }
 line|z14[railway=construction]::d1p3
@@ -2125,9 +2104,7 @@ line|z14[highway=trunk]
   font-size:	14;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#303030;
-  text-halo-color:	#ffc444;
 }
 line|z14[railway=spur]
 {
@@ -2189,7 +2166,7 @@ line|z14[route=ferry]
   dashes:	3,2;
   linecap:	butt;
 }
-line|z14[railway=rail]::d1p3,
+line|z14[railway=rail],
 {
   color:	#888888;
   z-index:	198;
@@ -2399,7 +2376,7 @@ line|z14[railway=disused]
 }
 line|z14[highway=primary_link]
 {
-  color:	#ffc444;
+  color:	#FDE066;
   width:	4.5;
 }
 line|z14[railway=construction]::d1p2
@@ -2428,7 +2405,6 @@ line|z14-[waterway=river]
 {
   text:	name;
   font-size:	12;
-  text-position:	line;
   text-color:	#507cea;
 }
 line|z14[railway=yard]::d1p2
@@ -2467,9 +2443,7 @@ line|z15-[highway=tertiary_link]
   font-size:	12;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#202020;
-  text-halo-color:	white;
 }
 line|z14[highway=tertiary_link]
 {
@@ -2703,7 +2677,14 @@ line|z14[railway=disused]::d1p3
   z-index:	299;
   dashes:	4.5,4.5;
 }
-line|z14[highway=primary],
+line|z14[highway=primary]
+{
+  color:    #FDE066;
+  width:    7;
+  casing-linecap:    butt;
+  casing-width: 1;
+  casing-color: #d8a050;
+}
 line|z14[highway=trunk]
 {
   color:	#ffc444;
@@ -2712,6 +2693,16 @@ line|z14[highway=trunk]
   casing-width:	1;
   casing-color:	#d8a050;
 }
+line|z10-12[highway=secondary_link]
+{
+  color:    #fffb80;
+  width:    1;
+}
+line|z13[highway=secondary_link]
+{
+  color:    #fffb80;
+  width:    2;
+}
 line|z14[highway=secondary_link]
 {
   color:	#fffb80;
@@ -2991,7 +2982,37 @@ line|z15[railway=abandoned]
   z-index:	285;
   opacity:	0.4;
 }
-line|z15[highway=primary],
+
+
+line|z10-12[highway=trunk_link]
+{
+  color:    #ffc444;
+  width:    1;
+}
+
+line|z13[highway=trunk_link]
+{
+  color:    #ffc444;
+  width:    2;
+}
+
+line|z14[highway=trunk_link]
+{
+  color:    #ffc444;
+  width:    4;
+  casing-linecap:    butt;
+  casing-width: 1;
+  casing-color: #d8a050;
+}
+
+line|z15[highway=primary]
+{
+  color:    #FDE066;
+  width:    8;
+  casing-linecap:    butt;
+  casing-width: 2;
+  casing-color: #d8a050;
+}
 line|z15[highway=trunk],
 line|z15[highway=trunk_link]
 {
@@ -3059,17 +3080,7 @@ node|z15-[place=village]::d1p4
   text-color:	#909090;
   text-halo-color:	#eeeedd;
 }
-line|z15[highway=primary],
-line|z15[highway=trunk],
-line|z15[highway=trunk_link]
-{
-  font-size:	16;
-  text-halo-radius:	2;
-  text:	name;
-  text-position:	line;
-  text-color:	#303030;
-  text-halo-color:	#ffc444;
-}
+
 area|z16-[amenity=parking][access=permissive],
 node|z16-[amenity=parking][access=permissive],
 {
@@ -3169,7 +3180,7 @@ line|z15[highway=track][tracktype=grade3]
 }
 line|z15[highway=primary_link]
 {
-  color:	#ffc444;
+  color:	#FDE066;
   width:	9;
 }
 line|z15[railway=spur]
@@ -3195,7 +3206,7 @@ line|z15[waterway=stream][intermittent=yes]
   dashes:	2.4,0.8;
   linecap:	butt;
 }
-line|z15[railway=rail]::d1p3
+line|z15[railway=rail]
 {
   color:	#666666;
   z-index:	287;
@@ -3408,9 +3419,7 @@ line|z15-[highway=unclassified]
   font-size:	12;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#505050;
-  text-halo-color:	white;
 }
 line|z15[waterway=stream]
 {
@@ -3714,9 +3723,7 @@ line|z15[highway=motorway]
   font-size:	17;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#202020;
-  text-halo-color:	#f08800;
 }
 line|z15[railway=disused]::d1p3
 {
@@ -3791,7 +3798,7 @@ line|z15-[piste:lift=platter]::d1p2
 {
   color:	#202020;
   width:	8;
-  dashes:	0.8,40;
+  dashes:	1,40;
   linecap:	butt;
 }
 line|z15[railway=construction]::d1p2
@@ -3800,11 +3807,27 @@ line|z15[railway=construction]::d1p2
   width:	2;
   z-index:	381;
 }
-line|z15[highway=motorway_link]::d1p2
+
+
+line|z12[highway=motorway_link]
+{
+  color:    #f08800;
+  width:    1;
+}
+line|z13[highway=motorway_link]
+{
+  color:    #f08800;
+  width:    2;
+}
+line|z14[highway=motorway_link]
+{
+  color:    #f08800;
+  width:    4;
+}
+line|z15[highway=motorway_link]
 {
   color:	#f08800;
-  width:	9;
-  z-index:	527;
+  width:	8;
 }
 line|z15[boundary=administrative][type=nation]::d2p2
 {
@@ -4006,7 +4029,7 @@ line|z16[highway=bridleway]::d1p2
 }
 line|z16[highway=primary_link]
 {
-  color:	#ffc444;
+  color:	#FDE066;
   width:	12;
 }
 line|z16[railway=spur]
@@ -4300,9 +4323,7 @@ line|z16-[highway=motorway]
   font-size:	18;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#202020;
-  text-halo-color:	#f08800;
 }
 area|z16-[amenity=fast_food],
 node|z16-[amenity=fast_food]
@@ -4501,9 +4522,7 @@ line|z16[highway=secondary]
   font-size:	14;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#404040;
-  text-halo-color:	#fffb80;
 }
 area|z16-[amenity=embassy],
 node|z16-[amenity=embassy]
@@ -4555,7 +4574,7 @@ line|z16-[railway=tram]::d1p3
   dashes:	9.6,14.4;
   linecap:	butt;
 }
-line|z16[railway=rail]::d1p4
+line|z16[railway=rail]
 {
   color:	#e6e6e6;
   width:	2.4;
@@ -4579,7 +4598,6 @@ line|z16-[waterway=stream]
 {
   text:	name;
   font-size:	12;
-  text-position:	line;
   text-color:	white;
 }
 line|z16[highway=path]
@@ -5220,7 +5238,15 @@ line|z16[railway=abandoned]::d1p2
   z-index:	629;
   opacity:	0.4;
 }
-line|z16[highway=primary],
+line|z16[highway=primary]
+{
+  color:    #FDE066;
+  width:    14;
+  casing-linecap:    butt;
+  casing-width: 2;
+  casing-color: #d8a050;
+}
+
 line|z16[highway=trunk],
 line|z16[highway=trunk_link]
 {
@@ -5441,9 +5467,7 @@ line|z16-[highway=trunk_link]
   font-size:	17;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#404040;
-  text-halo-color:	#ffc444;
 }
 line|z16-[highway=bridleway],
 line|z16-[highway=byway],
@@ -5461,9 +5485,7 @@ line|z16-[man_made=cutline]
   font-size:	12;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#606060;
-  text-halo-color:	white;
 }
 line|z16[natural=glacier]
 {
@@ -5560,7 +5582,7 @@ line|z17-[piste:lift=magic_carpet]
   color:	#101010;
   width:	6.4;
 }
-line|z17-[railway=rail]::d1p3
+line|z17-[railway=rail]
 {
   color:	#666666;
   z-index:	568;
@@ -5778,6 +5800,7 @@ line|z17-[aerialway=mixed_lift]
   width:	3.2;
   z-index:	912;
 }
+line|z17-[highway=proposed],
 line|z17-[highway=construction]
 {
   color:	#d0d0d0;
@@ -6051,7 +6074,7 @@ node|z17-[amenity=parking][parking=multi-storey]
 }
 line|z17-[highway=primary_link]
 {
-  color:	#ffc444;
+  color:	#FDE066;
   width:	12;
 }
 line|z17-[highway=raceway]
@@ -6224,7 +6247,15 @@ node|z17-[place=suburb]::d1p3
   text-color:	#a0a0a0;
   z-index: 20;
 }
-line|z17-[highway=primary],
+line|z17-[highway=primary]
+{
+  color:    #FDE066;
+  width:    16;
+  casing-linecap:    butt;
+  casing-width: 2;
+  casing-color: #d8a050;
+}
+
 line|z17-[highway=trunk],
 line|z17-[highway=trunk_link]
 {
@@ -6668,9 +6699,7 @@ line|z17-[highway=secondary]
   font-size:	16;
   text-halo-radius:	2;
   text:	name;
-  text-position:	line;
   text-color:	#404040;
-  text-halo-color:	#fffb80;
 }
 line|z17-[highway=track][tracktype=grade5]
 {
@@ -6845,7 +6874,7 @@ line[highway=unclassified]
 area|z15-[area:highway=living_street] {fill-color: #707070;}
 line[highway=living_street] {z-index: 50}
 
-area|z15-[area:highway=primary] {fill-color: #ffc444}
+area|z15-[area:highway=primary] {fill-color: #FDE066}
 line[highway=primary], line[highway=primary_link]{z-index: 54}
 
 area|z15-[area:highway=secondary]{fill-color: #fffb80}
@@ -7046,6 +7075,20 @@ node|z16-[railway=station][transport=subway]
 
 /* Eval magic */
 
+line[highway],
+line[waterway]
+{
+  text-halo-color:  eval(prop("color"));
+}
+
+line[highway],
+line[waterway],
+line[railway],
+line[man_made=cutline]
+{
+    text-position: line;
+}
+
 line|z16-[bridge?]::bridgewhite,
 line|z16-[tunnel?]::tunnelwhite,
 {
diff --git a/data/types.txt b/data/types.txt
index 4830220d49..cfc77b7c57 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -881,3 +881,4 @@ area:highway|trunk
 mapswithme
 entrance
 oneway
+highway|proposed