From 2f9e11856acebba33abec1f5ca9d69e323575d41 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 2 Sep 2023 21:43:49 +0300
Subject: [PATCH] [styles] Regenerate for shields vs priorities changes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin                         | Bin 356483 -> 356411 bytes
 data/drules_proto.txt                         | 481 ++++++++----------
 data/drules_proto_clear.bin                   | Bin 357152 -> 357080 bytes
 data/drules_proto_clear.txt                   | 481 ++++++++----------
 data/drules_proto_dark.bin                    | Bin 355454 -> 355382 bytes
 data/drules_proto_dark.txt                    | 481 ++++++++----------
 data/drules_proto_vehicle_clear.bin           | Bin 261447 -> 261375 bytes
 data/drules_proto_vehicle_clear.txt           | 481 ++++++++----------
 data/drules_proto_vehicle_dark.bin            | Bin 260773 -> 260701 bytes
 data/drules_proto_vehicle_dark.txt            | 481 ++++++++----------
 .../clear/include/priorities_3_FG.prio.txt    | 110 ++--
 .../vehicle/include/priorities_3_FG.prio.txt  | 148 +++---
 data/visibility.txt                           |   6 +-
 13 files changed, 1252 insertions(+), 1417 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 8194ec98f8c6fec69857559672b5c645dafce7d3..89a4959e0badee89b7d62c9cd2b0858a1a28ab68 100644
GIT binary patch
delta 2233
zcmbuAZA@Eb6vy)~lv|M3ZmgK7z_JC<@lvqT0;R&#kSU{020GZJEzGUJpb!(Y4@MI;
zb9NILgCmg0OpIoeD12&+Z}Xe4xDV6BWSi`Zx(_hF88<-x&%Fi9;+73R-22Np&pGEg
z_kZra&ns85Kbg;-IkSWdGW-T=h&cnk*HMKFBkjxTKCxWQ`%lX*-ZNL!eb<VUu`|a&
zjC{Is_U8PND}Q&=7mk1!{Qw7OWC0z-)Nvg@13_9fCLL2I#MSulO+8^DL67t$>bN+l
zYDwLYp75es$GjN<Izz)c-c7=sX{l85Poi3JRx`M$!KLgXi@~fBR4Mzk1(nH5rG?Wb
zYo#Si-Wfxga(^*`O2sFW4ZfO;{mQ;o*|$>Aq1KmE(5aX<hJa!?#-dciJ|5$>)b;fu
zY4ED}OKAuy)}<SKYTT$hI}X3{_hcBHi?J+Ix1%RB5xzfh%2wDcKe&)BpO;~qY04&b
zC477`-_FM-KQ4hQnPDHnT4l+QK?f?7yQ~yW#V%4UQw^uZDtQ&KEBEEta!wge+`%UM
z>};B8U)m`K*;tKw36&#H8MDgxK4x4iM^H2N3(Cx1IAy2;+f`V!;*Peu@i28_c)J4~
zs`2Zv1}vHKSt7Q}9}YOwTEQa-#5M_xwV^;QXp&cnBq^#up$b`G$OBBjY)Uzkn6mj$
z=-{Cj0!NC&1EIr#fg|lbq26w#tIITD6Q7%sl9bdY&sJfpGAf<abz)7|{k7DUZt9vN
zgVlU;8oxU!GP%{ocZzHyHRf>BX_>D<PEv3n)Oqm0?RTQMb+X%OY)ggfrMK2FD05KN
zrNTi~mqQH5J|(Kdg>7q|Rhi9l!-L#d1MjH@a^<|sXz@Rvky<|_;oJnX{N+Zu+KH;~
zFg%&*2^M*-77r>B;)lR^P5yKseN6_ALr>DA(1Vg#TYh~odT_*pVpV*)Wi@WW@I>!>
zloLQiF74z$ClVd3M<f0<w>*Y?lPO}8nO-!@`JFJ!xdvzqoO}Y`K#S;#_+{~Vz5;KD
zktU}bP{8G{8qk$w8nwx5KGrAunhc(8;y;4+uT4~i%<~#-_41!Fs+X&@Y?6yD{AY0a
zJ1?S&t7Xpl(4jGm-&&{iJp;G+n>i^)a8hm=Y-NWlO?)@#;mq9P*-MYpi#(OJIz6{U
zS~#Xv52xpr1$tE0y?fU07~i;RFn$m-&HNge^IJ2&2BVrGIu|tgrG;NZmlp*pgv$HL
zX!_IeY&H$qq^TQDZAkCQDKG7$ex6>Wnstxl*P~DtyOD|^HJKd}=|?KFqK+QyhDu`_
zL9ss$pGq^!%iYja)vJg3zLJf-{5O)Eo6b#rxUTGsFgrDN4M<yTYL0shkKbao7K|O`
z=T#PlRV@7|j>X1LINZ-CVk_hQaBtxuvEc(wt{%htHy60u6YlF1@ijJj!hJi8J?bd9
o)lsy;6V84Lt+y+Cw<p}VtgrV!Pq?G5N$@i9N{G596L<ai4`^!IP5=M^

delta 2325
zcmb`IZA_b06vuP=LfdC6bd{H82@Dn&$UrFXEl>z0=%QiJAu}?yw6F++b+~BUK5UL`
z8BB%)IylKb43}t@EgEP1@H9cUkeC?bBs0NiVuma+8l%Wa{33D8|9PGg*CjJ^>_hv@
zIp^MUPS5}L-sy$3<G0eTT>6{l`OF~I0M~WchNz0>qrp4)=C_8Z8kim;FMN(wd~?w$
z@&Mf$qMxo_hLMmWdh2eNb-pa`kh9C0%%iW6i*07(6Wl&bC0IK$OnZS%M4iA3r!`EU
zrZB9m5e-uYx+m+PQQNR+)K&&e)M-QZkI30+P2oT-ZQ}z;WaeK?TKdgqEyWQX3uX!-
zZ_b#8_mXJVaMH~??NlxN*rM~=S@Meg&bZDm$Eix}cdb+@tc_Bo?W8;J1B0{D>g3fF
za*O*4+`<z!dRh3Ov@2(+Q{ur1>XI}o<P2FId^AA${8<TE`R)Ye#`A})n|Q`-bn(#%
zO5&zTs*#<;lN1vE5$Dpz#EQdqYLWO&JB5Yy$vWRp)+;M1)FJ-9IA`N@J2byK?x6lm
zQ_P*$##3HO<Ew6Z(hx(QLJSDZDaK&HEgs6?8-=vhhP6<j3JRPlr&5Wzi^wCq;ep^^
zmr%B>!Nfe6SavBDOKd*A#^t7whbZ?_G1|wrnPTb^W>%A*dyra;0WqYG7)vD-w&?Z3
z+*Ct8F09leYUx9j8t_4k+vPY%`Q=n1DTC#D@tQU&kVv^Wr{ac%vn!!bM+N1H`|S$o
z11^FUXk*@>%$Sta?w(h>-wYjos{dfm{?Nh0!M>hIuQT1MR5=y9RdIas^L29l@SQqk
zbj=mX;JpSAGtb~`9|VAb!Dnz`6>Sv*)7MtCdvH8qW8y9jR^xZVz}P)P#fw7;Hh`A7
zB5CDw9`MqZj7KjF9qPHlqjv!@{QOtEB`6Y>Y7j%?hE|L|)2lZh5o5FzGu?yw@n)_{
zGp?-H--tx^_N`+W5KOBGnF@H{9fO^-YH7Rlq6v1sjx2nnmI}qAsRoaor>h|tJdQf*
zkcMzRJ9xt$%4LMh5K-sqFl35xvLDx6Ont^rP4urh+dw%Iz1>J*C6*!6y=+o8bBmu+
z)&8gHLs^@(1Gh~~J+_1PB^eg-*%v@cFt=IbWE<pzdA=Enf!~9+h5WVKrKT0P3*67O
zKuGXJ3#r1jEQbO(m#}XJ@TUMFfsc>vqHSV82Os~|tQ!y`Bu?m{@tfAfO!xJJxoOKV
zEsdB_0gvv+)P8TrCDqgl4fQtTBSWlAfd@nQlazG6_9CULKkcTRRKu)`Exq`8U_EG_
zb>Zi6M+4>YkG(h$!3bF-nBvFZ4xWuL)Wu%fN#gbGhqmAaFurxHk#;3+U2dedwXOVB
zgjQt77YEQgxV>NJNIxz(*h@Oqz-#17$AggYVDbNZ^Z3Fkx_Ez%^*?$8Bll)~e2?Do
uF?wF^{s+BIkND{Q8m0FCO8fX9y#OaxT<4=VxO|TAG2mlVm(Q7={q`SC8SWnd

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 950a8afd85..6ae2d889d3 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -19413,7 +19413,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -19437,7 +19437,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19461,7 +19461,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19484,7 +19484,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -19507,7 +19507,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -19530,7 +19530,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -19552,7 +19552,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19574,7 +19574,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19596,7 +19596,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19618,7 +19618,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -19675,7 +19675,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -19699,7 +19699,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19723,7 +19723,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19758,7 +19758,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -19793,7 +19793,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -19828,7 +19828,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -19862,7 +19862,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19896,7 +19896,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19930,7 +19930,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19964,7 +19964,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -20021,7 +20021,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -20045,7 +20045,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -20079,7 +20079,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -20112,7 +20112,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -20145,7 +20145,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -20178,7 +20178,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -20210,7 +20210,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -20242,7 +20242,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -20274,7 +20274,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -20306,7 +20306,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -20386,7 +20386,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -20410,7 +20410,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20434,7 +20434,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20457,7 +20457,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -20480,7 +20480,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -20503,7 +20503,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -20525,7 +20525,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20547,7 +20547,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20569,7 +20569,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20591,7 +20591,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -20618,7 +20618,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -20642,7 +20642,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20666,7 +20666,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20689,7 +20689,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -20724,7 +20724,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -20759,7 +20759,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -20793,7 +20793,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20827,7 +20827,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20861,7 +20861,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20895,7 +20895,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -20922,7 +20922,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -20946,7 +20946,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20976,7 +20976,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -21009,7 +21009,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -21042,7 +21042,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -21075,7 +21075,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -21107,7 +21107,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -21139,7 +21139,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -21171,7 +21171,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -21203,7 +21203,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -23444,7 +23444,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 85
     }
   }
@@ -23468,7 +23468,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23492,7 +23492,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23515,7 +23515,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 120
     }
   }
@@ -23538,7 +23538,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 175
     }
   }
@@ -23561,7 +23561,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 250
     }
   }
@@ -23583,7 +23583,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23605,7 +23605,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23627,7 +23627,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23649,7 +23649,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 350
     }
   }
@@ -23696,7 +23696,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 85
     }
   }
@@ -23720,7 +23720,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23744,7 +23744,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23767,7 +23767,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 120
     }
   }
@@ -23802,7 +23802,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 175
     }
   }
@@ -23837,7 +23837,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 250
     }
   }
@@ -23871,7 +23871,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23905,7 +23905,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23939,7 +23939,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23973,7 +23973,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 350
     }
   }
@@ -24020,7 +24020,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 85
     }
   }
@@ -24044,7 +24044,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -24068,7 +24068,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -24091,7 +24091,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 120
     }
   }
@@ -24124,7 +24124,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 175
     }
   }
@@ -24157,7 +24157,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 250
     }
   }
@@ -24189,7 +24189,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -24221,7 +24221,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -24253,7 +24253,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -24285,24 +24285,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24323,7 +24312,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24347,7 +24336,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24370,7 +24359,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 120
     }
   }
@@ -24393,7 +24382,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 175
     }
   }
@@ -24416,7 +24405,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 250
     }
   }
@@ -24438,7 +24427,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24460,7 +24449,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24482,7 +24471,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24504,24 +24493,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link-bridge"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24542,7 +24520,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24566,7 +24544,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24589,7 +24567,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 120
     }
   }
@@ -24624,7 +24602,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 175
     }
   }
@@ -24659,7 +24637,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 250
     }
   }
@@ -24693,7 +24671,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24727,7 +24705,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24761,7 +24739,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24795,24 +24773,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link-tunnel"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24833,7 +24800,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24857,7 +24824,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24880,7 +24847,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 120
     }
   }
@@ -24913,7 +24880,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 175
     }
   }
@@ -24946,7 +24913,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 250
     }
   }
@@ -24978,7 +24945,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -25010,7 +24977,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -25042,7 +25009,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -25074,7 +25041,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 350
     }
   }
@@ -25277,7 +25244,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 300
     }
   }
@@ -25299,7 +25266,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 350
     }
   }
@@ -25417,7 +25384,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 300
     }
   }
@@ -25439,7 +25406,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 350
     }
   }
@@ -25617,7 +25584,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 300
     }
   }
@@ -25651,7 +25618,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 350
     }
   }
@@ -25799,7 +25766,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 300
     }
   }
@@ -25831,7 +25798,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 350
     }
   }
@@ -26403,7 +26370,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 90
     }
   }
@@ -26426,7 +26393,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 120
     }
   }
@@ -26449,7 +26416,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 175
     }
   }
@@ -26472,7 +26439,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 250
     }
   }
@@ -26494,7 +26461,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26516,7 +26483,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26538,7 +26505,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26560,7 +26527,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 350
     }
   }
@@ -26623,7 +26590,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 90
     }
   }
@@ -26646,7 +26613,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 120
     }
   }
@@ -26681,7 +26648,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 175
     }
   }
@@ -26716,7 +26683,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 250
     }
   }
@@ -26750,7 +26717,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26784,7 +26751,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26818,7 +26785,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26852,7 +26819,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 350
     }
   }
@@ -26915,7 +26882,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 90
     }
   }
@@ -26938,7 +26905,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 120
     }
   }
@@ -26961,7 +26928,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 175
     }
   }
@@ -26984,7 +26951,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 250
     }
   }
@@ -27016,7 +26983,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -27048,7 +27015,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -27080,7 +27047,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -27112,7 +27079,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 350
     }
   }
@@ -28772,7 +28739,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 250
     }
   }
@@ -28794,7 +28761,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28816,7 +28783,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28838,7 +28805,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28860,7 +28827,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 350
     }
   }
@@ -28972,7 +28939,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 250
     }
   }
