From 1d6c31d7884e59172d8853e77cca13e4d53b3922 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Tue, 22 Nov 2016 14:45:46 +0300
Subject: [PATCH] [styles] Rebuilt styles for forest fix

---
 data/drules_proto.bin       | Bin 247456 -> 246873 bytes
 data/drules_proto.txt       | 156 ++++--------------------------------
 data/drules_proto_clear.bin | Bin 210837 -> 210254 bytes
 data/drules_proto_clear.txt | 156 ++++--------------------------------
 data/drules_proto_dark.bin  | Bin 208214 -> 207631 bytes
 data/drules_proto_dark.txt  | 156 ++++--------------------------------
 6 files changed, 42 insertions(+), 426 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index c5b09ee92a07ea5e6c2dcc01bee68832235333ea..52c15e4d5223863bd12ccb716cd316d2f201619c 100644
GIT binary patch
delta 605
zcmaKmPfG$p7>5~Wt97t;-4Rj(TX#1*n1U1pBGN52v+bI;1Z7!R9V$8{K|yus(%T2{
z)KS8S?tK6+LeQl@hr09yx&*ztTOFbf!!tAQ^ZW7EPNn-}>GF0`ICL>TJm>xJFd3&Y
zQ3fL&r6ZyjmeUcW;*i5@IwHIf7D71yu}qwXQQpoBQ3K_AMn@_RIRvx1@J5){k*(|~
z9Y*;g8>T}jKW7c3;*cZtF4iI}*s;&2A|73oHHr0<S2vb+U_TR}A&gDrRHWjNBL^wF
zC-9gbfJQFbYhXxb;#z5Ub*tP-X_y+B4p9wLHaSxLPTfsMacdd;c^w@un0ec^$?^T=
zraNA8#`d0OR6%K%Iv0+Ykjq&mXxgO<rY$#3yVNF!rm0>Tvn@BdhWEKMni3`O7Pwbo
z?#0bYrL<CtuFJ%KvImVqog|@F^ub5L(_O(Ym4Q?Yz(;Z5??D1C=Y6u)_fywSLTY}D
j{5_%xk+-*ye#iQuYK;rZKf*!PI;vU(kL#vtQLX$5Ze6MM

delta 1309
zcmccF!M~uFf5RbnmNQIT5|a&mB_`i<HxzZ?5Rek!`0?>EyTsbg{}8}9S;#|I)Q&?C
zi%fxsHc&<gr;IRG87)?>wM<-!KwBjzKl3mYwZLktl&7kw8CF~SJe9<R%&=MumBMCk
zpQkd*W+pBru(jtrjYTc7TFc_4CTfn=T3s&{pbR$8LS(R6s_Ui9%r%>7@<J~+QB$n;
zz4B5LHO6WmzqbNV2Ah2l8Ep3Pd&@I(Eo7Rk?<+ldlDDqB88$nW1h_b|Qp+=oGbRgq
zNs5|awcWr+K}^U5tMyPRZ1x-YC^A8<&-2j*#viuyG|xvFhowBeI4y-rVY8IS7iy^o
z4hyS%aap*)R}ttGY+($M!Dih8Uj=v=tNGyx<C4Vu%;FL}VZ6W(r|n=FthW0pY<}W*
znUitP<Q)-{H0(L}fq87#Nnnm`?Skc4C1Ebk<oukR)bv!{TmeRj))vOeg^}x2ZNV{(
zu2>MEI0vY7`b7aI;mP+RIVZ<QNt2;P%^Dn@=(g~q+QK+lAx3<1R<tbX%0Zz*gz0|j
ZLe?C_sBKn=X;+A01Y)M`3Ng%<8333xQx^aL

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 55b76f0005..872d5e451d 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -6056,10 +6056,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-m"
       priority: 16813
@@ -6076,10 +6072,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -6095,10 +6087,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -6114,10 +6102,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -6152,10 +6136,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-m"
       priority: 16813
@@ -6172,10 +6152,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -6191,10 +6167,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -6210,10 +6182,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -6248,10 +6216,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-m"
       priority: 16813
@@ -6268,10 +6232,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -6287,10 +6247,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -6306,10 +6262,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -6344,10 +6296,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-m"
       priority: 16813
@@ -6364,10 +6312,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -6383,10 +6327,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -6402,10 +6342,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -6440,10 +6376,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-m"
       priority: 16813
@@ -6460,10 +6392,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -6479,10 +6407,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -6498,10 +6422,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -6536,10 +6456,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-m"
       priority: 16813
@@ -6556,10 +6472,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6575,10 +6487,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6594,10 +6502,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6632,10 +6536,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-m"
       priority: 16813
@@ -6652,10 +6552,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6671,10 +6567,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6690,10 +6582,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6728,10 +6616,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-m"
       priority: 16813
@@ -6748,10 +6632,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6767,10 +6647,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6786,10 +6662,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -7833,12 +7705,12 @@ cont {
     scale: 15
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-m"
       apply_for_type: 1
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7900,11 +7772,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7929,11 +7801,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7958,11 +7830,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7986,11 +7858,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -8014,11 +7886,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -8054,11 +7926,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 1aecd21c5a3699b26704b4757882b851d0ad4673..b3a17a40606429d77d4424fcc23032a30d7a1ec6 100644
GIT binary patch
delta 618
zcmbRGp6A>vo(-oQSz4I5BqlF(lbHO>(U4h>LtwIwlP<Fkhv4KqCv6}t1f_*1zjM-N
zdCJJ82vjUN+05CHSq-ST##xnF1*rI)voeqtg3>_6&PuFYuNk?Nz^c<+jG5Jes@J)w
zF{=VqN4qMs2&n><Lm9$Ah6>YV#>tJYZp_L+g?C()m=%EvYu)5ogcN}ap$uUlLxJfg
z<K+2n9zgp9CjW6$W>x|!T;Q(2BBTUV2xSNZ8Hx~v(v$DG>w*<4ct8~Qc_;!k2~CF3
z!a!PqnG0;F^kgPaU0$HUN&;LQ#Tl7-CHa#boFu_k)ObR4L1^L0HJ%7vYF-c<GQ6P9
z@q(yb0H%SC@lx2V<6Xke_<i!ipb&LC4t^;Cj$J1ovrBX~|AzoZB_S@(<oukR)bv!{
zTmeRj&f3Yc!Rwf9fWF%mB*&5i68IQwh9SUcHThtOh=39wLOWP(Y^eC;10k{mq*bjr
cgt52<(=dOcRr)n6gtaS#F>Y4~V=8?J0G8*x3IG5A

delta 1306
zcmX^2if8J3o(-oQS<WzVNlb2Zm6-g@(NNTZLqJM^<HyIx>=J7`|3d)dWGN?IQ9BMn
zEHYkB+CUj0oHD{#Wwcni)-rJ^0&SI?{LaZx(E^*TN<v&*Nu?<%8JWc;lQ+0Yike|{
zL4mU}PzIX|ATrooP~fb@%C(t^O9||PYtF`^me^b{na4#<)Euj=F)k`V8Em#fWU$#9
z<D$&UHJgb`4s7cY7i~FHY_=-#bFpV+=B1Q^J#CED`dC+aF(G5D_CuwxIUv?mfoUPr
z<a$>RV2ELh=TolAq9#}^{NSnxl)>g-hzvICKDa6{bAj!Xo?Papi^I-kZaD39!)Yg2
z2CJQJ2s?w^b>*@8Q%Qh}qZk;(CHdeW#^Gak1u-EUUWQ0vwclM462#Jz^*nHSInD!@
zm(O_Mv=l0Z#nR1ZJf^TS{+pZ_5Taqv!4J%FyG{c0Z)+DU|0)S{aVF>I<fNvj>gEbC
zO0>2xPQDYcPR$k^)#!=^5sGubO4kRPk)qTZoJ`P7<wrMlUyz9!NlHOJC&E<m$$G&S
XK$A&OZr*$|xcz1@<Mx}uOr;M2iX2}I

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index f0c7ac11a2..7b3d60a9d0 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5480,10 +5480,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-m"
       priority: 16813
@@ -5500,10 +5496,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5519,10 +5511,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5538,10 +5526,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5576,10 +5560,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-m"
       priority: 16813
@@ -5596,10 +5576,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5615,10 +5591,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5634,10 +5606,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5672,10 +5640,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-m"
       priority: 16813
@@ -5692,10 +5656,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5711,10 +5671,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5730,10 +5686,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5768,10 +5720,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-m"
       priority: 16813
@@ -5788,10 +5736,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5807,10 +5751,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5826,10 +5766,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5864,10 +5800,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-m"
       priority: 16813
@@ -5884,10 +5816,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5903,10 +5831,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5922,10 +5846,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5960,10 +5880,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-m"
       priority: 16813
@@ -5980,10 +5896,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -5999,10 +5911,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6018,10 +5926,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6056,10 +5960,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-m"
       priority: 16813
@@ -6076,10 +5976,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6095,10 +5991,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6114,10 +6006,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6152,10 +6040,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-m"
       priority: 16813
@@ -6172,10 +6056,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6191,10 +6071,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6210,10 +6086,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6969,12 +6841,12 @@ cont {
     scale: 15
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-m"
       apply_for_type: 1
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7036,11 +6908,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7065,11 +6937,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7094,11 +6966,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7122,11 +6994,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7150,11 +7022,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7190,11 +7062,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 48b3baa1e7319128fb064611d123a8354ac9c3f6..9daad6edcca71b18a4bf8bffaef87fadc26582b0 100644
GIT binary patch
delta 611
zcmaKmze@sP7{@tZtLw$O^IjxH$~#YOFas$FA_C3wax@Pbqm(qXkdmf`D2Rq=cxbH7
zp*4b_{*a<5XozTv=7NTLy7#K3nm+H3@8|nGSGS(sE6>S#%Dw5Ley|Kb?5C2XUzDMl
z^1*A$Px?eJMALDk;*h~nI_`cHsD?rSp3_MwCdy%j(%D9_SgtIuz<oAAA}H3zbfn^t
z!QGhdeiCTd7P~V8q!%ZZGBFaxu$74*6^9I|x6liL_SosE@wi9FF%oSnR~Cy6dxnPE
z`?yLp)HoS3MCgqG2SyO;6N!!pN-`A}N~@LSvTcRY(y|%}qs7UP>bJF*P2kotTxWI6
zctJ9FmXqQAD{I)fH-qO6CsnudS?U}Z9yFJ;%H1R{4dr-vC&x=U8SLcL(}&zjoA3hD
z`2ragC8+0_SE225OVw&=zLcoRf`5ArF7wA^1h=Z^ds?gbpi)Rq1t3%i{`EYJD`A(^
p`P20&!c1Y1{PQOaL(}yAVs(LK4!M*+zc(y%%QA&?%XFPxe*ifSsQ3T?

delta 1281
zcmeCb#&hi!&xS@vmNQIT5|cl;Nlc#WXejEyAs{8daini6lf>H2{}8}9`J$t)s2ztO
z78yn-ZJ>-0P8ngWGFq%$YniwdfwoFcUg~5hYJt_(n@*~tX4q|YRtCyowG}Lb)mCRE
zR<6xVTuNYDd!3C%EwS2q*jY`~9ILHwoK=7_*ldN!V6*j&vobT+Y^KQxE^eZxSnXTs
zq9kgJ)xM7|3P2fb_CaK@+4s>!o|$VQ)8uz<(vt&Sb%CLTEj}Avl|@ak+WFp9K}^U5
ztEEsWY_`64Rb+x%s_TZ!(pWcKmY#OQX(?0+o294Spq6^z@TH|YE(_z`6@mW87P1f-
zY}UoQE5Jkcsk^Q`){s>a;NmDr%+D+?nS8-n5=R)vd*HMkEQ8f{4~5N(JxbUa|4o(%
z2+^?T;0I=`$@^w7O0;&tvZ<0V7iV&QPEKlis&1|TP^N`(^5lSZYPR5*MprC|P@Dr+
zdN9z86s6YS@IyD1AKlb*LE@8pf@IZ5Rt^dUB24!OnoOipzvc<S?Gu6-w@(OWs=p2Z
DAM-p>

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 611a3e7271..172b44e8ab 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5480,10 +5480,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-m"
       priority: 16813
@@ -5500,10 +5496,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5519,10 +5511,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5538,10 +5526,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5576,10 +5560,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "buddhist-m"
       priority: 16813
@@ -5596,10 +5576,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5615,10 +5591,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5634,10 +5606,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5672,10 +5640,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "christian-m"
       priority: 16813
@@ -5692,10 +5656,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5711,10 +5671,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5730,10 +5686,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5768,10 +5720,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "hindu-m"
       priority: 16813
@@ -5788,10 +5736,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5807,10 +5751,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5826,10 +5766,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5864,10 +5800,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "jewish-m"
       priority: 16813
@@ -5884,10 +5816,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5903,10 +5831,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5922,10 +5846,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5960,10 +5880,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "muslim-m"
       priority: 16813
@@ -5980,10 +5896,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -5999,10 +5911,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6018,10 +5926,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6056,10 +5960,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "shinto-m"
       priority: 16813
@@ -6076,10 +5976,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6095,10 +5991,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6114,10 +6006,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6152,10 +6040,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "taoist-m"
       priority: 16813
@@ -6172,10 +6056,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6191,10 +6071,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6210,10 +6086,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6969,12 +6841,12 @@ cont {
     scale: 15
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-m"
       apply_for_type: 1
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7036,11 +6908,11 @@ cont {
     scale: 17
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7065,11 +6937,11 @@ cont {
     scale: 17
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7094,11 +6966,11 @@ cont {
     scale: 18
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7122,11 +6994,11 @@ cont {
     scale: 18
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7150,11 +7022,11 @@ cont {
     scale: 19
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7190,11 +7062,11 @@ cont {
     scale: 19
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {