From db0f719d1c24839585ef5aa68b84e33c219ad5e6 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 13 Aug 2023 15:37:02 +0300
Subject: [PATCH] [styles] Regenerate for parkings priorities

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin               | Bin 347670 -> 347786 bytes
 data/drules_proto.txt               | 367 +++++++++++++++-------------
 data/drules_proto_clear.bin         | Bin 348233 -> 348318 bytes
 data/drules_proto_clear.txt         | 341 ++++++++++++++------------
 data/drules_proto_dark.bin          | Bin 346719 -> 346804 bytes
 data/drules_proto_dark.txt          | 341 ++++++++++++++------------
 data/drules_proto_vehicle_clear.bin | Bin 257742 -> 257864 bytes
 data/drules_proto_vehicle_clear.txt |  48 ++--
 data/drules_proto_vehicle_dark.bin  | Bin 257212 -> 257335 bytes
 data/drules_proto_vehicle_dark.txt  |  48 ++--
 10 files changed, 617 insertions(+), 528 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 94336d3d220507f89bdb94e889345323eb13c291..529a5525b16cdea6114fcd78fc80bbc16c4ad730 100644
GIT binary patch
delta 3463
zcmcInT}&KR6wVzA9WDa9cmF1f&}GZ-$`-|+`Xa@oq$V1Y5*DGjrL#K&9oZi`GeD`z
zmO`Q-rm@_HYW;2Flc}V15^4HSz?g=<NKK4=@x{ak?TgW;y2j|4U3Pca-8PW0n{4LZ
zbME>1&N=todlx>j&3$USzS_`n1efz+F(Rpx-hdbho+RZgahKxa#DuFMjjY8m^>Db1
z#isAxyTCM|7ZG><24x!Ct#Opic%adqMt6S3+#?v;YGYR&!t{$3TU&hTzvK^*1K>dg
z#$rU3`AAUoDjfDWarvejE|hR2zNGcOb_?Y<Sl3mbpW%N5LtE(jn_;do^uo~w{qtFG
z!=7u53)7a{PWqFtE;Xs59o;?_IK{-nn(3)-Hx6_9LUNcT`m`iD)#Vs+nBMEL(d*sj
zv^e)0!q!yyM|pWfiVS;0d_<%Nd=7e|&t6mqYEievQh`fTe1%&;q#g7F{Rt!e(ycY7
znj!7FnH)w9E$KP79Y|=J65q3^p7MQGo4e9zR{)&#Nr$WkMwk--@u8$gE!m7jWt3$~
z=Eoc9%pTG`HJV6h$`zodUST_~)B4x@m^eyg4L*=HdmOoNwnC`Q?|m(<{H&C7_;=dc
z=P&9^qH42Y^Je@9M`dZ8S4A&4o2}V^ty9OgV=?>(t?u7PTYdK3&i?)W{%wWumtzO@
z5Z)W8Dv2XfrNbX^=)>n(i$2W1k!A*7eXJA&I}s~G>v*80Lp_ddblPv@iJ7hRl;hHL
zhvAxlWXdI(b4etZWXU4oJ9Oy{cd?VLblYjG-?q1jI9ZcnY&MKZdi)&ppTzo_rfdu!
zrfV5bBO3GX4-^=|6t0FyIo?c`V4>r64&hobXOE3V1W_KAqwp=X%`Xw=G97UejwW?b
z`{($4g>^kyLWWjyQ=?bH&b$n5BkX06m;M`dS_o_LK%dN1)we}j<LHx!TSvqSr=1Cx
z$zpIa7}C3M7^w8mS!+tGp<-`p+RUk|xJbbcdL`yKPM!i`DA#c@A|yp0Qy{R|vhBrq
z3cJAsHx!hHd0A9dQ7NFYGt~7?t-o+!-opEIFu`CnB1FT5M&c9&S&EDl(hTg21|1Ro
zW~y?aaB(|LKaW-UqETV@b5AeE?xHC=c((rNuKTauKl=efdQmz1lnGH(3y=!>^SNKq
z3A#4ph}mHi5?nFCD{v+Ucx6OX;fiP_Ps4u8L(gvEvzZqDHnyiaPeR+EASt6!g%5$Q
zTpMAoM%UHB8XD61w6eVBH$}EeXdlncHFJvyn*w7}DA7oGL6Aj7fxDK8wtrn)0)0xq
zcEwUdIFlDQsc<GQ)-vlz`(g2~idYOg#4vPfxX4d>1#w6U$Wkc8t5KOe0}w2@atjff
zT>`^ahf>Efh*)+e5<~b5wr4yTl4No4<fH)ic9pb(17=*V(>6(9-kL~<A%dB7fPiI3
z0$8MXZqK4Ny0OxXuF|m;Px39{G`uBV2Avp}h^HmJNU*+?i7(OkN*nVP(jOkoWsP>O
zy7ZaOyR6O3uP)E8qK^)u^-C=e(JN?udF&zDfA@u#uxT_pA<AB5ETE{oDn%ot8Pu2I
Xy-9jrbnkAgG4L;1-dNjn<o*8vtPLbI

delta 3123
zcmd5;TWlLe6xFPgdNU!(dTqz+bsmlr@>pV&I26hUffiAUhzd#bpbkk`+v|1}zq-45
zA!yu(0RbODgQ$=Q5(o(iRW#H@K^1Kt0wGkv2a5W^2M7uB5k4S%RTTnecm2r24h~Wz
zELn5s-nn<~J$L8KygF-r>mBRdQsezkz%o88L_}rE?GqyY({wpWyC5vqCd_4mZYIr}
z=Ntn|Nr>9}tf-{vAn`GM=?p`#$lJtb<e7}@NPgAySi`XZR}Co=Qs1v63{K!NNJ8)s
zU{<gGt^WXhFW#dZLLs6^e8exfWhTI}unfC=@yZ*76Ep*DeX_Uf8pv$J9k0&F{*3HM
z&L01rAl7YYZlF;emb{H{-R6W^;-x5l#EOas>$j>b=%Jo|60a(zInsopJ+7iKgMF8K
zxUCDV2%c!#s<II96V!cznJytK*kbbYUv3)d5|T=bcG8p*afKx@UK$l6r*MJaP;>`L
z=P~KIYQ<}%Uth^U)j^tbJDI7SUdYqy-zyXZOrXd6I?!ta^~4&bp@;{JV&xi@MlqY&
ztrhgAw>6*XaDQO0+oQgLlLhbV%$-siEch#W?wO(KqZnsOYYg+|M%w18gr-zCMq-jU
z&MSgD%&hGI@m3c4qZs=C5QiqT9%ci<&rsLN+W+PEa-Y{%F!=eJ-Z}UP@!bIwA9Se0
ztUkn^b)X|pSD}r;NAntsU<g{##;|pOt{^M8Qdp8AfM$Rd)OLkwyMo@XFmF-7o2YKc
zRqP-uTs9ORvXYqG93-`QV%j{Rvy+3EpVB^A0yIoOCr-E09}}doD9hrwus?|_uv*<`
zIQ5<G&nA=Tx8a7~{Qy3BX5_<i%Zy<=KgH)!YlO{dNO~h~;vNp#(sxsA%oh^<Bfe;K
z)X&Q*&Rd(CoR3ujV#a{F6Bcg9pxr1GER_WRls}|0ZkS0Wpx-Ilk&MqLP15_&Fa~X?
zZravJx8l1Gv-G$S3FtmQ5PG|_g!k>I=<<2CE|(!qEiewC3kPJ{{NgEI5)?&{3lD9{
z6&jfm7Su9LwfdvMpdb_;&6z7&CeasRt(qr#_$+yM!L{$6U_cThqkAZ~X4eESqMB*0
z@YHs%_IX&PR?7vW(Lmt{?%wL_Ko5!z#Xl&@^gSX>$T1$%!XALweV;D@Y*Ld?PM#YD
zh)tBLUjzE<ys>a_a`&zO!p~3npe23ICU{v9Mtr<HDk!uK9|tom*K}@OhhHw3Hrp{D
z<}zft5u8P{7wt@YjtF5K0sYkNz{Z_XQbsmuPn>UIKLU{Qjfo-cH1dIfB*-$|fUg24
zdiP4L(Sv0ZmVZpiG?w`}U2oQ9;7LAt<&SdW96+5nSi1-3V}TU`At?GJF%;sJsD!CO
zPY7Ghd95q~UqFjD?6x)>f`(;5Q4&s11@L=S$ppYQa~>Ou9$b701kloA3s^<#i(K2k
zK8g?HU=SV<CPhVk5UZ}l>Qxk7^4Kwz<$6(LLcO-+R9R468=t>mTwX9PgSQ_5cP_nm
z8yo|77S?Zr`mbG`kcveo1j#Lr`DBGx#ApORe9f-Api$R{QLVS;<*pS1{|yUWD@C2J
F{{sdFo`3)V

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 4dbd2765a9..59d6805fe2 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3000,14 +3000,14 @@ cont {
     scale: 18
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
   }
   element {
     scale: 19
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -3016,7 +3016,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -3026,7 +3026,7 @@ cont {
     scale: 17
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3035,14 +3035,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3051,14 +3051,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3067,7 +3067,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -5883,7 +5883,7 @@ cont {
     scale: 18
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5893,14 +5893,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5910,7 +5910,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -6033,7 +6033,7 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6042,14 +6042,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6058,14 +6058,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6074,7 +6074,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -6297,7 +6297,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6309,7 +6309,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6321,7 +6321,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6331,7 +6331,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6342,7 +6342,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6352,7 +6352,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6373,7 +6373,7 @@ cont {
     }
     symbol {
       name: "parking_pay-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6385,7 +6385,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6397,7 +6397,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6407,7 +6407,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6418,7 +6418,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6428,7 +6428,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6438,32 +6438,36 @@ cont {
     scale: 15
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6472,17 +6476,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6491,7 +6496,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6512,7 +6517,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6524,7 +6529,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6536,7 +6541,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6546,7 +6551,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6557,7 +6562,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6567,7 +6572,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6588,7 +6593,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 100
       min_distance: 5
     }
   }
@@ -6600,7 +6605,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
   }
@@ -6612,7 +6617,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6622,7 +6627,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6633,7 +6638,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6643,7 +6648,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6664,7 +6669,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6676,7 +6681,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6688,7 +6693,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6698,7 +6703,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6709,7 +6714,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6719,7 +6724,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6740,7 +6745,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 250
       min_distance: 5
     }
   }
@@ -6752,7 +6757,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
   }
@@ -6764,7 +6769,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6774,7 +6779,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
   element {
@@ -6785,7 +6790,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6795,7 +6800,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
 }
@@ -6830,7 +6835,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6839,7 +6844,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6850,7 +6855,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6859,7 +6864,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6869,32 +6874,36 @@ cont {
     scale: 15
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6903,17 +6912,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6922,7 +6932,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6943,7 +6953,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 300
       min_distance: 5
     }
   }
@@ -6955,7 +6965,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
   }
@@ -6967,7 +6977,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6977,7 +6987,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
   element {
@@ -6988,7 +6998,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6998,7 +7008,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
 }
@@ -7008,28 +7018,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -7038,7 +7048,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7048,28 +7058,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -7078,7 +7088,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7092,6 +7102,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7102,6 +7113,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7112,6 +7124,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7122,6 +7135,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7132,6 +7146,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7141,35 +7156,35 @@ cont {
     scale: 15
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 16
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
     caption {
       primary {
@@ -7178,7 +7193,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9960
     }
   }
 }
@@ -7192,6 +7207,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7202,6 +7218,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7212,6 +7229,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7222,6 +7240,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7232,6 +7251,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7245,6 +7265,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7255,6 +7276,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7265,6 +7287,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7275,6 +7298,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7285,6 +7309,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7298,6 +7323,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7308,6 +7334,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7318,6 +7345,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7328,6 +7356,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
   element {
@@ -7338,6 +7367,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -8479,7 +8509,7 @@ cont {
     scale: 18
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8488,14 +8518,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
   element {
     scale: 19
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8504,7 +8534,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -8708,6 +8738,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 450
     }
   }
 }
@@ -8783,21 +8814,21 @@ cont {
     scale: 17
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 18
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 19
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8806,7 +8837,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -9675,7 +9706,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9684,14 +9715,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9700,7 +9731,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9710,7 +9741,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9719,14 +9750,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9735,7 +9766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9745,7 +9776,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9754,14 +9785,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9770,7 +9801,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9780,7 +9811,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9789,14 +9820,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9805,7 +9836,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9815,7 +9846,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9824,14 +9855,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9840,7 +9871,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9850,7 +9881,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9859,14 +9890,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9875,7 +9906,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9885,7 +9916,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9894,14 +9925,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9910,7 +9941,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9971,7 +10002,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9980,14 +10011,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9996,7 +10027,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -10108,7 +10139,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -10117,14 +10148,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -10133,7 +10164,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -10210,14 +10241,14 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -10226,7 +10257,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -10236,7 +10267,7 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10245,14 +10276,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10261,7 +10292,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -13514,7 +13545,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13530,7 +13561,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13546,7 +13577,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13562,7 +13593,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
 }
@@ -14814,7 +14845,7 @@ cont {
     scale: 18
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14823,14 +14854,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14839,7 +14870,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -14849,7 +14880,7 @@ cont {
     scale: 18
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14858,14 +14889,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
   element {
     scale: 19
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14874,7 +14905,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -14908,7 +14939,7 @@ cont {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 50
     }
     caption {
       primary {
@@ -14924,7 +14955,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9950
     }
   }
 }
@@ -14934,7 +14965,7 @@ cont {
     scale: 18
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14944,14 +14975,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14967,7 +14998,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -14977,7 +15008,7 @@ cont {
     scale: 18
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14987,14 +15018,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
   element {
     scale: 19
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -15010,7 +15041,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
 }
@@ -40709,7 +40740,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -40733,7 +40764,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -56526,7 +56557,7 @@ cont {
     scale: 19
     symbol {
       name: "power-m"
-      priority: 150
+      priority: 20
     }
     caption {
       primary {
@@ -56535,7 +56566,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9850
+      priority: -9980
     }
   }
 }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 382fd59e0c902d11fcc0d2d128b57e66c0be249f..e373e2ee367e3d7877fc03ff59268abe3208797d 100644
GIT binary patch
delta 3039
zcmcImTTC2P7|t0A3}<0k&fX@w1((Zm*>)AFt$nbRCT%n!#em!j+u$rSZCCcv>}=%@
zEjDS>hlcuB!N%6=gC=%^ZYL2_Swf5tV2$xX-)wwQqkS<oyttawGXuLU+p*Gw-DERo
z{>%4Y&VRl+D>uzI-Zy``RNeF<F5&}X&=(nYd&OY?DN@9eiUORgzHnuvhBc<Wx;U(3
zvEi$WSD0F~A90s&15?vzN}x=|eHq$oDzp`s{zD-z)vQ(`457H0NyOlrX1f`?Y`ADW
zpaZEP6EXRp<~v9m`s<@kZADItwnBcP<u8VbGGOSaRvz{3)jOh$1H<26*x+JkRr19S
zzqWQL1_#<)d5Qr!46R*eaJ3cZ1-O()tgSZXVf_tZQ?j?G`S5@*c+&0XgYZ)a2YKBV
zR0W6H%q4nUkW@<C+lVwOxP|G`nRnw%X(ef7jWz?j@XOtN?&^bwYd=(xX;=o)S9-Qm
z5IP5+x9>qtKwV~1oSuZ>$R$oCw{&rU6KK%~mE`)<tW~kP`MQm%`2Kb>J#tVp>Hi0S
z&pL#yQ~`H8yO{)1w~s#P_E{3hfip9r<9N1nw?kW%OcwtRKXe^ON0b_o8Lo7j_6V6k
zX{8;}EKT*>{}?~~2g3Huv5+ERQH=CSaIeFb&Dj_~c5F*sz0mW#($%FNyYjf#W7j@a
zg}u$2&C0ZxAk|+NeA3HVN?4<-2p6Pigsa72Tn4Qki(c?ayw@)Z#70TT0uOu5`L*OZ
z%0TM6v^JAvW>bTP_rlAbN-gXLTuQO6aNU!yrQV0jmC*35r;t3FnS9^#k)B;%qc`2m
z(i}3`$ZndDa_mA<#2XrN2e@>-S^jaLia~BbL7S1#QmN%esbA*EyMj9r^&lo%q5<o|
zV*hZzU!evC2bQKx%rcs}Gl%T*bm$$NBVjAlPgp%<7qzEtdtD3)Yu1nH1~oQr*%(j2
z(-SsW7}51+FUAOzkJ+GcH2-+^VvORaXsb9_7-h3uNqH9Wr{KLYR~EZ8gm<c4Y8uaN
z-S)kJ+3~ALnJ4G=W6K{-Oe3TYQnxfn=~CMMGXb~G{)}FQ>2uae3q5ZH>j!x$BD%f2
zG$2OY5@#ay^k`|wGpXtP1~rXgOOo$Zv_496lstGp#d<VGfGbn5n%J}t>g5!eX83iN
z%^vb=Q<v(vIfM<~Gd{n{8N48bMM)w~)&LKp<$08aoNNiS+*)4}_%69LDoe^l^3CX<
z`pHRb6$4`UB)uRGy9M!t&l~pn{d^=8CeP9mjJSA{kW!gi!{&sNp8@J(d@`3wgh#Mt
zBZCvZu-JEMSP1jM2ziDkP=bpT*}8~^H)VdeH@1U17@x=ii}2RMdDH+m;&tc)I2?Da
z-BE3cSgNE$6cgh-amc3(306#%E9^?Vf%zDz7ustwm=+z%o1(iWzriog^NT3D7cI}|
zSJ6vodA@5ERj%wifDNZZgJRe%o$*Q$KH>`nNgajP;runZW_1^0afbeL=40_4vv2+j
DsGRYk

delta 2717
zcmb_eZ%kWN6wiHy^0-KO+_r1`%0^kY!rrK1MU0;|S<IqYhJuJ2e?ne)4_7HId9QOK
zG71y*o6KXzvJb}T2a|=7%}Ou|)e&Pdj7u=fVwT0kI5ELVf?14VAN0OgT1IJ?64#`8
z=bm%Vx##@uIluQlykNcdk@fO7o+qEf#bU1<3Pk$7emT^2oS0a$6XSe+VV__~6>ENQ
zE!c4pi{Y0hD->4NF_UC`Wf?i4t<sT_&!l8N_Fd&&w_OspV~)k#t+`Qy3;7I+-2D`?
z-}nsX4?C@rz~f?S{Px{5j0;sE-4a_p{3S{STsTsel5s;)=3@sNRv2c<2K!q*+T+yA
z9=v38VLinnh#s`U#b)<Ll?8rnY%$VZ`9y&FW-COSO0^{>&w$vdFE=_^;c`>uMwMj<
zUqRTCgso3hdIF(Wyg@M}lR~zH&u3?T`@VpRTvBwfrEB6&6D~|TsP-Q?Qp=JorbHP!
zE;=f+bN?oO$V<J<IeWoRFLrGeB?gbepUt(vHM*HaP6wDiD8Snmxg@~rncbX&3(eKp
zOuxS*ZS{D#-*PPHb6uHJN`i&|0OQdPbV$2iv<<Evwd`2r(y_gn!j>F@D@|(~haR>O
ze}S+wy$95YBFm9ZH6T5TR(L`0E3Hk^^Ih+St+m3fWB#0R&32!6TAyZqG{V<yPVI5K
z%?Y10Y|lH3up3rd?J(Zv*=*ihg{^5=b*g=0mrP1nvrvQ!*9f2r;Rw{XR~&Fs7P4WI
z92F^`ivFN1d3!ZVs-u*Y&8Q=#^OK<#yI{H92G`s1=3{E$Zo6x<`U!A#?BddsinVln
zYO;(O(yt*p1*Jhgqak)6=w*-qy&-;cxbvYh#EcmLowf*L2J$$qhr>mR+|}O|)TpG_
zzIIlE7WMIuPR0HXe~b+$uno8Yn}<|Wh$x%9CWoYi&(BPv`1QfO{yDTq`SMJL)ObV@
zm<D$5&N-STQ#80bVu5o5w%o(GGKEPcHHgb$Y=GYzlES@e?v-ZG%|5_YOG+TrvxR6C
z4^8ncggx{k?6707<WZIV1}@V=3f<wb^na`VXYd0?zgxa0B%h?i)+Z}lC_W>UF~iUp
zg87jmpm@S$v>^AwGsXks@SW%V>#x$2q8gDq{i50<M~IE~w;7vsoj0NLs@nMPqvMjv
zus-_e6dW0G81}Jbyy7-8GZPFfH1m0y=K~67Y<^^T4}TG1&VM2h)Tc<4Bt=$LvWw*e
z7c^WdFYr;hl*;d|$%M+KlL@^!AtPVx{={D<W*EWpSG>bV6Sv?JN$w8#l|V2kM#73t
zTv`%5@zM0NnVslO2+ufdH8cdl#oYl#KHe`WVknXdU?(*+KxU&8mS#qg1bwr6&<!|0
zE7WBB^h!<|si(m(Hp;IDA{1TSm7!l|<#C^ba!{u4HcEQ0#$6hH(PNnC)amK?^mH6e
z)S=aJ=^lC(txjLMhuqiD{_%xb#_Sg836J4|zVJy|gW)VnXVJG~?-=6@{Trr@@w{{I
F{|C{+Kd}G+

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index df0b8fc050..68369da23a 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3000,14 +3000,14 @@ cont {
     scale: 18
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
   }
   element {
     scale: 19
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -3016,7 +3016,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -3026,7 +3026,7 @@ cont {
     scale: 17
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3035,14 +3035,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3051,14 +3051,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3067,7 +3067,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -5849,7 +5849,7 @@ cont {
     scale: 18
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5859,14 +5859,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5876,7 +5876,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -5999,7 +5999,7 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6008,14 +6008,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6024,14 +6024,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6040,7 +6040,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -6263,7 +6263,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6275,7 +6275,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6287,7 +6287,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6297,7 +6297,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6308,7 +6308,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6318,7 +6318,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6339,7 +6339,7 @@ cont {
     }
     symbol {
       name: "parking_pay-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6351,7 +6351,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6363,7 +6363,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6373,7 +6373,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6384,7 +6384,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6394,7 +6394,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6404,32 +6404,36 @@ cont {
     scale: 15
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6438,17 +6442,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6457,7 +6462,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6478,7 +6483,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6490,7 +6495,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6502,7 +6507,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6512,7 +6517,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6523,7 +6528,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6533,7 +6538,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6554,7 +6559,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 100
       min_distance: 5
     }
   }
@@ -6566,7 +6571,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
   }
@@ -6578,7 +6583,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6588,7 +6593,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6599,7 +6604,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6609,7 +6614,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6630,7 +6635,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6642,7 +6647,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6654,7 +6659,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6664,7 +6669,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6675,7 +6680,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6685,7 +6690,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6706,7 +6711,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 250
       min_distance: 5
     }
   }
@@ -6718,7 +6723,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
   }
@@ -6730,7 +6735,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6740,7 +6745,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
   element {
@@ -6751,7 +6756,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6761,7 +6766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
 }
@@ -6796,7 +6801,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6805,7 +6810,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6816,7 +6821,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6825,7 +6830,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6835,32 +6840,36 @@ cont {
     scale: 15
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 15921852
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6869,17 +6878,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 15921852
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6888,7 +6898,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6909,7 +6919,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 300
       min_distance: 5
     }
   }
@@ -6921,7 +6931,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
   }
@@ -6933,7 +6943,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6943,7 +6953,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
   element {
@@ -6954,7 +6964,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6964,7 +6974,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
 }
@@ -6974,21 +6984,21 @@ cont {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -6997,7 +7007,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7007,21 +7017,21 @@ cont {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -7030,7 +7040,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7044,6 +7054,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7053,14 +7064,14 @@ cont {
     scale: 18
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
     caption {
       primary {
@@ -7069,7 +7080,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9960
     }
   }
 }
@@ -7083,6 +7094,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7096,6 +7108,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7109,6 +7122,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -8250,7 +8264,7 @@ cont {
     scale: 18
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8259,14 +8273,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
   element {
     scale: 19
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8275,7 +8289,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -8479,6 +8493,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
+      priority: 450
     }
   }
 }
@@ -8554,21 +8569,21 @@ cont {
     scale: 17
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 18
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 19
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8577,7 +8592,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -9446,7 +9461,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9455,14 +9470,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9471,7 +9486,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9481,7 +9496,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9490,14 +9505,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9506,7 +9521,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9516,7 +9531,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9525,14 +9540,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9541,7 +9556,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9551,7 +9566,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9560,14 +9575,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9576,7 +9591,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9586,7 +9601,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9595,14 +9610,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9611,7 +9626,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9621,7 +9636,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9630,14 +9645,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9646,7 +9661,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9656,7 +9671,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9665,14 +9680,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9681,7 +9696,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9726,7 +9741,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9735,14 +9750,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9751,7 +9766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9863,7 +9878,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9872,14 +9887,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9888,7 +9903,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9965,14 +9980,14 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -9981,7 +9996,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -9991,7 +10006,7 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10000,14 +10015,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10016,7 +10031,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -13269,7 +13284,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13285,7 +13300,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13301,7 +13316,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13317,7 +13332,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
 }
@@ -14569,7 +14584,7 @@ cont {
     scale: 18
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14578,14 +14593,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14594,7 +14609,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -14604,7 +14619,7 @@ cont {
     scale: 18
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14613,14 +14628,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
   element {
     scale: 19
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14629,7 +14644,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -14663,7 +14678,7 @@ cont {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 50
     }
     caption {
       primary {
@@ -14679,7 +14694,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9950
     }
   }
 }
@@ -14689,7 +14704,7 @@ cont {
     scale: 18
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14699,14 +14714,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14722,7 +14737,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -14732,7 +14747,7 @@ cont {
     scale: 18
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14742,14 +14757,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
   element {
     scale: 19
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14765,7 +14780,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
 }
@@ -40298,7 +40313,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -40322,7 +40337,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -56115,7 +56130,7 @@ cont {
     scale: 19
     symbol {
       name: "power-m"
-      priority: 150
+      priority: 20
     }
     caption {
       primary {
@@ -56124,7 +56139,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9850
+      priority: -9980
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index a61e73be554b66dd038f8a44f7c0c18a008b0fcd..1dcca9a747148b71ce06ebb8fc47903f568f9d0e 100644
GIT binary patch
delta 3056
zcmcImZ)h8380Woq>-CLk(@WA`6Wb=~|IDzZxT+sk1{(<LRMP)TtM!t*c1My+xyx2t
z+u2U3=%6A`XLS4E@Pk6FuG`7hZtWO~5J8xN`=<DBAXHH%4j~NYdr6yy?5Y)(e7U^O
z^LyXl^LyUsdG5ZSvwm{gx_G@||C89rMFdHVjd=os6g<ipX~tEIccd0<HPc9&vzBfa
z8)$60Ie(LCLXRVM_99S?ZI&d;b*!n-)#%c9yuO7)z25j!EsNb%*tE{!KrIEbFhq!w
z7vM^}-HP2dY|J=QAtW!TYwcH%KGo7w_4<z6TR2qr(|=Rc0tJ6`*K3c`?)t(7%7Nj>
zX*>9PT<L{(#SS-ooiy?6V4CSNxaV^gMp%M>rlWZiAMa?$;L*?UT?Y&2yR7h4ueG6;
zF0+-=XD>~#bGPrMf5=sWi$^#)Buc{`g?$S#`@qy?c_`Z&|8<F~qKLz%<EVyHoqgMh
zow|zvy1b|kzV0<Y;VR9h<%yy?z2LG?5tesgrcI0Pkz8}C5Dc3Y^3BB!d1M2LI-4zZ
z&ixzURCi!IGT>}a50ylzt0E6_Rpm+Kz_|yKQuOuga_GA@g2T7qT(2J;)HES0nEEVL
zeC|P6QVwcT{u_ta;I+P*JYRa-k=|`(>wy0;En5?Q`_3d{_R?mU@>l40N5bEJKlG4Z
zmuK?l#@3BFvR=c3$_N(}m@?YzHsa#U)L@&i45#~@oi;LP$}zK1@w}*Tfv~`PB5V`$
zD49B2_)@o$HG<yG6d2wMhJjj(4q*%IA8_b7T0tJD(+N?1f8c`>OCmkivZ{GW1ukUM
zb*OKIJQVW4YQ$z{h-T8Zo0>l@P=AR$jMxNXEJU^m8)P9k77S~x9wAmZCt0WjihsL^
z?CRm@JGel>6~IkaJjd)Jc#^;4g2boMO<QMxfX&+m;}h6LDA=K(ILygHEG8&<BpZhx
z#+}dRPt1$BMiUbZMkPKP$+r@lz{{c($|uc9gc~$PaD1Y)KYw|90R|`S-O(uj;O`!~
zCg%#)i%gV+Q8Euk1Ua8M`yAm$EobVhCqf8mC1(TURFUt2rw@jwZUvvmmW`1&$|*5n
zFu*AxA;y%Gj%9F3%H~Pi$ot&F>><smW6y2pS2hRQ1T0Qh_V3X-FTz&mzMf_?`*fLf
zcc={~XPViM5jF*miQ&|M;dova6osj$P2fE5q{+ytr_0<<`0c}*ov8%_;g6i@zh><(
z8C+`L!k;DRB{+Q5HtZ$gnsF&F42c0*42QW`R3=02-{SR>%>2JCcpPqAtvs@uaFt=>
zkSGgB$9S2OVuZ<(o0-jwGP?=Wb~eC)m08pRzppl<_u%ddIdQAc(zewKgf$>VzEP)F
zTPo*~F7%8FU#>c+d6dGQQD3gScDeEz`l1yl(4j(!R1#y0dl6-hPyL1Hc+nl?LW#@n
wJLuidTK8eoNOV+?J<73w660cGR3e|9W|sjMrR}<+XO^j%<$_Dgg@bSY1IgL>u>b%7

delta 2991
zcmcImT}&KR6wV#~hKnrQVc8vap#|CsY+Z#_s=jDx(i%frg(9@O;5xf|feE`abY>8-
z&@TS=!3XH6=|dmXzL-?fv@D1<-BPJB`cRV^T9ZEblNe(9Vq((7)EK-o!|o!x1RmT?
zHgo2jd%kn-Irn~ZW<RX>`E14I8;|aN5tj;4B8l3lCrG5w0B2#jI*bd97k--I8rbr+
z?`|HKuo$j%RzPum3v-D(*J@*2;IFSt$x|uW8ULpK-cA&TPueQHOEW9x4{?uEObf<D
z(iA}o5s%7;-A-J}V(XoYcbFQ~fSy78(oFpKwl7f%cHvM}O8zS)JL64<|6rK=4ybM4
ztv^~jcjNnx8f+w50*U>V5b<rdr&UG_Bf`D!;Oq9DLTW1D8UguiP}WhFALS{^p^nCl
zTt4V{;#79D<o@t9!nR~phXiF%l=?jpK_VQ>mO1m;^Pi7V$+{}>>^4)PB`Hp>R{2|2
z&dYMyEeFlbrFW88Ova{8<=LGwePI5GuxaILH`!~9fp0sT&ve%@%T}WY^g(-IU$!QD
zkWTaNA_RPUHZom%CAeue8#U!-S76KWYqF=7tRP;7+uc5N0NOij$PTSXZQGZv>x*|c
zUGM`i*}av8I1XPN-Er!FIs)qx+Ug0guqEk!Bo^WPvDda-xQ!b3v2P#qLm`~-yY$D3
z&jnM5tKn(?{!A@ufZKkaD`U&uCAfI?!Z#qS!9V`m0vF{T2Rz?X!BXOBp(K%fF?MUP
z4tf%f_w2M~05suhSn=E8Mh}~5d<xg<#;Rc{Oq6~_rq7HN;#}{i7TaXr`ohNM;MSls
zt0DgPpoiJx#*Wlo9}Y&uP#`GFgCRjBnK8PgD#T3Y!GvUUPv#jsXvHN835|v#I!Q$N
z)dWl?G*~J&7oU+Y;Jjh%fUm|K0{0lL5~YgQi4-<{eqzk}q#OJFZ1ObI)jHR1aW#%1
zTt}nu10k_rP>7}xHK*~$;N_UJFC_Q%5t7qD<9LU@FZksI+ndV*8XJP%v7($tc?TB8
z+&PW#CM=A*x@9?>i>|=z_}TpAQF~P)BkGVaM3kHywfMrxNrd#a)E>z}<6$xO+e^Xp
z=YB*`H4+F4>LAfL2feA~*kb5BrjE`!l-ru=rOakX^PKl2wkK)D#0-n-kgN(3>YRxh
zrKoVc-Nk1^HjG!gT=Dnb8gF!7MA#Y}79$3E2;s0oRF&JsTHQ6U@6wJUFO|1Zd16)O
zsQl|^roP;ikvATn{?pPjfv|%_DWlTCanutgePU1%BN0K96@7N8v*EJ;C@H;}Sys{^
zWdkcsvv~~L)3AM_LIMM$VLB;lToXm*aH+0aRi!W;O%yYmjUvK@Ywyx2bUM+9mY^fy
zHYZZ&nu)ZPI%8Z&-Vil?8r7FFOEd6e!mHCY9bb3F=2Dc}W@aB1L@BUlhNTO2H~PV-
zS*U#b^!54E*U{y@=;66%AE1Ni;e6}?`silebJ#j0j}XP94hL0D&_r3{+!XK;Tx9B_
V@WQd`_j|80^q)81do{m%>R)jG;5YyP

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 8e2ecdca65..ba3163cb6f 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -3000,14 +3000,14 @@ cont {
     scale: 18
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
   }
   element {
     scale: 19
     symbol {
       name: "bench"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -3016,7 +3016,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -3026,7 +3026,7 @@ cont {
     scale: 17
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3035,14 +3035,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3051,14 +3051,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "bicycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -3067,7 +3067,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -5849,7 +5849,7 @@ cont {
     scale: 18
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5859,14 +5859,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -5876,7 +5876,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -5999,7 +5999,7 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6008,14 +6008,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6024,14 +6024,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2350
+      priority: 250
     }
     caption {
       primary {
@@ -6040,7 +6040,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7650
+      priority: -9750
     }
   }
 }
@@ -6263,7 +6263,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6275,7 +6275,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6287,7 +6287,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6297,7 +6297,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6308,7 +6308,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6318,7 +6318,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6339,7 +6339,7 @@ cont {
     }
     symbol {
       name: "parking_pay-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6351,7 +6351,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6363,7 +6363,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6373,7 +6373,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6384,7 +6384,7 @@ cont {
     }
     symbol {
       name: "parking_pay-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6394,7 +6394,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6404,32 +6404,36 @@ cont {
     scale: 15
     area {
       color: 2038555
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6438,17 +6442,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6457,7 +6462,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6478,7 +6483,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6490,7 +6495,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6502,7 +6507,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6512,7 +6517,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6523,7 +6528,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6533,7 +6538,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6554,7 +6559,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 100
       min_distance: 5
     }
   }
@@ -6566,7 +6571,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
   }
@@ -6578,7 +6583,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6588,7 +6593,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6599,7 +6604,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 100
       min_distance: 10
     }
     caption {
@@ -6609,7 +6614,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6630,7 +6635,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 3050
+      priority: 300
       min_distance: 5
     }
   }
@@ -6642,7 +6647,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
   }
@@ -6654,7 +6659,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6664,7 +6669,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
   element {
@@ -6675,7 +6680,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 3050
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6685,7 +6690,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -6950
+      priority: -9700
     }
   }
 }
@@ -6706,7 +6711,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 250
       min_distance: 5
     }
   }
@@ -6718,7 +6723,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
   }
@@ -6730,7 +6735,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6740,7 +6745,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
   element {
@@ -6751,7 +6756,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 250
       min_distance: 10
     }
     caption {
@@ -6761,7 +6766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9750
     }
   }
 }
@@ -6796,7 +6801,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6805,7 +6810,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
   element {
@@ -6816,7 +6821,7 @@ cont {
     }
     symbol {
       name: "parking_private-m"
-      priority: 2150
+      priority: 100
     }
     caption {
       primary {
@@ -6825,7 +6830,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9900
     }
   }
 }
@@ -6835,32 +6840,36 @@ cont {
     scale: 15
     area {
       color: 2038555
+      priority: -1900
     }
   }
   element {
     scale: 16
     area {
       color: 2038555
+      priority: -1900
     }
   }
   element {
     scale: 17
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
   }
   element {
     scale: 18
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6869,17 +6878,18 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
   element {
     scale: 19
     area {
       color: 2038555
+      priority: -1900
     }
     symbol {
       name: "parking-s"
-      priority: 2125
+      priority: 150
     }
     caption {
       primary {
@@ -6888,7 +6898,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7875
+      priority: -9850
     }
   }
 }
@@ -6909,7 +6919,7 @@ cont {
     }
     symbol {
       name: "parking-s"
-      priority: 2150
+      priority: 300
       min_distance: 5
     }
   }
@@ -6921,7 +6931,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
   }
@@ -6933,7 +6943,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6943,7 +6953,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
   element {
@@ -6954,7 +6964,7 @@ cont {
     }
     symbol {
       name: "parking-m"
-      priority: 2150
+      priority: 300
       min_distance: 10
     }
     caption {
@@ -6964,7 +6974,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -7850
+      priority: -9700
     }
   }
 }
@@ -6974,21 +6984,21 @@ cont {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -6997,7 +7007,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7007,21 +7017,21 @@ cont {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 850
+      priority: 250
     }
     caption {
       primary {
@@ -7030,7 +7040,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9150
+      priority: -9750
     }
   }
 }
@@ -7044,6 +7054,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7053,14 +7064,14 @@ cont {
     scale: 18
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking-disabled-m"
-      priority: 300
+      priority: 40
     }
     caption {
       primary {
@@ -7069,7 +7080,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9960
     }
   }
 }
@@ -7083,6 +7094,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7096,6 +7108,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -7109,6 +7122,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 40
     }
   }
 }
@@ -8250,7 +8264,7 @@ cont {
     scale: 18
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8259,14 +8273,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
   element {
     scale: 19
     symbol {
       name: "postbox-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8275,7 +8289,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -8479,6 +8493,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
+      priority: 450
     }
   }
 }
@@ -8554,21 +8569,21 @@ cont {
     scale: 17
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 18
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
   }
   element {
     scale: 19
     symbol {
       name: "recycling-m"
-      priority: 400
+      priority: 200
     }
     caption {
       primary {
@@ -8577,7 +8592,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9600
+      priority: -9800
     }
   }
 }
@@ -9446,7 +9461,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9455,14 +9470,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9471,7 +9486,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9481,7 +9496,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9490,14 +9505,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9506,7 +9521,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9516,7 +9531,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9525,14 +9540,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9541,7 +9556,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9551,7 +9566,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9560,14 +9575,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9576,7 +9591,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9586,7 +9601,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9595,14 +9610,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9611,7 +9626,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9621,7 +9636,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9630,14 +9645,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9646,7 +9661,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9656,7 +9671,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9665,14 +9680,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9681,7 +9696,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9726,7 +9741,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9735,14 +9750,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9751,7 +9766,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9863,7 +9878,7 @@ cont {
     scale: 18
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9872,14 +9887,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-m"
-      priority: 350
+      priority: 40
     }
     caption {
       primary {
@@ -9888,7 +9903,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9650
+      priority: -9960
     }
   }
 }
@@ -9965,14 +9980,14 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-s"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -9981,7 +9996,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -9991,7 +10006,7 @@ cont {
     scale: 18
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10000,14 +10015,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "waste-basket-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -10016,7 +10031,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -13269,7 +13284,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13285,7 +13300,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13301,7 +13316,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
   element {
@@ -13317,7 +13332,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 200
     }
   }
 }
@@ -14569,7 +14584,7 @@ cont {
     scale: 18
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14578,14 +14593,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
   element {
     scale: 19
     symbol {
       name: "defibrillator-m"
-      priority: 300
+      priority: 30
     }
     caption {
       primary {
@@ -14594,7 +14609,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9970
     }
   }
 }
@@ -14604,7 +14619,7 @@ cont {
     scale: 18
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14613,14 +14628,14 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
   element {
     scale: 19
     symbol {
       name: "firehydrant-m"
-      priority: 300
+      priority: 20
     }
     caption {
       primary {
@@ -14629,7 +14644,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9700
+      priority: -9980
     }
   }
 }
@@ -14663,7 +14678,7 @@ cont {
     scale: 19
     symbol {
       name: "entrance-s"
-      priority: 100
+      priority: 50
     }
     caption {
       primary {
@@ -14679,7 +14694,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9950
     }
   }
 }
@@ -14689,7 +14704,7 @@ cont {
     scale: 18
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14699,14 +14714,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
   element {
     scale: 19
     symbol {
       name: "exit-s"
-      priority: 100
+      priority: 10
     }
     caption {
       primary {
@@ -14722,7 +14737,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9900
+      priority: -9990
     }
   }
 }
@@ -14732,7 +14747,7 @@ cont {
     scale: 18
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14742,14 +14757,14 @@ cont {
         text: "ref"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
   element {
     scale: 19
     symbol {
       name: "main_entrance-s"
-      priority: 400
+      priority: 170
     }
     caption {
       primary {
@@ -14765,7 +14780,7 @@ cont {
         text: "addr:flats"
         is_optional: true
       }
-      priority: -9600
+      priority: -9830
     }
   }
 }
@@ -40441,7 +40456,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -40465,7 +40480,7 @@ cont {
         color: 5592405
         offset_y: 1
       }
-      priority: 250
+      priority: 200
     }
     apply_if: "name"
   }
@@ -56201,7 +56216,7 @@ cont {
     scale: 19
     symbol {
       name: "power-m"
-      priority: 150
+      priority: 20
     }
     caption {
       primary {
@@ -56210,7 +56225,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9850
+      priority: -9980
     }
   }
 }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index c60492560f94b0db6e7332ea1cc7af18443178b4..ed035791388d375920db1f7f2ad4b9df26a2d40a 100644
GIT binary patch
delta 242
zcmX?im;b~){tXslY>$M6WI2Q;%Zo`un8F|?<D<>xViC-YyCz?dl$g9xUWZX_@<S;F
zj$(-$!V3ICYLg3P6u7_~E+I7z;mL+Fa?C*P=0K?|HpYXK_bAAdpvgtCo00L+<O@nN
zK=Lh^<WiPlc_hp=bF!AQI<qu~z+`@9aZDvlkAyexQ1;Sgl$*>Ps0t)C16Kjb{XsU2
Va?OH4?Ses!K+LpVFo=2Y901*(N2dS)

delta 444
zcmX?ckN@0V{tXslY<Go)WI2Q;%Zo`un8F|?<K4~WViC-Y&66)kO4M_5@Jq3BoO^nj
zU5JxI0LGN&5Ck$0{rt?XB*4X4kXV$RnU}6xEOA#@fnP|PLkO277f@0drzF=oCN7!8
z+|<0xl1g2Op_}JPg|O9kF>*<xiUTbxDN0Q(i7(DfNd>x$rjF!7_;2$j#coE%yOZsd
zWq@R~vJ5ETfPR{spe)XESD34J@(g8lRtXLPC6UPwl||TuBsc^SOd$kQ7{X-bYGvdS
togAPly4gp?K$p>Ia&4e0kX#(NYO+PJeREGxdruG}5HoG>31Z$e2LQ<Hf=vJb

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index dada95410e..f97f8aaca3 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -1709,21 +1709,21 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
 }
@@ -1982,22 +1982,25 @@ cont {
     scale: 15
     area {
       color: 15921870
+      priority: -1840
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
+      priority: -1840
     }
   }
   element {
     scale: 17
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 15
     }
   }
@@ -2005,10 +2008,11 @@ cont {
     scale: 18
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2016,10 +2020,11 @@ cont {
     scale: 19
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2506,22 +2511,25 @@ cont {
     scale: 15
     area {
       color: 15921870
+      priority: -1840
     }
   }
   element {
     scale: 16
     area {
       color: 15921870
+      priority: -1840
     }
   }
   element {
     scale: 17
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 15
     }
   }
@@ -2529,10 +2537,11 @@ cont {
     scale: 18
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2540,10 +2549,11 @@ cont {
     scale: 19
     area {
       color: 16579778
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2653,28 +2663,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
 }
@@ -2684,24 +2694,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
 }
@@ -6047,7 +6061,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 30
     }
   }
   element {
@@ -6063,7 +6077,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 30
     }
   }
 }
@@ -6118,7 +6132,7 @@ cont {
         color: 6381914
         text: "addr:housenumber"
       }
-      priority: 50
+      priority: 30
     }
   }
   element {
@@ -6137,7 +6151,7 @@ cont {
         color: 6381914
         text: "addr:housenumber"
       }
-      priority: 50
+      priority: 30
     }
   }
 }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 85ebc8c67f664ff324e7dafbbc455f4ecc1286f1..4a15ce066f94343a858c9d2ad9727589fd28ad84 100644
GIT binary patch
delta 320
zcmdmUlYjdy{tbL$jE^Ssi^%~=JrKFsSIm!Dd@CcDNMdekUS>(9Zb4#Ec4l6>Zcbv}
z<V1NLW>pTs$%Znr9K{khgcbOOR441p$U`_>Ku&>-JTp*cv$#|s8{?kInF{igljXID
z)bvK7jZyBAu#hx|pprP35Y*=Q)Vz|S#JuEG-CT)BlP4(20NuJ)NrvT-FxSk<XO+|~
zq&Wm|DJRk_rboh?qm@;38RaH71gHYZWdX~W<%FyzD+J3-&JL7ilxyw`Z0`(Y1Y)M`
Joq^28vjH;;Vh{iT

delta 445
zcmdmfi+|5e{tbL$jCUvVi^%~=JrKFsSIm!@v2OBQN%0g84t^;Xj?PsnLL3|dP?i*j
zAduCysYXeFi?blHC_6JRUAI``uCM~XkQ9dy4mmEMoG@0o&Hhq>Y>cgw7b?ip$G&LA
zHb$Ul>y%}H<bNd)DWfdIa#xtEce0JLdc6dPfRYH85Y%h&sd*(uiFwJXy17CU9D+Dy
zgmB6TW0&D-VB``_%uUV9EUDCmSyo(-xcQwjk1nIp<lh0RKvFSq+2plBcFn9o?W{qJ
NK+LqAHHg`0HURr{fmQ$j

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index b803f4b2dd..615981f1c4 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -1709,21 +1709,21 @@ cont {
     scale: 17
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "motorcycle-parking-m"
-      priority: 2525
+      priority: 2530
     }
   }
 }
@@ -1982,22 +1982,25 @@ cont {
     scale: 15
     area {
       color: 1643785
+      priority: -1840
     }
   }
   element {
     scale: 16
     area {
       color: 1643785
+      priority: -1840
     }
   }
   element {
     scale: 17
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 15
     }
   }
@@ -2005,10 +2008,11 @@ cont {
     scale: 18
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2016,10 +2020,11 @@ cont {
     scale: 19
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2506,22 +2511,25 @@ cont {
     scale: 15
     area {
       color: 1643785
+      priority: -1840
     }
   }
   element {
     scale: 16
     area {
       color: 1643785
+      priority: -1840
     }
   }
   element {
     scale: 17
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 15
     }
   }
@@ -2529,10 +2537,11 @@ cont {
     scale: 18
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2540,10 +2549,11 @@ cont {
     scale: 19
     area {
       color: 2038026
+      priority: -1840
     }
     symbol {
       name: "parking-s"
-      priority: 2525
+      priority: 2520
       min_distance: 10
     }
   }
@@ -2653,28 +2663,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
-      priority: 2525
+      priority: 2530
     }
   }
 }
@@ -2684,24 +2694,28 @@ cont {
     scale: 16
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 17
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 18
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
   element {
     scale: 19
     symbol {
       name: "parking_entrance-m"
+      priority: 2530
     }
   }
 }
@@ -6047,7 +6061,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 30
     }
   }
   element {
@@ -6063,7 +6077,7 @@ cont {
         offset_y: 1
         text: "int_name"
       }
-      priority: 50
+      priority: 30
     }
   }
 }
@@ -6118,7 +6132,7 @@ cont {
         color: 7566195
         text: "addr:housenumber"
       }
-      priority: 50
+      priority: 30
     }
   }
   element {
@@ -6137,7 +6151,7 @@ cont {
         color: 7566195
         text: "addr:housenumber"
       }
-      priority: 50
+      priority: 30
     }
   }
 }