@@ -29006,7 +28973,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -29040,7 +29007,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -29074,7 +29041,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -29108,7 +29075,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 350
     }
   }
@@ -29196,7 +29163,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 250
     }
   }
@@ -29228,7 +29195,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -29260,7 +29227,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -29292,7 +29259,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -29324,7 +29291,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 350
     }
   }
@@ -31044,7 +31011,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -31068,7 +31035,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31092,7 +31059,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31115,7 +31082,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -31138,7 +31105,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -31161,7 +31128,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -31183,7 +31150,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31205,7 +31172,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31227,7 +31194,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31249,7 +31216,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -31306,7 +31273,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -31330,7 +31297,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31354,7 +31321,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31389,7 +31356,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -31424,7 +31391,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -31459,7 +31426,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -31493,7 +31460,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31527,7 +31494,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31561,7 +31528,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31595,7 +31562,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -31652,7 +31619,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -31676,7 +31643,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31710,7 +31677,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31743,7 +31710,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -31776,7 +31743,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -31809,7 +31776,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -31841,7 +31808,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31873,7 +31840,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31905,7 +31872,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31937,7 +31904,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -31964,7 +31931,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -31988,7 +31955,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -32012,7 +31979,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -32035,7 +32002,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -32058,7 +32025,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -32081,7 +32048,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -32103,7 +32070,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32125,7 +32092,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32147,7 +32114,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32169,7 +32136,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -32196,7 +32163,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -32220,7 +32187,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -32244,7 +32211,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -32267,7 +32234,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -32302,7 +32269,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -32337,7 +32304,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -32371,7 +32338,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32405,7 +32372,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32439,7 +32406,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32473,7 +32440,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -32500,7 +32467,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -32524,7 +32491,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -32554,7 +32521,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -32587,7 +32554,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -32620,7 +32587,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -32653,7 +32620,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -32685,7 +32652,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32717,7 +32684,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32749,7 +32716,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32781,7 +32748,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 00e0ae5a7b578408b2444c121c9dfe2dd4c33e84..49cc20fce10c58d75c073e614853a2a0f07e9cba 100644
GIT binary patch
delta 2250
zcmbtVTTEP46wMka^Ps$@41+ZUuo5Pbfq@xdcuYgFu~EazLVYv@7^oDiiY6viqZVV;
zmX;0y+?KYXUp6*X(VzLK&kqx$rjdl08q>y@)Fysdn&=PZ;oA4!79nlZ%E#R+`*HR@
zd+l@2Ir)d@{3XxS?{k<LJ-JXznRiWP`?YGvOvty_UF}F6omvb!seA%zX_A|OAS2S|
zt0*6yuTs|;o4eBCmcauE(D?a$nDU?b)0F>Bx^c0GmN!&N{=3*k<&mXs%8yk_(*Z;=
zGyakx&*R2w`5GE4okP&DgEj;HvO)74KBVC?Yr;K==%V(j2^SJ^&Ng2nTgFhM_~$wk
z3zJagm@hHA6F3o6?};Q-EB=y%N+-QWPZ<($A)w|*?Wk0I%fc`0XjlDa$<;pXK(}Ir
z6FrK@o#;|rvM_hl)W3C^=u2Li@AWY>Yy3}Rh$_Ca-o%UR&Abca=u~^hdnSHkVPC4D
z$A3u0K#pzFE58-9Yhq4`iTlFvN_r6Ysd1o!iqmf@em|<6lV0B(++jz$j08}sG5M9q
zma~53sdB-Ou%frv#Fk<lR{geB&W5q&MwPrO)Jtu^EZG@A)XtJ5J1QBEBP_>5DA0ty
zQua$cWZ`V-9TW-$%|-7ANfH+iZ%2__3BfLb5Q^1u)v~0>(GYyeX6Y`6+g&KnKg~YV
z6OgPc%B@{>N&Ay1R7;9<l*6ayi#FGXGF;B+H_MPIIbqyyn=lCWN?L`fkmV{hl3)YL
zZMK}MW!E%bt{{0tGHc+@N}et1V?@`4QQ%CH>s}ctN2c8$eX*~ncb5#7!E^gsq`6zu
zkl`Lhl3OoJ709zQ=Q6|n5i(47V>M46@l&Ez^@HnGB~Sy$9kfTnACTP5SSLL}q)WZk
zAo(vc%~FdpEn-Z9fp%G}<s@h^CP7Pz^hV%Q%SZ&B)>b=B+UX9_6K~s07BM78>JY|I
z{JT0dU|DUdN4|Pr*ovrY$e{0ZqHCi}*C8{0bt^v7*vW@@H4MeE4K+!&ajzU{VoKu6
z4XCn@dyU&oTH3Hder({B=$UQcbcmeN28lGHz{xP{rW<bItw7(2Moy0Sb0gx4n$^Lu
zz3v`foL!f*rFjQ7Nz6)F(#**)jFXAT_uEmRm9I}GA~h}i$>`=}A~Mm!lSGB%iO7Pb
zY<g_Djyi9>dlKHI5v18bl3OJES`o5JS`5>YB3D{b=;BUzu>XcDOER87R=lDO-ELdV
zE5~{fw#STphNZNQf5X%s4m{QmySmeMqY^P4O;PH(?D`Z(a{AKJl07fxjSucdBQ$2Z
zkH5K@A}U`!h?bQpj`njlF`eIzRVk$78O&*hoqN~@@k<NypG7B^aH?%tE30Z3pTXsk
zzyLgP+jGdvTJ;XC{c)4>w{dD!*1LG!#B*?Y`Tu_2yu)bK7vN?u(3+pO*J60;R>{?V
cx6j+9(Utku_`JQdU%=1CFCo5P5|91*FFBjn3;+NC

delta 2349
zcmcJQZERC@6vp#(xVC#^D~>e*w`m~Mux_1e*REaJSP(U4(8c-^6SB4|86bs)Pb89z
zCA>N|Hph01I+>p|XaqlXz7b4JOe79XNW>7Dg+%?Ji;Iadz_322_c9p4glYKD`^$OG
z|DN-|&$+k%OFxxQ{9JzK>UCsBCT=$KT75&WTW$oAk)Z=noIijNwWV`S4Avin;?;u)
zQ2TsNuYb;+;`NUEW$9rgDfRx%tNeHvTZxt<=%V&fw#%OJx<0fx;x>oWZ$RT{1gn_e
zaTEz;MlWH$n4ClIPG`T~Df<je_amtlu7edyCEkP8vOf>L`Ko0j?_SGE#WI@*7w;?_
zK%7V!xUvLOmO~yH9zsYtW%A@8nrw$WuDy<+twdl)gJ#F`5ma^@hhO=c$!D!bJZHvV
zSg}R(_o}M;_cnAXKNv<*S@t^O%B<bs4`v)3F=AKY!g`G-5YhEVP9UND&17U0U3Tu8
zcEo5$nLTf{>@J2^*Hnxlra77&quDvDm@Agn60Fe$m$`sUpD#hrBbG^zOxMyAr4JSI
zS1rornK~?0B@&=g+JMJ2_@f3*O1GQlkQW-^lyzQI+b46~0=6<4@}gdISKJ6#O<DT<
zSSEF~sMbtJEe4eL*|a}^^<sA$JD3fiO`1JM5cALz7Wz1Xu)OWXYO`NLDqloEvQ#vE
ztln5QTfeBjpN6njIvY4{)~IYojRsaZ-vEy)Hyb!GGUi3x>>HP|DAvgDUijvfGhst1
zmQEjBDrYPOU&^2l&b;Ne0y*cy!_xNz9iQ=ImE~fc&LE_u^G(W^8V%BPr*t;+(J9jT
zfYR<qz<#k#NA2gRHwU>n%KQBA7f@!euks64$S}JUx)Xc0C%d;g?yoIv@6u9qJgKDF
zZSqDFN5~-O_)0(hWl$NU6J#H0Ha&Z*=~xK1`+QFNoye7IHX7658adqzpNe!j7g!||
zM!r;q;ZnIMx<H=u!X~jGsx-Ij&YYV{x_BL(#H3`qc~|cS6k#&GzZLDcOS87&QHyo5
zBKL14!@K!*#adCt)yFpA8(ket;rUw?KG}#+zGZr?JhhqS$@+GKJKOn{Fn+(Cvm&pW
zT)7E;`}A64X3ONAC}+m>;3lM%TE@ooUPsbaG7|sADHEIVq?O8PIFeHT0=M&cgs%bD
zawuW>tetaUz@a3RoJUxmj`D3{z@dcYlo?#^xZOgNckeW3`JU%!Ig>fd-;DBa<JSn?
zrb4%4N;<1de-}lc!#d^EKcRq}ZQ+~V+l?a2lv4(}`OM_k-TZ#0oMYQ^NH=Z6Ca8XN
zJNHV?nC#fWuZWfOe3*B9nH*0U<tkpmb+b`is(RR{WhXzfTQ_u?idA-{_;#G$$uG^w
z#YRqE%PlrjbsMolt3G5eD9vWG)@tq{l;Yz|In(1QgqJTo(H3_i%FIE$x3IwfI1=UC
zqqnO)pfmBp0HS&z-0SrE?`NWK2rvIzRn-@JCXSCRtoI<##KU0$e-{4o(qUQh*5!Wy
DRpSdD

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 9cb2df7f74..9f3b65828c 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -19271,7 +19271,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -19295,7 +19295,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19319,7 +19319,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19342,7 +19342,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -19365,7 +19365,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -19388,7 +19388,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -19410,7 +19410,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19432,7 +19432,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19454,7 +19454,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19476,7 +19476,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -19533,7 +19533,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -19557,7 +19557,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19581,7 +19581,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19616,7 +19616,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -19651,7 +19651,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -19686,7 +19686,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -19720,7 +19720,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19754,7 +19754,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19788,7 +19788,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -19822,7 +19822,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -19879,7 +19879,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -19903,7 +19903,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19937,7 +19937,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -19970,7 +19970,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -20003,7 +20003,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -20036,7 +20036,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -20068,7 +20068,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -20100,7 +20100,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -20132,7 +20132,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -20164,7 +20164,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -20244,7 +20244,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -20268,7 +20268,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20292,7 +20292,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20315,7 +20315,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -20338,7 +20338,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -20361,7 +20361,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -20383,7 +20383,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20405,7 +20405,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20427,7 +20427,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20449,7 +20449,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -20476,7 +20476,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -20500,7 +20500,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20524,7 +20524,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20547,7 +20547,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -20582,7 +20582,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -20617,7 +20617,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -20651,7 +20651,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20685,7 +20685,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20719,7 +20719,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20753,7 +20753,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -20780,7 +20780,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -20804,7 +20804,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20834,7 +20834,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -20867,7 +20867,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -20900,7 +20900,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -20933,7 +20933,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -20965,7 +20965,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -20997,7 +20997,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -21029,7 +21029,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -21061,7 +21061,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -23302,7 +23302,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 85
     }
   }
@@ -23326,7 +23326,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23350,7 +23350,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23373,7 +23373,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 120
     }
   }
@@ -23396,7 +23396,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 175
     }
   }
@@ -23419,7 +23419,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 250
     }
   }
@@ -23441,7 +23441,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23463,7 +23463,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23485,7 +23485,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23507,7 +23507,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 350
     }
   }
@@ -23554,7 +23554,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 85
     }
   }
@@ -23578,7 +23578,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23602,7 +23602,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23625,7 +23625,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 120
     }
   }
@@ -23660,7 +23660,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 175
     }
   }
@@ -23695,7 +23695,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 250
     }
   }
@@ -23729,7 +23729,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23763,7 +23763,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23797,7 +23797,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -23831,7 +23831,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 350
     }
   }
@@ -23878,7 +23878,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 85
     }
   }
@@ -23902,7 +23902,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23926,7 +23926,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 90
     }
   }
@@ -23949,7 +23949,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 120
     }
   }
@@ -23982,7 +23982,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 175
     }
   }
@@ -24015,7 +24015,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 250
     }
   }
@@ -24047,7 +24047,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -24079,7 +24079,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -24111,7 +24111,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 300
     }
   }
@@ -24143,24 +24143,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6200
+      priority: 2975
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24181,7 +24170,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24205,7 +24194,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24228,7 +24217,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 120
     }
   }
@@ -24251,7 +24240,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 175
     }
   }
@@ -24274,7 +24263,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 250
     }
   }
@@ -24296,7 +24285,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24318,7 +24307,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24340,7 +24329,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24362,24 +24351,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link-bridge"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24400,7 +24378,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24424,7 +24402,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24447,7 +24425,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 120
     }
   }
@@ -24482,7 +24460,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 175
     }
   }
@@ -24517,7 +24495,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 250
     }
   }
@@ -24551,7 +24529,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24585,7 +24563,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24619,7 +24597,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24653,24 +24631,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link-tunnel"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24691,7 +24658,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24715,7 +24682,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 90
     }
   }
@@ -24738,7 +24705,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 120
     }
   }
@@ -24771,7 +24738,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 175
     }
   }
@@ -24804,7 +24771,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 250
     }
   }
@@ -24836,7 +24803,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24868,7 +24835,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24900,7 +24867,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 300
     }
   }
@@ -24932,7 +24899,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6100
+      priority: 2970
       min_distance: 350
     }
   }
@@ -25135,7 +25102,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 300
     }
   }
@@ -25157,7 +25124,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 350
     }
   }
@@ -25275,7 +25242,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 300
     }
   }
@@ -25297,7 +25264,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 350
     }
   }
@@ -25475,7 +25442,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 300
     }
   }
@@ -25509,7 +25476,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 350
     }
   }
@@ -25657,7 +25624,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 300
     }
   }
@@ -25689,7 +25656,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3000
+      priority: 2955
       min_distance: 350
     }
   }
@@ -26244,7 +26211,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 90
     }
   }
@@ -26267,7 +26234,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 120
     }
   }
@@ -26290,7 +26257,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 175
     }
   }
@@ -26313,7 +26280,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 250
     }
   }
@@ -26335,7 +26302,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26357,7 +26324,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26379,7 +26346,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26401,7 +26368,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 350
     }
   }
@@ -26464,7 +26431,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 90
     }
   }
@@ -26487,7 +26454,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 120
     }
   }
@@ -26522,7 +26489,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 175
     }
   }
@@ -26557,7 +26524,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 250
     }
   }
@@ -26591,7 +26558,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26625,7 +26592,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26659,7 +26626,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26693,7 +26660,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 350
     }
   }
@@ -26756,7 +26723,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 90
     }
   }
@@ -26779,7 +26746,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 120
     }
   }
@@ -26802,7 +26769,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 175
     }
   }
@@ -26825,7 +26792,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 250
     }
   }
@@ -26857,7 +26824,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26889,7 +26856,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26921,7 +26888,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 300
     }
   }
@@ -26953,7 +26920,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 5600
+      priority: 2965
       min_distance: 350
     }
   }
@@ -28464,7 +28431,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 250
     }
   }
@@ -28486,7 +28453,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28508,7 +28475,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28530,7 +28497,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28552,7 +28519,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 350
     }
   }
@@ -28664,7 +28631,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 250
     }
   }
@@ -28698,7 +28665,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28732,7 +28699,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28766,7 +28733,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28800,7 +28767,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 350
     }
   }
@@ -28888,7 +28855,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 250
     }
   }
@@ -28920,7 +28887,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28952,7 +28919,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -28984,7 +28951,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 300
     }
   }
@@ -29016,7 +28983,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3150
+      priority: 2960
       min_distance: 350
     }
   }
@@ -30736,7 +30703,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -30760,7 +30727,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -30784,7 +30751,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -30807,7 +30774,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -30830,7 +30797,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -30853,7 +30820,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -30875,7 +30842,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -30897,7 +30864,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -30919,7 +30886,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -30941,7 +30908,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -30998,7 +30965,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -31022,7 +30989,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31046,7 +31013,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31081,7 +31048,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -31116,7 +31083,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -31151,7 +31118,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -31185,7 +31152,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31219,7 +31186,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31253,7 +31220,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31287,7 +31254,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -31344,7 +31311,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 85
     }
   }
@@ -31368,7 +31335,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31402,7 +31369,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 90
     }
   }
@@ -31435,7 +31402,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 120
     }
   }
@@ -31468,7 +31435,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 175
     }
   }
@@ -31501,7 +31468,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 250
     }
   }
@@ -31533,7 +31500,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31565,7 +31532,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31597,7 +31564,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 300
     }
   }
@@ -31629,7 +31596,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6750
+      priority: 6740
       min_distance: 350
     }
   }
@@ -31656,7 +31623,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -31680,7 +31647,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -31704,7 +31671,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -31727,7 +31694,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -31750,7 +31717,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -31773,7 +31740,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -31795,7 +31762,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -31817,7 +31784,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -31839,7 +31806,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -31861,7 +31828,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -31888,7 +31855,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -31912,7 +31879,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -31936,7 +31903,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -31959,7 +31926,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -31994,7 +31961,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -32029,7 +31996,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -32063,7 +32030,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32097,7 +32064,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32131,7 +32098,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32165,7 +32132,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
@@ -32192,7 +32159,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 85
     }
   }
@@ -32216,7 +32183,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -32246,7 +32213,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 90
     }
   }
@@ -32279,7 +32246,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 120
     }
   }
@@ -32312,7 +32279,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 175
     }
   }
@@ -32345,7 +32312,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 250
     }
   }
@@ -32377,7 +32344,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32409,7 +32376,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32441,7 +32408,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 300
     }
   }
@@ -32473,7 +32440,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 6150
+      priority: 6140
       min_distance: 350
     }
   }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 2b96de818c774407747029628f55619ed2adf1e7..c405f66d068db07b1e0a0038fa5f5077fa3763cd 100644
GIT binary patch
delta 2233
zcmb_dTTGlq6wbG$+|h<e7q!6J>Sm)Xaur%&S+Evu6uA_%iD?TI;qP*3h*9ZFiN=t2
zDG;`B0@dKVnAS_!niwlDjnT%mmc$xw^uhRG+r*?%Qz-R2^DmbW@zVP6&o|#WGv~~F
zXXc-UODR*AQck^g12dt6H_I_2m)`&(6f;-Gw$ikHbAI+eoAWtl@<)r15=xu*uqzve
z*?(c)t^N06*dLpBbKs}*C)uuyCP_zN(Y9xStz15W1B9oKqK&pUZ?Tp1AYRlkt^}mW
zi6E*mGjb8jalY+G3x|~-Lo;E}VIXb*`^h>7&_uXkLwXeUX`~C4jP%YRcG5K)g^P~)
zN2O*6enoG{#;y>2%6p=1{3se_%5OxYSg|n1MsCz_Zqnej7&NJWt#~IxXj6Z094y6O
z;?QF7xQ!X@T-%rNs8%DlY@B@wtAZxl{=<p3y+>^PUeK)bCX=vNG3hQFGol#u-ZAV{
zquKo-n}oCP#_lx7gi~_zxNqVok71Jx=HWq-(L!t*&BkW6``MR(*CxG%NR!D3nO5S@
zflFr;v7eb``cjpJQk{A%g6Fa@to)x+O>M=FrBtqMs9Z`FR1!%g*Oe^h`XUFd8aqGN
z#<z0+T`o^49uZeQ3UzXSDKeGBNPj-E)$*%aP8HCSn}aO1JWznf#0jTo(vkiCPoJ+(
zZj@;sHtU!Ib^lEF7P^11-SIO~@%OY@t!=L~_IM9=TOEzvJ$u`&&VU3;u+=ec^!5`e
zwNEK!Hb{lblvCVNbr%^h*GhI3!L2^MSF)}I?uW;h6Mh{XfB#=4^fq-{`&(Pq%1h1L
zG$!S?6sdHpB1JZ6j^%7EyfRUYEoP)%$8U;Jowy?V2U1Xi3~4Vxk&fYETDduj-K1vf
z+^k4-8x^T(ru6!#Ac;Av=X|`J<8r<d8^v43b35(~_moisM=-MQ^A_$)I_<1Tj!j6_
zLb!tA>*c7y-wk;EaXe%qm|w}6C-^G~hBxfM86c>+_L1g1iEYu25vO!iu@c00BY3rn
z6(MIuQl+?-kw&yEsS>U?eY-aCb*v3Xnc6HoYZG@hK31cKOc-%`UbT;oCDYHLR1Vbe
zQqen5L+Oc>zCsQ^kM-iO<wc@}MW|Rxvsj60^_Y!3mCLfcRL8Q=GFG>oOZn>Mn-jgg
zo?6psgby?zNj|KHM=gu$JH?ot4RB**sSd`P$8q7e8?YzYG2|SzSQLW(`ul&6m74)B
zdB|ytait5fa>7EoT8tvBnwup2hlM(*^_c+A7jY_r++B<E#R_egAKQ_rmaFZ!rFgA_
zhlW_wX`@;3p>8;3wi9_6(#7stoE3h#3!aUuo}4>)z~s9=Os)!dTQ8Vg39blqXHVE~
wgV?P<_O+gz|N4X-9kySMwc_2@6XqIS74-jl!urmRfuDoly71YtsMBBl3B2?5kN^Mx

delta 2290
zcmb_dTTEP46wSH}4xuw(uuy`f#a8Jk3=9-nUNbzDVrpfe&{{N>PG2w%ulA>D(zM2;
zJW7zZQ{2H=t5Lt4DEQHt4-@sHNn>k8OO(WB!iUD#82$0b+7#D0_hL#Q*jhg(Yu4K5
z>~qfA_ndukCjHJ#`owFu5SQ9P)Dp%|YWU$Ks>vSh*YHw5YRKN|htG(YNNNGn!`Zi8
zl(Gg;rKCwa(xrO<xrm29zx^>I3-etXM37?PkcROgyh3I>g-$}Z3E!Q<L6z#z7*n+j
zqY3e`>$oe`CEx&u=NZ^X7&YOG5$q@1m4Ll!@?)i(eBpI$qqfF|J%ke`%-V3>==Vs`
zMy!;%706fQxzngoIC7dNBYtI}^9-sLZ#;uag~JwJwvflw`fqkF%lNWMJHqHxgT4tP
zsIclB4k&!j!sIcN^Wa(^Sg}M>w*yUT(g}wZ6cZbq*r)V}6YUC}DJHJ9u}1bkSIJ)~
zaLSM!xhnc9RrxUmTS=mxRJ3IqF}?d5g}bY;T1GeGaYf!CdBcNs>c8Jjdx)cM+CrRi
z!>f=Vg2qM*M=ZQrfU_!2Tb57k8DcTsEJv|~+~!g=DP3N;X{5@W3y+B7;e;e9tU!`P
ztO1kFsFTVfJfRlI+D`IvsY$LBp+ku!#U`FFzQ<k6Rv}MvO0ZeYZY!ao#Hm)~%S0*c
zQe1=rrSRJdIAR`G#PEFb)0c^90jYfv>(rQ175<sw4GhQ4aPqIV<dvPlj?N>2qwc=L
z!S2A}qwQV6o={pwQnE~y^WdRPC^x1HmG3nQX}M1!?OrWc%V`J+J<pcS6(*ta*>cm1
z92KGa+48*4Bpb^3MN)j%k4!mMhV_o=!hg2%yL?!NwF&>a@O(L1F)dSJWGqpLr_>_4
z2InhiJBhBrvp$o!D|tt!rEiRr=eEPWXe(DFvFcv7!kX+=*;$T!>GQHSB)TRwe;9VT
z;bl#zuqOGUm1>`<^!j)K)L0XvMb-R9jo2#li5d(dOD@#Hfmk$Bi)JhtseGEJK}-Vm
zILLvQ>+zW$sISl44cJQYmj+ZkWX$GCYAdTo^jkRE%1c7dT4l<eMrKlj3P`+ulkE4i
zRuow)jd4Fd)q|`IH=6ihFutXk4+fETcPOOO8fkK!9P?wn67_RQtD6*QZdsUV(Vkin
zP~)_1?K}A4lF+eyA#uvrJNQgcp?8+z*{PN2uASJOW?ajZSSRfysvaPYAY6)U3i2RC
z-34fIE=hDEh!!X{F~n^Xdo27u#CMKd@BBzTo{^khIF#~17v>z-GF`VYf5RpZ@rGU8
zf+uB9$Q+|z_%%J)rY5LYPP`59iKoj9&zHzIpEO#~3s(mFz`};~01Zyg4Ir{8;eYFJ
z^8WDMxgM;=eKd+T^~x{XjqbO_)txmP%CbrCx5dqjEs^y9Z*c?1$HAY$UqbZwxGnbW
E->)6(p8x;=

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index d0126ba3f8..9755ed4322 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -19267,7 +19267,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 85
       text_color: 11711154
     }
@@ -19292,7 +19292,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -19317,7 +19317,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -19341,7 +19341,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 120
       text_color: 11711154
     }
@@ -19365,7 +19365,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 175
       text_color: 11711154
     }
@@ -19389,7 +19389,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 250
       text_color: 11711154
     }
@@ -19412,7 +19412,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -19435,7 +19435,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -19458,7 +19458,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -19481,7 +19481,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 350
       text_color: 11711154
     }
@@ -19539,7 +19539,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 85
       text_color: 11711154
     }
@@ -19564,7 +19564,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -19589,7 +19589,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -19625,7 +19625,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 120
       text_color: 11711154
     }
@@ -19661,7 +19661,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 175
       text_color: 11711154
     }
@@ -19697,7 +19697,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 250
       text_color: 11711154
     }
@@ -19732,7 +19732,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -19767,7 +19767,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -19802,7 +19802,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -19837,7 +19837,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 350
       text_color: 11711154
     }
@@ -19895,7 +19895,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 85
       text_color: 11711154
     }
@@ -19920,7 +19920,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -19954,7 +19954,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -19987,7 +19987,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 120
       text_color: 11711154
     }
@@ -20020,7 +20020,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 175
       text_color: 11711154
     }
@@ -20053,7 +20053,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 250
       text_color: 11711154
     }
@@ -20085,7 +20085,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -20117,7 +20117,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -20149,7 +20149,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -20181,7 +20181,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 350
       text_color: 11711154
     }
@@ -20262,7 +20262,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 85
       text_color: 11711154
     }
@@ -20287,7 +20287,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -20312,7 +20312,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -20336,7 +20336,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 120
       text_color: 11711154
     }
@@ -20360,7 +20360,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 175
       text_color: 11711154
     }
@@ -20384,7 +20384,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 250
       text_color: 11711154
     }
@@ -20407,7 +20407,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -20430,7 +20430,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -20453,7 +20453,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -20476,7 +20476,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 350
       text_color: 11711154
     }
@@ -20504,7 +20504,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 85
       text_color: 11711154
     }
@@ -20529,7 +20529,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -20554,7 +20554,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -20578,7 +20578,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 120
       text_color: 11711154
     }
@@ -20614,7 +20614,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 175
       text_color: 11711154
     }
@@ -20650,7 +20650,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 250
       text_color: 11711154
     }
@@ -20685,7 +20685,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -20720,7 +20720,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -20755,7 +20755,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -20790,7 +20790,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 350
       text_color: 11711154
     }
@@ -20818,7 +20818,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 85
       text_color: 11711154
     }
@@ -20843,7 +20843,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -20873,7 +20873,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -20906,7 +20906,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 120
       text_color: 11711154
     }
@@ -20939,7 +20939,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 175
       text_color: 11711154
     }
@@ -20972,7 +20972,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 250
       text_color: 11711154
     }
@@ -21004,7 +21004,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -21036,7 +21036,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -21068,7 +21068,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -21100,7 +21100,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 350
       text_color: 11711154
     }
@@ -23338,7 +23338,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 85
       text_color: 11711154
     }
@@ -23363,7 +23363,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 90
       text_color: 11711154
     }
@@ -23388,7 +23388,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 90
       text_color: 11711154
     }
@@ -23412,7 +23412,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 120
       text_color: 11711154
     }
@@ -23436,7 +23436,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 175
       text_color: 11711154
     }
@@ -23460,7 +23460,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 250
       text_color: 11711154
     }
@@ -23483,7 +23483,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -23506,7 +23506,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -23529,7 +23529,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -23552,7 +23552,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 350
       text_color: 11711154
     }
@@ -23600,7 +23600,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 85
       text_color: 11711154
     }
@@ -23625,7 +23625,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 90
       text_color: 11711154
     }
@@ -23650,7 +23650,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 90
       text_color: 11711154
     }
@@ -23674,7 +23674,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 120
       text_color: 11711154
     }
@@ -23710,7 +23710,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 175
       text_color: 11711154
     }
@@ -23746,7 +23746,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 250
       text_color: 11711154
     }
@@ -23781,7 +23781,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -23816,7 +23816,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -23851,7 +23851,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -23886,7 +23886,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 350
       text_color: 11711154
     }
@@ -23934,7 +23934,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 85
       text_color: 11711154
     }
@@ -23959,7 +23959,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 90
       text_color: 11711154
     }
@@ -23984,7 +23984,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 90
       text_color: 11711154
     }
@@ -24008,7 +24008,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 120
       text_color: 11711154
     }
@@ -24041,7 +24041,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 175
       text_color: 11711154
     }
@@ -24074,7 +24074,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 250
       text_color: 11711154
     }
@@ -24106,7 +24106,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -24138,7 +24138,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -24170,7 +24170,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 300
       text_color: 11711154
     }
@@ -24202,7 +24202,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6200
+      priority: 2975
       min_distance: 350
       text_color: 11711154
     }
@@ -24210,17 +24210,6 @@ cont {
 }
 cont {
   name: "highway-primary_link"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24241,7 +24230,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 90
       text_color: 11711154
     }
@@ -24266,7 +24255,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 90
       text_color: 11711154
     }
@@ -24290,7 +24279,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 120
       text_color: 11711154
     }
@@ -24314,7 +24303,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 175
       text_color: 11711154
     }
@@ -24338,7 +24327,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 250
       text_color: 11711154
     }
@@ -24361,7 +24350,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -24384,7 +24373,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -24407,7 +24396,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -24430,7 +24419,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 350
       text_color: 11711154
     }
@@ -24438,17 +24427,6 @@ cont {
 }
 cont {
   name: "highway-primary_link-bridge"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24469,7 +24447,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 90
       text_color: 11711154
     }
@@ -24494,7 +24472,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 90
       text_color: 11711154
     }
@@ -24518,7 +24496,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 120
       text_color: 11711154
     }
@@ -24554,7 +24532,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 175
       text_color: 11711154
     }
@@ -24590,7 +24568,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 250
       text_color: 11711154
     }
@@ -24625,7 +24603,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -24660,7 +24638,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -24695,7 +24673,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -24730,7 +24708,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 350
       text_color: 11711154
     }
@@ -24738,17 +24716,6 @@ cont {
 }
 cont {
   name: "highway-primary_link-tunnel"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 6100
-    }
-  }
   element {
     scale: 11
     lines {
@@ -24769,7 +24736,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 90
       text_color: 11711154
     }
@@ -24794,7 +24761,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 90
       text_color: 11711154
     }
@@ -24818,7 +24785,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 120
       text_color: 11711154
     }
@@ -24851,7 +24818,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 175
       text_color: 11711154
     }
@@ -24884,7 +24851,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 250
       text_color: 11711154
     }
@@ -24916,7 +24883,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -24948,7 +24915,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -24980,7 +24947,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 300
       text_color: 11711154
     }
@@ -25012,7 +24979,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6100
+      priority: 2970
       min_distance: 350
       text_color: 11711154
     }
@@ -25216,7 +25183,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3000
+      priority: 2955
       min_distance: 300
       text_color: 11711154
     }
@@ -25239,7 +25206,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 3000
+      priority: 2955
       min_distance: 350
       text_color: 11711154
     }
@@ -25358,7 +25325,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3000
+      priority: 2955
       min_distance: 300
       text_color: 11711154
     }
@@ -25381,7 +25348,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 3000
+      priority: 2955
       min_distance: 350
       text_color: 11711154
     }
@@ -25560,7 +25527,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3000
+      priority: 2955
       min_distance: 300
       text_color: 11711154
     }
@@ -25595,7 +25562,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 3000
+      priority: 2955
       min_distance: 350
       text_color: 11711154
     }
@@ -25741,7 +25708,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3000
+      priority: 2955
       min_distance: 300
       text_color: 11711154
     }
@@ -25773,7 +25740,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 3000
+      priority: 2955
       min_distance: 350
       text_color: 11711154
     }
@@ -26329,7 +26296,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 90
       text_color: 11711154
     }
@@ -26353,7 +26320,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 120
       text_color: 11711154
     }
@@ -26377,7 +26344,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 175
       text_color: 11711154
     }
@@ -26401,7 +26368,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 250
       text_color: 11711154
     }
@@ -26424,7 +26391,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -26447,7 +26414,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -26470,7 +26437,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -26493,7 +26460,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 350
       text_color: 11711154
     }
@@ -26557,7 +26524,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 90
       text_color: 11711154
     }
@@ -26581,7 +26548,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 120
       text_color: 11711154
     }
@@ -26617,7 +26584,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 175
       text_color: 11711154
     }
@@ -26653,7 +26620,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 250
       text_color: 11711154
     }
@@ -26688,7 +26655,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -26723,7 +26690,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -26758,7 +26725,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -26793,7 +26760,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 350
       text_color: 11711154
     }
@@ -26857,7 +26824,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 90
       text_color: 11711154
     }
@@ -26881,7 +26848,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 120
       text_color: 11711154
     }
@@ -26905,7 +26872,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 175
       text_color: 11711154
     }
@@ -26929,7 +26896,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 250
       text_color: 11711154
     }
@@ -26961,7 +26928,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -26993,7 +26960,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -27025,7 +26992,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 300
       text_color: 11711154
     }
@@ -27057,7 +27024,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 5600
+      priority: 2965
       min_distance: 350
       text_color: 11711154
     }
@@ -28565,7 +28532,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 250
       text_color: 11711154
     }
@@ -28588,7 +28555,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -28611,7 +28578,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -28634,7 +28601,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -28657,7 +28624,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 350
       text_color: 11711154
     }
@@ -28770,7 +28737,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 250
       text_color: 11711154
     }
@@ -28805,7 +28772,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -28840,7 +28807,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -28875,7 +28842,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -28910,7 +28877,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 350
       text_color: 11711154
     }
@@ -28999,7 +28966,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 250
       text_color: 11711154
     }
@@ -29031,7 +28998,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -29063,7 +29030,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -29095,7 +29062,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 300
       text_color: 11711154
     }
@@ -29127,7 +29094,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 3150
+      priority: 2960
       min_distance: 350
       text_color: 11711154
     }
@@ -30844,7 +30811,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 85
       text_color: 11711154
     }
@@ -30869,7 +30836,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -30894,7 +30861,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -30918,7 +30885,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 120
       text_color: 11711154
     }
@@ -30942,7 +30909,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 175
       text_color: 11711154
     }
@@ -30966,7 +30933,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 250
       text_color: 11711154
     }
@@ -30989,7 +30956,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31012,7 +30979,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31035,7 +31002,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31058,7 +31025,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 350
       text_color: 11711154
     }
@@ -31116,7 +31083,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 85
       text_color: 11711154
     }
@@ -31141,7 +31108,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -31166,7 +31133,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -31202,7 +31169,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 120
       text_color: 11711154
     }
@@ -31238,7 +31205,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 175
       text_color: 11711154
     }
@@ -31274,7 +31241,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 250
       text_color: 11711154
     }
@@ -31309,7 +31276,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31344,7 +31311,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31379,7 +31346,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31414,7 +31381,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 350
       text_color: 11711154
     }
@@ -31472,7 +31439,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 85
       text_color: 11711154
     }
@@ -31497,7 +31464,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -31531,7 +31498,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 90
       text_color: 11711154
     }
@@ -31564,7 +31531,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 120
       text_color: 11711154
     }
@@ -31597,7 +31564,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 175
       text_color: 11711154
     }
@@ -31630,7 +31597,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 250
       text_color: 11711154
     }
@@ -31662,7 +31629,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31694,7 +31661,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31726,7 +31693,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 300
       text_color: 11711154
     }
@@ -31758,7 +31725,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6750
+      priority: 6740
       min_distance: 350
       text_color: 11711154
     }
@@ -31786,7 +31753,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 85
       text_color: 11711154
     }
@@ -31811,7 +31778,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -31836,7 +31803,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -31860,7 +31827,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 120
       text_color: 11711154
     }
@@ -31884,7 +31851,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 175
       text_color: 11711154
     }
@@ -31908,7 +31875,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 250
       text_color: 11711154
     }
@@ -31931,7 +31898,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -31954,7 +31921,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -31977,7 +31944,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -32000,7 +31967,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 350
       text_color: 11711154
     }
@@ -32028,7 +31995,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 85
       text_color: 11711154
     }
@@ -32053,7 +32020,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -32078,7 +32045,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -32102,7 +32069,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 120
       text_color: 11711154
     }
@@ -32138,7 +32105,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 175
       text_color: 11711154
     }
@@ -32174,7 +32141,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 250
       text_color: 11711154
     }
@@ -32209,7 +32176,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -32244,7 +32211,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -32279,7 +32246,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -32314,7 +32281,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 350
       text_color: 11711154
     }
@@ -32342,7 +32309,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 85
       text_color: 11711154
     }
@@ -32367,7 +32334,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -32397,7 +32364,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 90
       text_color: 11711154
     }
@@ -32430,7 +32397,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 120
       text_color: 11711154
     }
@@ -32463,7 +32430,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 175
       text_color: 11711154
     }
@@ -32496,7 +32463,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 250
       text_color: 11711154
     }
@@ -32528,7 +32495,7 @@ cont {
     shield {
       height: 9
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -32560,7 +32527,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -32592,7 +32559,7 @@ cont {
     shield {
       height: 10
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 300
       text_color: 11711154
     }
@@ -32624,7 +32591,7 @@ cont {
     shield {
       height: 11
       stroke_color: 11711154
-      priority: 6150
+      priority: 6140
       min_distance: 350
       text_color: 11711154
     }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index bcd28eee46b520cb054a53b1ada7334d2f8f63c5..df01ac9f81474ae93ed4ba9b973cf553bb98834c 100644
GIT binary patch
delta 1854
zcmbW1ZA?>F7{_z(hWAp1V(VndwvMtbbT3RcVGPSAON6kjrQ-auq0*KP<0cEZ-j*+$
z7%+uWy0*`(FM%o_Yz3_{yTmL;X;EuT#=@qs2?Bx)Au(N+?ZfoL*z??0XMnx&q5uCm
zzjK~{&*@2@%lD*nccndBjcju!R2tP}?M5}<oT)O&3iuRwt9mUl?O+*M$DocZHmD_g
zV@N~R8n+`RaTYUm5uBf8z^q6l9dfES(DI2NEo8B3D_O^NfoyEMnan;+<{1$uMLQmj
ztGHpJ9g!R2d7m2<t!1=|U~JStRz9XDYuG8;W8<Q2sOe{1;GQl-)qPBwb88)H!%ZFP
zz|D=Q%84@6+6gV{c~MtP(zvsB8|uQ^k8W9!XYZ;<-7;lCed-ed_3fWXdqv%C{;T%e
z>2l;5x2sUU6G&%nn^3hgM%11e18Sv}G(sABroLUm^ufg5Lew>O(w+8os6wMIxlgG&
z#mIEL6yCIzB3s>5M(hMD)AB3f<>nG(U&YxNF*!WhLTuAsC+fURwoeH`*LrAc%*Vx4
zTRj1vy9m}a<staPX5la!a|CdE)X*=|JIxkct7=&!4|%{|g}S`egj(BbM7=8NYYrM8
zbQmRKq9l+cSp^NS3SMa|V5bz2V^0T->scDs;4s{l$xkU%^?1`%7;%*n&vojOk=<kP
zT4~VlE+Kf$sU?VK)bKJm>nSE!_qm3u$5@GvgU=v+nQ_++)AkSk{=29s=(3PWZAGAQ
z=F`yU7Rct1+;Qg7(BUzYv0&!n`F{8mo`zT3UMIZp4n&XHU-bUMB<(-{JHvzTix-Hk
zXnjd!j-QcjvGK5cUncQ7k*7dm6A!ifG6-E05eJ+j6+ZN2#J^XjheAgdMsT3=W<Owu
z6U^?-#?sK&-ct+{g_=WJNmTqb_B<+i93ozM=<0!ki4`UqI(uk0i`&#40#3f{_?1?U
z9yZ{FI}%P}hZS(;XaPTb|23GdQevC^Iu04V26XP1!#RH*;otn)WW<U0nCLDh=niPe
z#sg=_Fm0KbW`*~9)bNBqpXfVXR<es-0-3s7NW_@&S-*)r?>U_Y6@gq@Qyn*x`HtUD
z`-ig`pwpKHl|k`r-k^aB?*{c`6(`9;=T2TvV+Ry)pjXQcD8xS!C@;%lt~W0k=ZTAK
zyiiP=n!*~i(D&g=hNf%#1hVe9DKD5Q0V~W<enk!K;au9Ba#1R7R$MaB<~?znx}>LB
zNt7&fEE-Fp<~6^0E~yb`{or3LYpIRcGV*ZTQX8>#{9SBt3!CYGX~geORxDckuZ@^<
kQTLMgKtH(}%BR;qNco>Fxp8RLHZ;rNhdnbi`$(PqPikWM!vFvP

delta 1898
zcmb`HUrbwd6vuN*YH#nT9k&aR$htB$HrW*aA+nOdj2I=oEo$P6V{1#Lz+_Uqx8=db
z89K`ft+Z!svtgnS>jYs;>)>H%*(Uy3%7bQ`n{)gzK}V)F%9Be5o^vm<Eg?qKhkifj
ze1GS6e)soFa~A*5e{o%ZyvC(kD1_>B7DD)(g<U8#yZKU92V3hNAy0kYrbTav;q9y*
z)_a~NGjU!Zb3nyg*&NW-S5h`f84up?DybxT!Ai)u`v^A=pp3cbB>3ula!H+^;PFU=
zNsqYHOvGk6;wE^r{s~$*TQ3qS8g6Z9Zgi6wX_T*V<$D=huhf!xa;JQX@nr{PdlXDe
z%Gr}m6HGkjEo0&^Hbr`4Y76S)({|MM>1xzV(>7G|jG&D#-|eB<O7uRP5m4W2-o8?c
z6J9?q-rv%SnrQK%u76cRWoAjWBI)bm^47bgXVGYqYEi$I_1&M`7{`4s)Eho0>JC5Y
zDbnQKtvwu*hMB!(s70YNRT`f<oCkr>Ml_^0I~fI$e6R;gC~U&8C{Rq{D2C<j#aQ-n
zz@|;hml9Y56zqEnz328uP*>_pdv|x0L%6L3EA9-olCdjVL4DC!2>LWiGYOnA3rxuF
z&+R^3tKIi^O^y3E#X8k+G4wE&uIX^2Hg~wFdsX-5SSK}qtkZ@1cBhMzkKj^jZXHy^
zx_myD<+kvgj?G@1{4vesU;cKaH!J_D33fuM3h`hl4?cl=D2#?>Cmps?RuHihnj!*W
zRKc3JtlFz4<sWPS1}a%O<Ayb0gFK_FrNQlaY4u0$?()$g`d|eVM@uN&6_p5!=-eAC
zrf^$KBzzMSHOiTvf&d%xR((C=ei!x0?$~^={8vT?+kz}qMK_Y?MQ_7z=$X3Blvi~-
z34`4Zg8l#@={+#SFc~O3BruueD~C=jC2Yos&%({Cq4{ubvMcUVVbOe#ghdU9=c%Zs
z*NI80cTBAsHo+T5N(rM!Y=rEDoluhy2m=X0GpxKac!vzo-~TAt&m6T94jvsLV1qlb
zsFn9a&T$KzeZPd<tUf>CwLXb3ub{DCq-<Kj3m^QopUm4o;M#zbOxvK04+kBT8ICzP
z`E$76Ra`D?|0p*J$4;(Q1x!$#5(vEtGAS!%Wn+Y7Xlw^V>9tdmCSal&D1q%u3)H7{
zFm&2XOP5ZI1p666a{P>*p~~wF?}XG>_racbbf6zMFYR{1;*!@gF7NIcchK$y8A-?I
z86C~9n-lc^9??@561N{f*?$?)4_v;r;lCZxMN`kOG+$RUqWK?QT&cxB8PUJYE^l4s
Uh;EC_1tW6|{!}B8xh${YPc{w@LI3~&

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index f5e5e1d83c..4423c376f5 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -7315,7 +7315,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 30
     }
   }
@@ -7339,7 +7339,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 60
     }
   }
@@ -7363,7 +7363,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 100
     }
   }
@@ -7386,7 +7386,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 120
     }
   }
@@ -7415,7 +7415,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 175
     }
   }
@@ -7444,7 +7444,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 250
     }
   }
@@ -7472,7 +7472,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 300
     }
   }
@@ -7500,7 +7500,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -7528,7 +7528,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -7556,7 +7556,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -7613,7 +7613,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 30
     }
   }
@@ -7637,7 +7637,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 60
     }
   }
@@ -7661,7 +7661,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 100
     }
   }
@@ -7696,7 +7696,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 120
     }
   }
@@ -7737,7 +7737,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 175
     }
   }
@@ -7778,7 +7778,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 250
     }
   }
@@ -7818,7 +7818,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 300
     }
   }
@@ -7858,7 +7858,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -7898,7 +7898,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -7938,7 +7938,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -7995,7 +7995,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 30
     }
   }
@@ -8019,7 +8019,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 60
     }
   }
@@ -8053,7 +8053,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 100
     }
   }
@@ -8086,7 +8086,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 120
     }
   }
@@ -8119,7 +8119,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 175
     }
   }
@@ -8152,7 +8152,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 250
     }
   }
@@ -8184,7 +8184,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 300
     }
   }
@@ -8216,7 +8216,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -8248,7 +8248,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -8280,7 +8280,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -8360,7 +8360,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 30
     }
   }
@@ -8384,7 +8384,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 60
     }
   }
@@ -8408,7 +8408,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 100
     }
   }
@@ -8431,7 +8431,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 120
     }
   }
@@ -8460,7 +8460,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 175
     }
   }
@@ -8489,7 +8489,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 250
     }
   }
@@ -8517,7 +8517,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 300
     }
   }
@@ -8545,7 +8545,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -8573,7 +8573,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -8601,7 +8601,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -8628,7 +8628,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 30
     }
   }
@@ -8652,7 +8652,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 60
     }
   }
@@ -8676,7 +8676,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 100
     }
   }
@@ -8699,7 +8699,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 120
     }
   }
@@ -8740,7 +8740,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 175
     }
   }
@@ -8781,7 +8781,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 250
     }
   }
@@ -8821,7 +8821,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 300
     }
   }
@@ -8861,7 +8861,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -8901,7 +8901,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -8941,7 +8941,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -8968,7 +8968,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 30
     }
   }
@@ -8992,7 +8992,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 60
     }
   }
@@ -9022,7 +9022,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 100
     }
   }
@@ -9055,7 +9055,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 120
     }
   }
@@ -9088,7 +9088,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 175
     }
   }
@@ -9121,7 +9121,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 250
     }
   }
@@ -9153,7 +9153,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 300
     }
   }
@@ -9185,7 +9185,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -9217,7 +9217,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -9249,7 +9249,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -10040,7 +10040,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 30
     }
   }
@@ -10064,7 +10064,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 60
     }
   }
@@ -10088,7 +10088,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 100
     }
   }
@@ -10111,7 +10111,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 120
     }
   }
@@ -10140,7 +10140,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 175
     }
   }
@@ -10169,7 +10169,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 250
     }
   }
@@ -10197,7 +10197,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 300
     }
   }
@@ -10225,7 +10225,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
@@ -10253,7 +10253,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
@@ -10281,7 +10281,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
@@ -10328,7 +10328,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 30
     }
   }
@@ -10352,7 +10352,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 60
     }
   }
@@ -10376,7 +10376,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 100
     }
   }
@@ -10399,7 +10399,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 120
     }
   }
@@ -10440,7 +10440,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 175
     }
   }
@@ -10481,7 +10481,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 250
     }
   }
@@ -10521,7 +10521,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 300
     }
   }
@@ -10561,7 +10561,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
@@ -10601,7 +10601,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
@@ -10641,7 +10641,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
@@ -10688,7 +10688,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 30
     }
   }
@@ -10712,7 +10712,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 60
     }
   }
@@ -10736,7 +10736,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 100
     }
   }
@@ -10759,7 +10759,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 120
     }
   }
@@ -10792,7 +10792,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 175
     }
   }
@@ -10825,7 +10825,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 250
     }
   }
@@ -10857,7 +10857,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 300
     }
   }
@@ -10889,7 +10889,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
@@ -10921,7 +10921,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
@@ -10953,24 +10953,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4300
+      priority: 4290
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 4200
-    }
-  }
   element {
     scale: 11
     lines {
@@ -10991,7 +10980,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 60
     }
   }
@@ -11015,7 +11004,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 100
     }
   }
@@ -11038,7 +11027,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 120
     }
   }
@@ -11067,7 +11056,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 175
     }
   }
@@ -11096,7 +11085,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 250
     }
   }
@@ -11124,7 +11113,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 300
     }
   }
@@ -11152,7 +11141,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
@@ -11180,7 +11169,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
@@ -11208,24 +11197,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link-bridge"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 4200
-    }
-  }
   element {
     scale: 11
     lines {
@@ -11246,7 +11224,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 60
     }
   }
@@ -11270,7 +11248,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 100
     }
   }
@@ -11293,7 +11271,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 120
     }
   }
@@ -11334,7 +11312,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 175
     }
   }
@@ -11375,7 +11353,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 250
     }
   }
@@ -11415,7 +11393,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 300
     }
   }
@@ -11455,7 +11433,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
@@ -11495,7 +11473,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
@@ -11535,24 +11513,13 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
 }
 cont {
   name: "highway-primary_link-tunnel"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 871230427
-      }
-      priority: 4200
-    }
-  }
   element {
     scale: 11
     lines {
@@ -11573,7 +11540,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 60
     }
   }
@@ -11597,7 +11564,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 100
     }
   }
@@ -11620,7 +11587,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 120
     }
   }
@@ -11653,7 +11620,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 175
     }
   }
@@ -11686,7 +11653,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 250
     }
   }
@@ -11718,7 +11685,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 300
     }
   }
@@ -11750,7 +11717,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
@@ -11782,7 +11749,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
@@ -11814,7 +11781,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4200
+      priority: 3940
       min_distance: 350
     }
   }
@@ -11964,7 +11931,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3950
+      priority: 3910
       min_distance: 350
     }
   }
@@ -11992,7 +11959,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3950
+      priority: 3910
       min_distance: 350
     }
   }
@@ -12142,7 +12109,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3950
+      priority: 3910
       min_distance: 350
     }
   }
@@ -12170,7 +12137,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3950
+      priority: 3910
       min_distance: 350
     }
   }
@@ -12380,7 +12347,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3950
+      priority: 3910
       min_distance: 350
     }
   }
@@ -12420,7 +12387,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3950
+      priority: 3910
       min_distance: 350
     }
   }
@@ -12582,7 +12549,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 3950
+      priority: 3910
       min_distance: 350
     }
   }
@@ -12614,7 +12581,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 3950
+      priority: 3910
       min_distance: 350
     }
   }
@@ -13137,7 +13104,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 100
     }
   }
@@ -13160,7 +13127,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 120
     }
   }
@@ -13189,7 +13156,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 175
     }
   }
@@ -13218,7 +13185,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 250
     }
   }
@@ -13246,7 +13213,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 300
     }
   }
@@ -13274,7 +13241,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -13302,7 +13269,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -13330,7 +13297,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -13393,7 +13360,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 100
     }
   }
@@ -13416,7 +13383,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 120
     }
   }
@@ -13457,7 +13424,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 175
     }
   }
@@ -13498,7 +13465,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 250
     }
   }
@@ -13538,7 +13505,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 300
     }
   }
@@ -13578,7 +13545,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -13618,7 +13585,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -13658,7 +13625,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -13721,7 +13688,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 100
     }
   }
@@ -13744,7 +13711,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 120
     }
   }
@@ -13773,7 +13740,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 175
     }
   }
@@ -13802,7 +13769,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 250
     }
   }
@@ -13834,7 +13801,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 300
     }
   }
@@ -13866,7 +13833,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -13898,7 +13865,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -13930,7 +13897,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4150
+      priority: 3930
       min_distance: 350
     }
   }
@@ -15321,7 +15288,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 250
     }
   }
@@ -15349,7 +15316,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 300
     }
   }
@@ -15377,7 +15344,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -15405,7 +15372,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -15433,7 +15400,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -15551,7 +15518,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 250
     }
   }
@@ -15591,7 +15558,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 300
     }
   }
@@ -15631,7 +15598,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -15671,7 +15638,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -15711,7 +15678,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -15805,7 +15772,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 250
     }
   }
@@ -15837,7 +15804,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 300
     }
   }
@@ -15869,7 +15836,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -15901,7 +15868,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -15933,7 +15900,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4100
+      priority: 3920
       min_distance: 350
     }
   }
@@ -16923,7 +16890,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 30
     }
   }
@@ -16947,7 +16914,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 60
     }
   }
@@ -16971,7 +16938,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 100
     }
   }
@@ -16994,7 +16961,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 120
     }
   }
@@ -17023,7 +16990,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 175
     }
   }
@@ -17052,7 +17019,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 250
     }
   }
@@ -17080,7 +17047,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 300
     }
   }
@@ -17108,7 +17075,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17136,7 +17103,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17164,7 +17131,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17221,7 +17188,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 30
     }
   }
@@ -17245,7 +17212,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 60
     }
   }
@@ -17269,7 +17236,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 100
     }
   }
@@ -17304,7 +17271,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 120
     }
   }
@@ -17345,7 +17312,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 175
     }
   }
@@ -17386,7 +17353,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 250
     }
   }
@@ -17426,7 +17393,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 300
     }
   }
@@ -17466,7 +17433,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17506,7 +17473,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17546,7 +17513,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17603,7 +17570,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 30
     }
   }
@@ -17627,7 +17594,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 60
     }
   }
@@ -17661,7 +17628,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 100
     }
   }
@@ -17694,7 +17661,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 120
     }
   }
@@ -17727,7 +17694,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 175
     }
   }
@@ -17760,7 +17727,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 250
     }
   }
@@ -17792,7 +17759,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 300
     }
   }
@@ -17824,7 +17791,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17856,7 +17823,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17888,7 +17855,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4350
+      priority: 4360
       min_distance: 350
     }
   }
@@ -17915,7 +17882,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 30
     }
   }
@@ -17939,7 +17906,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 60
     }
   }
@@ -17963,7 +17930,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 100
     }
   }
@@ -17986,7 +17953,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 120
     }
   }
@@ -18015,7 +17982,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 175
     }
   }
@@ -18044,7 +18011,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 250
     }
   }
@@ -18072,7 +18039,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 300
     }
   }
@@ -18100,7 +18067,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -18128,7 +18095,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -18156,7 +18123,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -18183,7 +18150,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 30
     }
   }
@@ -18207,7 +18174,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 60
     }
   }
@@ -18231,7 +18198,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 100
     }
   }
@@ -18254,7 +18221,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 120
     }
   }
@@ -18295,7 +18262,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 175
     }
   }
@@ -18336,7 +18303,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 250
     }
   }
@@ -18376,7 +18343,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 300
     }
   }
@@ -18416,7 +18383,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -18456,7 +18423,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -18496,7 +18463,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -18523,7 +18490,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 30
     }
   }
@@ -18547,7 +18514,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 60
     }
   }
@@ -18577,7 +18544,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 100
     }
   }
@@ -18610,7 +18577,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 120
     }
   }
@@ -18643,7 +18610,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 175
     }
   }
@@ -18676,7 +18643,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 250
     }
   }
@@ -18708,7 +18675,7 @@ cont {
     shield {
       height: 9
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 300
     }
   }
@@ -18740,7 +18707,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -18772,7 +18739,7 @@ cont {
     shield {
       height: 10
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
@@ -18804,7 +18771,7 @@ cont {
     shield {
       height: 11
       color: 16777215
-      priority: 4250
+      priority: 4240
       min_distance: 350
     }
   }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index d3a85185f2075055999e0cc12a15617ad125d3e2..3abe909e0bc80019ab35208afd253b20a5b45ecd 100644
GIT binary patch
delta 1858
zcmbu9ZA_b06vy+_kQs!rm_CF!sK7EE*>FySBU*(rHnSMR%2)vtvoZR*^3tIjv}-qw
z17Q>>JKM@)rj5&%z<4R^5+X6ex{6XWEgy7~6^2RG@DhuO#_ZEP|7UYBL1XYk|G)n^
z_uO-D?vtJizb8!mmf#JR$r{s1eRDhDjmRk{yajfjQ%+U;H^Y9kzZh^;ixgkJ4L0PG
z)9m+ou$#yC0D`s%h+0Id(B{DQXnnxa&ht7G7AC?D#>uxtit43Ac*2hS8<R(X8<RF*
z%qZb?)8b}34@euX95A3H#Vn!0Y(z9~)&nIKI$)?m3#_k{&|G;#a8a2~r1?Wz*!4wr
zu>M+=&-&7jC9G}LrL5}mM7mq8VyCibSkL{mhxHc=H2<KHb@?9e)EwnCVfq;ByVDNV
zyVG`7`^*v6kTH=~&+6h`X&WYG&w8hZh1grGXxG6cI&%m&Sm>EHhf}SGancWS(AR2B
ztWk3!eO0Swmr|!^Jzl3{oq_sxSwD;w{500QL*`GT_O@ioa%OO1uQMNs6xUjsJg(%#
z+WJyfb-73<>hsuLuP<g@-vD(;`fWo8`{g=uTGe=zb-3{uYi^T+^)pG8C*TJq&2Iju
z2Dr*r_eKgim9QT7Cbp|c)sn@Vqh^s59Z8&tp-w4tyT!oyS6iWdt%h~}g{Qj{6Dv2G
z4940rYo?{fR9RMI-CJR*GLyRP6<I{VFR&fh=S-#qdKxyxRSYE8C(|8L!iHQL;A_tO
zaq2}_K`W<I?YXeuwHL)j6c0XCgkCuLBo(&3jJ2iBv&n&ltBrYoHCHv|(VR=_I>h$=
z0neYdp>E75QsA_1@c~nmb>?3V*y=W5qsMIo=FM_`szTVQmQC(8t7S2Cz9S3qc!w6q
zJq!3Qp1mT-Mii795XtJv5k`Fd9}NC2<3DGUp$3=Q?a^_~C!V=`H9?U+{kVWLapwau
zvT+4XU)ly_c#8o`X9*DO)Bx#S67YttUAf4Fx{83OE?oug?|r7*!4dxW{%#ZUnLT!3
zs7a*Z9s_JfuMNP3277g|X?=@ZJbZlEt4GOHi%6yYYS`|6ZQS^SZ}+&CdI!?U(jQL~
z1CP?~%j>wtS9jU7Mix@g6W26A%{>IK6(LFu0KUTkt$;B6xgEd_t49p5H%Dv$Zn*J!
zCMg5i9Qs0EBuVu%U+S@1I4WUqREsDz2>2R;qw$zYO9$is9=Xrm@-E+bB_sEn+l!m6
zbmYcH-sBOrFxpl!a(DiWF}Hk=|1@%W_uI1%_gKM*eXk(;enC{=pKPEY`iSPSKLOo$
B8|eT5

delta 1951
zcmbtUYfMvT7|uBkN-7mXIHf-T%QBN)U}BangfRz#EX(3x8x(dCqV_tJ>lR&Yg(ylH
z#a>?IwkVgxETU+&n=>X81U3g_$yj0rTc&01VnAD#ZHdV?+4~%g8VQM)AAO$ZectbT
zzVDo#yg&UFb@1;f-`ED>I%$8AD6nCbcs+^oC)cu3>XfK_<4PD^8;jU*Rj5g|DI11s
zN(buOR0tCE1>6o+s%f+SMHu~h|AIvLa|R3OZKIvr^VMn!8D--wlMVi)X*+1TU!r%-
z2FMAs6|~NBS6*E}-ZvXCp`B1B)92G>RC8rUkn3kTVPLbK&*}-PDSb;G{H8763!VJ5
zxnd`tG?oU+SF!O&c@E=q6~&CMiZ{`8O-VFgk;O(<rH-+^vXC(-V@{Qs^&%;C)jPO3
zUtP;sTVrSZuf~Q%Jem7F0~@}X?W)eC$1jMfzQCZM{82&qRT^r2AD7@%#;IAHnR*51
zbjbM1RtrMr$|U-F>uYQ$Y%?-GA4Fge(4YUo0i`fb6HU3|coNyX@${_o2{uZdIgCT~
z#js1<@szeZ1M(EhU5)9G(Vlpk*`3bIR_rNaw99yYPdn>H^0FK|xH;&kWz1}}GoFz#
z<3s4vGNv^x7Jx%TtxwUn&J13yYPP_bD~ly(^XqI}Y&J2zv=?}6uPJK$_S^D=D`P3i
z8>@*?M<~-{l&XlxXlKWXM>KW4BkfBxm$j7PT`e-%ylX*&u53`4y9iX`E(V=)>p;;S
znFM_-**uwW&UgwUFKci8HUCngcX`}>9TY)!1f6xPA*(wBGOKY7z1)%xIlwa6BTIY^
zntcYi6K088_8C-n9DFUDmV4tUp;d8zr-xciNL<#O+?Kjb3~QUaDnw9&dnL>puUCVH
zqRl-ogwsE5DQE<4tX9za_GeIg+x4JpGWkn7J`sc<J+{A42>LA_oxWXI_gh6Vm?+<W
zX}5vfRoz$6F6l)v(mN6+p43v$;cU?Ku_BPWLZUpM?Cd<GgA?tMD0C<b68}VQUnZoZ
zuK;wR?=0wM#&3u1TzP9GvL3O(|MiFsG|(u~wtf@jbiWmZclz<CDb#f|4dv9)J7X4J
zrNw8&vOu#$=TFAbpif0Ae+0d7d<AU%aXn~ECV%RQ?r5=IOWzIYKu-?Kv~#!s)uc@R
zr$_Vx%9bx|Al&brKND%)coY?NspyU26xjF%4t{BX#C<P~r_ihC(zx_H&S~WRy<Zv8
zRgM}X>u-IQF?yQ+=21E@iltQAE78@_JnULMHmX`Md)au1X+HCVZ$Y9wXdiHzH(b0c
z?;)o7(53Y}{1%zR_dLyo-!VcLNx8Ra&ij*RZ>F$*km<ck5o%C`1pbMiDMCwhOaBL-
CF;Pwc

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index e42de262f4..3a211ae017 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -7312,7 +7312,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 30
       text_color: 3158064
     }
@@ -7338,7 +7338,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 60
       text_color: 3158064
     }
@@ -7364,7 +7364,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 100
       text_color: 3158064
     }
@@ -7389,7 +7389,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 120
       text_color: 3158064
     }
@@ -7420,7 +7420,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 175
       text_color: 3158064
     }
@@ -7451,7 +7451,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 250
       text_color: 3158064
     }
@@ -7481,7 +7481,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 300
       text_color: 3158064
     }
@@ -7511,7 +7511,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -7541,7 +7541,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -7571,7 +7571,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -7630,7 +7630,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 30
       text_color: 3158064
     }
@@ -7656,7 +7656,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 60
       text_color: 3158064
     }
@@ -7682,7 +7682,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 100
       text_color: 3158064
     }
@@ -7719,7 +7719,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 120
       text_color: 3158064
     }
@@ -7762,7 +7762,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 175
       text_color: 3158064
     }
@@ -7805,7 +7805,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 250
       text_color: 3158064
     }
@@ -7847,7 +7847,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 300
       text_color: 3158064
     }
@@ -7889,7 +7889,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -7931,7 +7931,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -7973,7 +7973,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -8032,7 +8032,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 30
       text_color: 3158064
     }
@@ -8058,7 +8058,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 60
       text_color: 3158064
     }
@@ -8093,7 +8093,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 100
       text_color: 3158064
     }
@@ -8127,7 +8127,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 120
       text_color: 3158064
     }
@@ -8161,7 +8161,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 175
       text_color: 3158064
     }
@@ -8195,7 +8195,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 250
       text_color: 3158064
     }
@@ -8228,7 +8228,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 300
       text_color: 3158064
     }
@@ -8261,7 +8261,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -8294,7 +8294,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -8327,7 +8327,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -8409,7 +8409,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 30
       text_color: 3158064
     }
@@ -8435,7 +8435,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 60
       text_color: 3158064
     }
@@ -8461,7 +8461,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 100
       text_color: 3158064
     }
@@ -8486,7 +8486,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 120
       text_color: 3158064
     }
@@ -8517,7 +8517,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 175
       text_color: 3158064
     }
@@ -8548,7 +8548,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 250
       text_color: 3158064
     }
@@ -8578,7 +8578,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 300
       text_color: 3158064
     }
@@ -8608,7 +8608,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -8638,7 +8638,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -8668,7 +8668,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -8697,7 +8697,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 30
       text_color: 3158064
     }
@@ -8723,7 +8723,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 60
       text_color: 3158064
     }
@@ -8749,7 +8749,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 100
       text_color: 3158064
     }
@@ -8774,7 +8774,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 120
       text_color: 3158064
     }
@@ -8817,7 +8817,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 175
       text_color: 3158064
     }
@@ -8860,7 +8860,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 250
       text_color: 3158064
     }
@@ -8902,7 +8902,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 300
       text_color: 3158064
     }
@@ -8944,7 +8944,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -8986,7 +8986,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -9028,7 +9028,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -9057,7 +9057,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 30
       text_color: 3158064
     }
@@ -9083,7 +9083,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 60
       text_color: 3158064
     }
@@ -9114,7 +9114,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 100
       text_color: 3158064
     }
@@ -9148,7 +9148,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 120
       text_color: 3158064
     }
@@ -9182,7 +9182,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 175
       text_color: 3158064
     }
@@ -9216,7 +9216,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 250
       text_color: 3158064
     }
@@ -9249,7 +9249,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 300
       text_color: 3158064
     }
@@ -9282,7 +9282,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -9315,7 +9315,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -9348,7 +9348,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -10141,7 +10141,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 30
       text_color: 3158064
     }
@@ -10167,7 +10167,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 60
       text_color: 3158064
     }
@@ -10193,7 +10193,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 100
       text_color: 3158064
     }
@@ -10218,7 +10218,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 120
       text_color: 3158064
     }
@@ -10249,7 +10249,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 175
       text_color: 3158064
     }
@@ -10280,7 +10280,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 250
       text_color: 3158064
     }
@@ -10310,7 +10310,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 300
       text_color: 3158064
     }
@@ -10340,7 +10340,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -10370,7 +10370,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -10400,7 +10400,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -10449,7 +10449,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 30
       text_color: 3158064
     }
@@ -10475,7 +10475,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 60
       text_color: 3158064
     }
@@ -10501,7 +10501,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 100
       text_color: 3158064
     }
@@ -10526,7 +10526,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 120
       text_color: 3158064
     }
@@ -10569,7 +10569,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 175
       text_color: 3158064
     }
@@ -10612,7 +10612,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 250
       text_color: 3158064
     }
@@ -10654,7 +10654,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 300
       text_color: 3158064
     }
@@ -10696,7 +10696,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -10738,7 +10738,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -10780,7 +10780,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -10829,7 +10829,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 30
       text_color: 3158064
     }
@@ -10855,7 +10855,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 60
       text_color: 3158064
     }
@@ -10881,7 +10881,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 100
       text_color: 3158064
     }
@@ -10906,7 +10906,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 120
       text_color: 3158064
     }
@@ -10940,7 +10940,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 175
       text_color: 3158064
     }
@@ -10974,7 +10974,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 250
       text_color: 3158064
     }
@@ -11007,7 +11007,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 300
       text_color: 3158064
     }
@@ -11040,7 +11040,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -11073,7 +11073,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -11106,7 +11106,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4300
+      priority: 4290
       min_distance: 350
       text_color: 3158064
     }
@@ -11114,17 +11114,6 @@ cont {
 }
 cont {
   name: "highway-primary_link"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 12
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 4200
-    }
-  }
   element {
     scale: 11
     lines {
@@ -11146,7 +11135,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 60
       text_color: 3158064
     }
@@ -11172,7 +11161,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 100
       text_color: 3158064
     }
@@ -11197,7 +11186,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 120
       text_color: 3158064
     }
@@ -11228,7 +11217,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 175
       text_color: 3158064
     }
@@ -11259,7 +11248,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 250
       text_color: 3158064
     }
@@ -11289,7 +11278,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 300
       text_color: 3158064
     }
@@ -11319,7 +11308,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -11349,7 +11338,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -11379,7 +11368,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -11387,17 +11376,6 @@ cont {
 }
 cont {
   name: "highway-primary_link-bridge"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 12
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 4200
-    }
-  }
   element {
     scale: 11
     lines {
@@ -11419,7 +11397,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 60
       text_color: 3158064
     }
@@ -11445,7 +11423,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 100
       text_color: 3158064
     }
@@ -11470,7 +11448,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 120
       text_color: 3158064
     }
@@ -11513,7 +11491,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 175
       text_color: 3158064
     }
@@ -11556,7 +11534,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 250
       text_color: 3158064
     }
@@ -11598,7 +11576,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 300
       text_color: 3158064
     }
@@ -11640,7 +11618,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -11682,7 +11660,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -11724,7 +11702,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -11732,17 +11710,6 @@ cont {
 }
 cont {
   name: "highway-primary_link-tunnel"
-  element {
-    scale: 10
-    path_text {
-      primary {
-        height: 12
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 4200
-    }
-  }
   element {
     scale: 11
     lines {
@@ -11764,7 +11731,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 60
       text_color: 3158064
     }
@@ -11790,7 +11757,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 100
       text_color: 3158064
     }
@@ -11815,7 +11782,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 120
       text_color: 3158064
     }
@@ -11849,7 +11816,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 175
       text_color: 3158064
     }
@@ -11883,7 +11850,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 250
       text_color: 3158064
     }
@@ -11916,7 +11883,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 300
       text_color: 3158064
     }
@@ -11949,7 +11916,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -11982,7 +11949,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -12015,7 +11982,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4200
+      priority: 3940
       min_distance: 350
       text_color: 3158064
     }
@@ -12167,7 +12134,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 3950
+      priority: 3910
       min_distance: 350
       text_color: 3158064
     }
@@ -12197,7 +12164,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 3950
+      priority: 3910
       min_distance: 350
       text_color: 3158064
     }
@@ -12349,7 +12316,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 3950
+      priority: 3910
       min_distance: 350
       text_color: 3158064
     }
@@ -12379,7 +12346,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 3950
+      priority: 3910
       min_distance: 350
       text_color: 3158064
     }
@@ -12591,7 +12558,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 3950
+      priority: 3910
       min_distance: 350
       text_color: 3158064
     }
@@ -12633,7 +12600,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 3950
+      priority: 3910
       min_distance: 350
       text_color: 3158064
     }
@@ -12794,7 +12761,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 3950
+      priority: 3910
       min_distance: 350
       text_color: 3158064
     }
@@ -12827,7 +12794,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 3950
+      priority: 3910
       min_distance: 350
       text_color: 3158064
     }
@@ -13352,7 +13319,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 100
       text_color: 3158064
     }
@@ -13377,7 +13344,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 120
       text_color: 3158064
     }
@@ -13408,7 +13375,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 175
       text_color: 3158064
     }
@@ -13439,7 +13406,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 250
       text_color: 3158064
     }
@@ -13469,7 +13436,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 300
       text_color: 3158064
     }
@@ -13499,7 +13466,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -13529,7 +13496,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -13559,7 +13526,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -13624,7 +13591,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 100
       text_color: 3158064
     }
@@ -13649,7 +13616,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 120
       text_color: 3158064
     }
@@ -13692,7 +13659,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 175
       text_color: 3158064
     }
@@ -13735,7 +13702,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 250
       text_color: 3158064
     }
@@ -13777,7 +13744,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 300
       text_color: 3158064
     }
@@ -13819,7 +13786,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -13861,7 +13828,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -13903,7 +13870,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -13968,7 +13935,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 100
       text_color: 3158064
     }
@@ -13993,7 +13960,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 120
       text_color: 3158064
     }
@@ -14024,7 +13991,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 175
       text_color: 3158064
     }
@@ -14055,7 +14022,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 250
       text_color: 3158064
     }
@@ -14088,7 +14055,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 300
       text_color: 3158064
     }
@@ -14121,7 +14088,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -14154,7 +14121,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -14187,7 +14154,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4150
+      priority: 3930
       min_distance: 350
       text_color: 3158064
     }
@@ -15576,7 +15543,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 250
       text_color: 3158064
     }
@@ -15606,7 +15573,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 300
       text_color: 3158064
     }
@@ -15636,7 +15603,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -15666,7 +15633,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -15696,7 +15663,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -15816,7 +15783,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 250
       text_color: 3158064
     }
@@ -15858,7 +15825,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 300
       text_color: 3158064
     }
@@ -15900,7 +15867,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -15942,7 +15909,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -15984,7 +15951,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -16080,7 +16047,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 250
       text_color: 3158064
     }
@@ -16113,7 +16080,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 300
       text_color: 3158064
     }
@@ -16146,7 +16113,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -16179,7 +16146,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -16212,7 +16179,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4100
+      priority: 3920
       min_distance: 350
       text_color: 3158064
     }
@@ -17200,7 +17167,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 30
       text_color: 3158064
     }
@@ -17226,7 +17193,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 60
       text_color: 3158064
     }
@@ -17252,7 +17219,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 100
       text_color: 3158064
     }
@@ -17277,7 +17244,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 120
       text_color: 3158064
     }
@@ -17308,7 +17275,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 175
       text_color: 3158064
     }
@@ -17339,7 +17306,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 250
       text_color: 3158064
     }
@@ -17369,7 +17336,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 300
       text_color: 3158064
     }
@@ -17399,7 +17366,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -17429,7 +17396,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -17459,7 +17426,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -17518,7 +17485,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 30
       text_color: 3158064
     }
@@ -17544,7 +17511,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 60
       text_color: 3158064
     }
@@ -17570,7 +17537,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 100
       text_color: 3158064
     }
@@ -17607,7 +17574,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 120
       text_color: 3158064
     }
@@ -17650,7 +17617,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 175
       text_color: 3158064
     }
@@ -17693,7 +17660,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 250
       text_color: 3158064
     }
@@ -17735,7 +17702,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 300
       text_color: 3158064
     }
@@ -17777,7 +17744,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -17819,7 +17786,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -17861,7 +17828,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -17920,7 +17887,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 30
       text_color: 3158064
     }
@@ -17946,7 +17913,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 60
       text_color: 3158064
     }
@@ -17981,7 +17948,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 100
       text_color: 3158064
     }
@@ -18015,7 +17982,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 120
       text_color: 3158064
     }
@@ -18049,7 +18016,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 175
       text_color: 3158064
     }
@@ -18083,7 +18050,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 250
       text_color: 3158064
     }
@@ -18116,7 +18083,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 300
       text_color: 3158064
     }
@@ -18149,7 +18116,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -18182,7 +18149,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -18215,7 +18182,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4350
+      priority: 4360
       min_distance: 350
       text_color: 3158064
     }
@@ -18244,7 +18211,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 30
       text_color: 3158064
     }
@@ -18270,7 +18237,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 60
       text_color: 3158064
     }
@@ -18296,7 +18263,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 100
       text_color: 3158064
     }
@@ -18321,7 +18288,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 120
       text_color: 3158064
     }
@@ -18352,7 +18319,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 175
       text_color: 3158064
     }
@@ -18383,7 +18350,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 250
       text_color: 3158064
     }
@@ -18413,7 +18380,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 300
       text_color: 3158064
     }
@@ -18443,7 +18410,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -18473,7 +18440,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -18503,7 +18470,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -18532,7 +18499,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 30
       text_color: 3158064
     }
@@ -18558,7 +18525,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 60
       text_color: 3158064
     }
@@ -18584,7 +18551,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 100
       text_color: 3158064
     }
@@ -18609,7 +18576,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 120
       text_color: 3158064
     }
@@ -18652,7 +18619,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 175
       text_color: 3158064
     }
@@ -18695,7 +18662,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 250
       text_color: 3158064
     }
@@ -18737,7 +18704,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 300
       text_color: 3158064
     }
@@ -18779,7 +18746,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -18821,7 +18788,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -18863,7 +18830,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -18892,7 +18859,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 30
       text_color: 3158064
     }
@@ -18918,7 +18885,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 60
       text_color: 3158064
     }
@@ -18949,7 +18916,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 100
       text_color: 3158064
     }
@@ -18983,7 +18950,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 120
       text_color: 3158064
     }
@@ -19017,7 +18984,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 175
       text_color: 3158064
     }
@@ -19051,7 +19018,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 250
       text_color: 3158064
     }
@@ -19084,7 +19051,7 @@ cont {
       height: 9
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 300
       text_color: 3158064
     }
@@ -19117,7 +19084,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -19150,7 +19117,7 @@ cont {
       height: 10
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
@@ -19183,7 +19150,7 @@ cont {
       height: 11
       color: 10066329
       stroke_color: 3158064
-      priority: 4250
+      priority: 4240
       min_distance: 350
       text_color: 3158064
     }
diff --git a/data/styles/clear/include/priorities_3_FG.prio.txt b/data/styles/clear/include/priorities_3_FG.prio.txt
index 03bf7e90d4..ab9deb3631 100644
--- a/data/styles/clear/include/priorities_3_FG.prio.txt
+++ b/data/styles/clear/include/priorities_3_FG.prio.txt
@@ -74,35 +74,35 @@ railway-tram-bridge                                 # line z13-
 railway-tram-tunnel                                 # line z13-
 === 320
 
-highway-motorway                                    # line z7- (also has pathtext z10-, shield z10-)
-highway-motorway-bridge                             # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield z10-)
-highway-motorway-tunnel                             # line z7- (also has line(casing) z12-, pathtext z10-, shield z10-)
-highway-trunk                                       # line z7- (also has pathtext z10-, shield z10-)
-highway-trunk-bridge                                # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield z10-)
-highway-trunk-tunnel                                # line z7- (also has line(casing) z12-, pathtext z10-, shield z10-)
+highway-motorway                                    # line z7- (also has pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z7- (also has pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
 highway-world_level                                 # line z4-9
 highway-world_towns_level                           # line z6-9
 === 310
 
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z7-, pathtext z10-, shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z7-, pathtext z10-, shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-)
 # === 309
 
-highway-motorway_link                               # line z10- (also has pathtext z10-, shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z12-, pathtext z10-, shield z10-)
-highway-trunk_link                                  # line z10- (also has pathtext z10-, shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z12-, pathtext z10-, shield z10-)
+highway-motorway_link                               # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
 === 300
 
-# highway-motorway_link-tunnel                      # line(casing) z12- (also has line z10-, pathtext z10-, shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z12- (also has line z10-, pathtext z10-, shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 299
 
-highway-primary                                     # line z8- (also has pathtext z10-, shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield z10-)
+highway-primary                                     # line z8- (also has pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
 railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
 railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z13-)
 railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
@@ -117,12 +117,12 @@ railway-rail-tourism-bridge::dash                   # line::dash z16- (also has
 railway-rail-tourism-tunnel::dash                   # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z14-)
 === 290
 
-# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
 # === 289
 
-highway-primary_link                                # line z11- (also has pathtext z10-, shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z10-, shield z11-)
+highway-primary_link                                # line z11- (also has pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
 railway-rail-branch                                 # line z11- (also has line::dash z16-)
 railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z13-, line::dash z16-)
 railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
@@ -137,19 +137,19 @@ railway-rail-tourism-bridge                         # line z10- (also has line::
 railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z14-)
 === 280
 
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z10-, shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
 # railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
 # railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
 # railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
 # railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z14-)
 # === 279
 
-highway-secondary                                   # line z10- (also has pathtext z10-, shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield z12-)
+highway-secondary                                   # line z10- (also has pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z16-, pathtext z10-, shield::shield z12-)
 === 270
 
-# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield z12-)
+# highway-secondary-tunnel                          # line(casing) z16- (also has line z10-, pathtext z10-, shield::shield z12-)
 # === 269
 
 highway-secondary_link                              # line z14- (also has pathtext z16-)
@@ -160,17 +160,17 @@ highway-secondary_link-tunnel                       # line z14- (also has line(c
 # highway-secondary_link-tunnel                     # line(casing) z16- (also has line z14-, pathtext z16-)
 # === 259
 
-highway-residential                                 # line z12- (also has pathtext z13-, shield z18-)
-highway-residential-area                            # line z12- (also has pathtext z13-, shield z18-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield z18-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield z18-)
-highway-tertiary                                    # line z11- (also has pathtext z12-, shield z15-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield z15-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield z15-)
+highway-residential                                 # line z12- (also has pathtext z13-, shield::shield z18-)
+highway-residential-area                            # line z12- (also has pathtext z13-, shield::shield z18-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z13-, shield::shield z18-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z16-, pathtext z13-, shield::shield z18-)
+highway-tertiary                                    # line z11- (also has pathtext z12-, shield::shield z15-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z16-, pathtext z12-, shield::shield z15-)
 === 250
 
-# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield z18-)
-# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield z15-)
+# highway-residential-tunnel                        # line(casing) z16- (also has line z12-, pathtext z13-, shield::shield z18-)
+# highway-tertiary-tunnel                           # line(casing) z16- (also has line z11-, pathtext z12-, shield::shield z15-)
 # === 249
 
 highway-tertiary_link                               # line z15- (also has pathtext z18-)
@@ -319,23 +319,23 @@ railway-preserved-tunnel                            # line z15-
 highway-bridleway-bridge::bridgewhite               # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
 highway-cycleway-bridge::bridgewhite                # line::bridgewhite z15- (also has line z13-, line::bridgeblack z17-, pathtext z15-)
 highway-footway-bridge::bridgewhite                 # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z15-)
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield z10-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgewhite                    # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
 highway-pedestrian-bridge::bridgewhite              # line::bridgewhite z13- (also has line z13-, line::bridgeblack z14-, pathtext z14-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z10-, shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield z18-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, pathtext z13-, shield::shield z18-)
 highway-road-bridge::bridgewhite                    # line::bridgewhite z16- (also has line z12-, line::bridgeblack z16-, pathtext z14-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield z12-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z12-)
 highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, pathtext z16-)
 highway-service-bridge::bridgewhite                 # line::bridgewhite z16- (also has line z15-, line::bridgeblack z16-, pathtext z16-)
 highway-steps-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z15-, line::bridgeblack z17-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield z15-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z12-, shield::shield z15-)
 highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, pathtext z18-)
 highway-track-bridge::bridgewhite                   # line::bridgewhite z15- (also has line z14-, line::bridgeblack z17-, pathtext z15-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield z10-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
 railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
@@ -353,23 +353,23 @@ railway-subway-bridge::bridgewhite                  # line::bridgewhite z13- (al
 highway-bridleway-bridge::bridgeblack               # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
 highway-cycleway-bridge::bridgeblack                # line::bridgeblack z17- (also has line z13-, line::bridgewhite z15-, pathtext z15-)
 highway-footway-bridge::bridgeblack                 # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z15-)
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield z10-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-path-bridge::bridgeblack                    # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
 highway-pedestrian-bridge::bridgeblack              # line::bridgeblack z14- (also has line z13-, line::bridgewhite z13-, pathtext z14-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z10-, shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield z18-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, pathtext z13-, shield::shield z18-)
 highway-road-bridge::bridgeblack                    # line::bridgeblack z16- (also has line z12-, line::bridgewhite z16-, pathtext z14-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield z12-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
 highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, pathtext z16-)
 highway-service-bridge::bridgeblack                 # line::bridgeblack z16- (also has line z15-, line::bridgewhite z16-, pathtext z16-)
 highway-steps-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z15-, line::bridgewhite z15-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield z15-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-)
 highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, pathtext z18-)
 highway-track-bridge::bridgeblack                   # line::bridgeblack z17- (also has line z14-, line::bridgewhite z15-, pathtext z15-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield z10-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
 railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index 64318242fc..da193a173d 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -40,43 +40,43 @@ railway-tram-bridge                                 # line z16- (also has line::
 railway-tram-tunnel                                 # line z16- (also has line::centerline z16-)
 === 260
 
-highway-motorway                                    # line z7- (also has line(casing) z14-, pathtext z10-, shield z10-)
-highway-motorway-bridge                             # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-motorway-tunnel                             # line z7- (also has line(casing) z12-, pathtext z10-, shield z10-)
-highway-trunk                                       # line z7- (also has line(casing) z14-, pathtext z10-, shield z10-)
-highway-trunk-bridge                                # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-trunk-tunnel                                # line z7- (also has line(casing) z12-, pathtext z10-, shield z10-)
+highway-motorway                                    # line z7- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-motorway-bridge                             # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-motorway-tunnel                             # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk                                       # line z7- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-trunk-bridge                                # line z7- (also has line::bridgeblack z13-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-trunk-tunnel                                # line z7- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
 highway-world_level                                 # line z4-9
 highway-world_towns_level                           # line z6-9
 === 250
 
-# highway-motorway                                  # line(casing) z14- (also has line z7-, pathtext z10-, shield z10-)
-# highway-motorway-bridge                           # line(casing) z14- (also has line z7-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield z10-)
-# highway-motorway-tunnel                           # line(casing) z12- (also has line z7-, pathtext z10-, shield z10-)
-# highway-trunk                                     # line(casing) z14- (also has line z7-, pathtext z10-, shield z10-)
-# highway-trunk-bridge                              # line(casing) z14- (also has line z7-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield z10-)
-# highway-trunk-tunnel                              # line(casing) z12- (also has line z7-, pathtext z10-, shield z10-)
+# highway-motorway                                  # line(casing) z14- (also has line z7-, pathtext z10-, shield::shield z10-)
+# highway-motorway-bridge                           # line(casing) z14- (also has line z7-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+# highway-motorway-tunnel                           # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-)
+# highway-trunk                                     # line(casing) z14- (also has line z7-, pathtext z10-, shield::shield z10-)
+# highway-trunk-bridge                              # line(casing) z14- (also has line z7-, line::bridgeblack z13-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
+# highway-trunk-tunnel                              # line(casing) z12- (also has line z7-, pathtext z10-, shield::shield z10-)
 # === 249
 
-highway-motorway_link                               # line z10- (also has line(casing) z14-, pathtext z10-, shield z10-)
-highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-motorway_link-tunnel                        # line z10- (also has line(casing) z12-, pathtext z10-, shield z10-)
-highway-trunk_link                                  # line z10- (also has line(casing) z14-, pathtext z10-, shield z10-)
-highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-trunk_link-tunnel                           # line z10- (also has line(casing) z12-, pathtext z10-, shield z10-)
+highway-motorway_link                               # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge                        # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-tunnel                        # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
+highway-trunk_link                                  # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge                           # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-tunnel                           # line z10- (also has line(casing) z12-, pathtext z10-, shield::shield z10-)
 === 240
 
-# highway-motorway_link                             # line(casing) z14- (also has line z10-, pathtext z10-, shield z10-)
-# highway-motorway_link-bridge                      # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z10-)
-# highway-motorway_link-tunnel                      # line(casing) z12- (also has line z10-, pathtext z10-, shield z10-)
-# highway-trunk_link                                # line(casing) z14- (also has line z10-, pathtext z10-, shield z10-)
-# highway-trunk_link-bridge                         # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z10-)
-# highway-trunk_link-tunnel                         # line(casing) z12- (also has line z10-, pathtext z10-, shield z10-)
+# highway-motorway_link                             # line(casing) z14- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-bridge                      # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+# highway-motorway_link-tunnel                      # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link                                # line(casing) z14- (also has line z10-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-bridge                         # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+# highway-trunk_link-tunnel                         # line(casing) z12- (also has line z10-, pathtext z10-, shield::shield z10-)
 # === 239
 
-highway-primary                                     # line z8- (also has line(casing) z14-, pathtext z10-, shield z10-)
-highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield z10-)
+highway-primary                                     # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary-bridge                              # line z8- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary-tunnel                              # line z8- (also has line(casing) z14-, pathtext z10-, shield::shield z10-)
 railway-rail-branch::dash                           # line::dash z16- (also has line z11-)
 railway-rail-branch-bridge::dash                    # line::dash z16- (also has line z11-, line::bridgeblack z16-, line::bridgewhite z14-)
 railway-rail-branch-tunnel::dash                    # line::dash z16- (also has line z11-, line(casing) z14-)
@@ -91,14 +91,14 @@ railway-rail-tourism-bridge::dash                   # line::dash z16- (also has
 railway-rail-tourism-tunnel::dash                   # line::dash z16- (also has line z10-, line(casing) z14-, pathtext z16-)
 === 230
 
-# highway-primary                                   # line(casing) z14- (also has line z8-, pathtext z10-, shield z10-)
-# highway-primary-bridge                            # line(casing) z14- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z10-)
-# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield z10-)
+# highway-primary                                   # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
+# highway-primary-bridge                            # line(casing) z14- (also has line z8-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
+# highway-primary-tunnel                            # line(casing) z14- (also has line z8-, pathtext z10-, shield::shield z10-)
 # === 229
 
-highway-primary_link                                # line z11- (also has line(casing) z14-, pathtext z10-, shield z11-)
-highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z11-)
-highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z10-, shield z11-)
+highway-primary_link                                # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-bridge                         # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-primary_link-tunnel                         # line z11- (also has line(casing) z14-, pathtext z11-, shield::shield z11-)
 railway-rail-branch                                 # line z11- (also has line::dash z16-)
 railway-rail-branch-bridge                          # line z11- (also has line::bridgeblack z16-, line::bridgewhite z14-, line::dash z16-)
 railway-rail-branch-tunnel                          # line z11- (also has line::dash z16-, line(casing) z14-)
@@ -113,23 +113,23 @@ railway-rail-tourism-bridge                         # line z10- (also has line::
 railway-rail-tourism-tunnel                         # line z10- (also has line::dash z16-, line(casing) z14-, pathtext z16-)
 === 220
 
-# highway-primary_link                              # line(casing) z14- (also has line z11-, pathtext z10-, shield z11-)
-# highway-primary_link-bridge                       # line(casing) z14- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z11-)
-# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z10-, shield z11-)
+# highway-primary_link                              # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-bridge                       # line(casing) z14- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z11-, shield::shield z11-)
+# highway-primary_link-tunnel                       # line(casing) z14- (also has line z11-, pathtext z11-, shield::shield z11-)
 # railway-rail-branch-tunnel                        # line(casing) z14- (also has line z11-, line::dash z16-)
 # railway-rail-highspeed-tunnel                     # line(casing) z14- (also has line z10-, line::dash z16-)
 # railway-rail-main-tunnel                          # line(casing) z14- (also has line z10-, line::dash z16-)
 # railway-rail-tourism-tunnel                       # line(casing) z14- (also has line z10-, line::dash z16-, pathtext z16-)
 # === 219
 
-highway-secondary                                   # line z10- (also has line(casing) z14-, pathtext z10-, shield z12-)
-highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z12-)
-highway-secondary-tunnel                            # line z10- (also has line(casing) z14-, pathtext z10-, shield z12-)
+highway-secondary                                   # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-bridge                            # line z10- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z12-)
+highway-secondary-tunnel                            # line z10- (also has line(casing) z14-, pathtext z10-, shield::shield z12-)
 === 210
 
-# highway-secondary                                 # line(casing) z14- (also has line z10-, pathtext z10-, shield z12-)
-# highway-secondary-bridge                          # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield z12-)
-# highway-secondary-tunnel                          # line(casing) z14- (also has line z10-, pathtext z10-, shield z12-)
+# highway-secondary                                 # line(casing) z14- (also has line z10-, pathtext z10-, shield::shield z12-)
+# highway-secondary-bridge                          # line(casing) z14- (also has line z10-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z10-, shield::shield z12-)
+# highway-secondary-tunnel                          # line(casing) z14- (also has line z10-, pathtext z10-, shield::shield z12-)
 # === 209
 
 highway-secondary_link                              # line z14- (also has line(casing) z14-, pathtext z16-)
@@ -142,22 +142,22 @@ highway-secondary_link-tunnel                       # line z14- (also has line(c
 # highway-secondary_link-tunnel                     # line(casing) z14- (also has line z14-, pathtext z16-)
 # === 199
 
-highway-residential                                 # line z12- (also has line(casing) z15-, pathtext z12-, shield z18-)
-highway-residential-area                            # line z12- (also has line(casing) z15-, pathtext z12-, shield z18-)
-highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield z18-)
-highway-residential-tunnel                          # line z12- (also has line(casing) z15-, pathtext z12-, shield z18-)
-highway-tertiary                                    # line z11- (also has line(casing) z15-, pathtext z12-, shield z15-)
-highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield z15-)
-highway-tertiary-tunnel                             # line z11- (also has line(casing) z15-, pathtext z12-, shield z15-)
+highway-residential                                 # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-)
+highway-residential-area                            # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-)
+highway-residential-bridge                          # line z12- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z18-)
+highway-residential-tunnel                          # line z12- (also has line(casing) z15-, pathtext z12-, shield::shield z18-)
+highway-tertiary                                    # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-tertiary-bridge                             # line z11- (also has line::bridgeblack z14-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
+highway-tertiary-tunnel                             # line z11- (also has line(casing) z15-, pathtext z12-, shield::shield z15-)
 === 190
 
-# highway-residential                               # line(casing) z15- (also has line z12-, pathtext z12-, shield z18-)
-# highway-residential-area                          # line(casing) z15- (also has line z12-, pathtext z12-, shield z18-)
-# highway-residential-bridge                        # line(casing) z15- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield z18-)
-# highway-residential-tunnel                        # line(casing) z15- (also has line z12-, pathtext z12-, shield z18-)
-# highway-tertiary                                  # line(casing) z15- (also has line z11-, pathtext z12-, shield z15-)
-# highway-tertiary-bridge                           # line(casing) z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield z15-)
-# highway-tertiary-tunnel                           # line(casing) z15- (also has line z11-, pathtext z12-, shield z15-)
+# highway-residential                               # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-)
+# highway-residential-area                          # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-)
+# highway-residential-bridge                        # line(casing) z15- (also has line z12-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z18-)
+# highway-residential-tunnel                        # line(casing) z15- (also has line z12-, pathtext z12-, shield::shield z18-)
+# highway-tertiary                                  # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z15-)
+# highway-tertiary-bridge                           # line(casing) z15- (also has line z11-, line::bridgeblack z14-, line::bridgewhite z14-, pathtext z12-, shield::shield z15-)
+# highway-tertiary-tunnel                           # line(casing) z15- (also has line z11-, pathtext z12-, shield::shield z15-)
 # === 189
 
 highway-tertiary_link                               # line z15- (also has line(casing) z15-, pathtext z18-)
@@ -286,17 +286,17 @@ railway-preserved-bridge                            # line z16- (also has line::
 railway-preserved-tunnel                            # line z16-
 === 120
 
-highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield z11-)
-highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield z18-)
-highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield z12-)
+highway-motorway-bridge::bridgewhite                # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgewhite           # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary-bridge::bridgewhite                 # line::bridgewhite z14- (also has line z8-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgewhite             # line::bridgewhite z14- (also has line z12-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z18-)
+highway-secondary-bridge::bridgewhite               # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z12-)
 highway-secondary_link-bridge::bridgewhite          # line::bridgewhite z14- (also has line z14-, line::bridgeblack z14-, line(casing) z14-, pathtext z16-)
-highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield z15-)
+highway-tertiary-bridge::bridgewhite                # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
 highway-tertiary_link-bridge::bridgewhite           # line::bridgewhite z15- (also has line z15-, line::bridgeblack z15-, line(casing) z15-, pathtext z18-)
-highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield z10-)
+highway-trunk-bridge::bridgewhite                   # line::bridgewhite z13- (also has line z7-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgewhite              # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgewhite            # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-)
 railway-abandoned-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
 railway-preserved-bridge::bridgewhite               # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
@@ -311,17 +311,17 @@ railway-rail-utility-bridge::bridgewhite            # line::bridgewhite z14- (al
 railway-subway-bridge::bridgewhite                  # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
 === 110
 
-highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z11-)
-highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield z18-)
-highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z12-)
+highway-motorway-bridge::bridgeblack                # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-motorway_link-bridge::bridgeblack           # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary-bridge::bridgeblack                 # line::bridgeblack z14- (also has line z8-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-primary_link-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z14-, pathtext z11-, shield::shield z11-)
+highway-residential-bridge::bridgeblack             # line::bridgeblack z14- (also has line z12-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z18-)
+highway-secondary-bridge::bridgeblack               # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z12-)
 highway-secondary_link-bridge::bridgeblack          # line::bridgeblack z14- (also has line z14-, line::bridgewhite z14-, line(casing) z14-, pathtext z16-)
-highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield z15-)
+highway-tertiary-bridge::bridgeblack                # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, line(casing) z15-, pathtext z12-, shield::shield z15-)
 highway-tertiary_link-bridge::bridgeblack           # line::bridgeblack z15- (also has line z15-, line::bridgewhite z15-, line(casing) z15-, pathtext z18-)
-highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield z10-)
-highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield z10-)
+highway-trunk-bridge::bridgeblack                   # line::bridgeblack z13- (also has line z7-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
+highway-trunk_link-bridge::bridgeblack              # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
 highway-unclassified-bridge::bridgeblack            # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-)
 railway-abandoned-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
 railway-preserved-bridge::bridgeblack               # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
diff --git a/data/visibility.txt b/data/visibility.txt
index 1f1947f4c3..7e22aa18ce 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -450,9 +450,9 @@ world  00000000000000000000  +
             bridge  00000000111111111111  -
             tunnel  00000000111111111111  -
             {}
-        primary_link  00000000001111111111  +
-            bridge  00000000001111111111  -
-            tunnel  00000000001111111111  -
+        primary_link  00000000000111111111  +
+            bridge  00000000000111111111  -
+            tunnel  00000000000111111111  -
             {}
         raceway  00000000000000000000  -
         residential  00000000000011111111  +