From 6e053697207f70dde14211544a6b633debd13042 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Fri, 2 Feb 2024 08:49:09 +0200
Subject: [PATCH] [styles] Regenerate for towns

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin                | Bin 427398 -> 427190 bytes
 data/drules_proto.txt                | 125 ++++++++++++--------------
 data/drules_proto_clear.bin          | Bin 414875 -> 414667 bytes
 data/drules_proto_clear.txt          | 125 ++++++++++++--------------
 data/drules_proto_dark.bin           | Bin 413615 -> 413391 bytes
 data/drules_proto_dark.txt           | 125 ++++++++++++--------------
 data/drules_proto_outdoors_clear.bin | Bin 432008 -> 431800 bytes
 data/drules_proto_outdoors_clear.txt | 125 ++++++++++++--------------
 data/drules_proto_outdoors_dark.bin  | Bin 430633 -> 430409 bytes
 data/drules_proto_outdoors_dark.txt  | 125 ++++++++++++--------------
 data/drules_proto_vehicle_clear.bin  | Bin 279191 -> 278983 bytes
 data/drules_proto_vehicle_clear.txt  | 127 ++++++++++++---------------
 data/drules_proto_vehicle_dark.bin   | Bin 279395 -> 279171 bytes
 data/drules_proto_vehicle_dark.txt   | 127 ++++++++++++---------------
 14 files changed, 401 insertions(+), 478 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f17c09632b07325522fc0a2a06224b0b912385b1..05a8adbe5c4cd0202b02eba095fe5f66e02dc3d4 100644
GIT binary patch
delta 777
zcmZqcmfF@S)zHG&!nB3?ZaK@dGc%c|KP+b!kpZzJ{{R2KolWAKj*u7!zm^aeF9){(
zScPB(78QcXDjcz?5Jpx}2vh;KZ+mA2vke#1e3t3Qo0xMM)u)>_GpjQRsZY-Z(kw#i
z96Zwt+L)E=_m~T*a`0*?a`ABR32c6Lh7sgEb|F3v9t2N=Q39-tk2q!g#3>U1DXS-J
zs~~a42@$7E7*&}KF29PPs>7;m`nFc)a>4g3Li`+D@X&hCGTp9?S;7iK7#NCQOo0K<
zucZu(b42iBD4ae4sJ|XV7^Yv4kbam#Az~E@V^L^^;w6}oB3M+SC~S{yX9i-H?Xm5w
Gn*RV;Vi(T<

delta 602
zcmdniDb?03)zHG&!nB3?ZaK@5j)_duAC@zV$beW9|NsBr&L;6qM@Wo=UrUIKmxEgX
ztU|B?iwZ$x6^__c2qUW~1gZerx4pB1*@lbhJ?r%2P0YEBX46fZnbifocnk6iN^=rR
zGV}B7Yz>6WrpEz=CDDZ~Ie4^`fez!E-rvkDFXJVE&}Cy}00cso9J~Zo@DWtOPf&#b
zK^1}oRR|GOAxuz(2$BjR%<!20tcAIJ`iy2~k?Do4%%Wfx+ZR(Ibq@aNoz2Y3(+{JH
f3W7x;Duj^O!bofpFuQ$18#55IY@g7^s`d{6qzkXu

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index db7d0ba09e..d8ef0cbdc2 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -70725,7 +70725,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -70736,7 +70736,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -70747,7 +70747,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -70758,7 +70758,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -70769,7 +70769,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -70780,7 +70780,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -70791,7 +70791,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -70802,7 +70802,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -72118,7 +72118,6 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 11
@@ -72136,13 +72135,12 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 872415231
       }
@@ -72154,151 +72152,142 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 20
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
 }
 cont {
@@ -72343,12 +72332,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -72360,12 +72349,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -72377,12 +72366,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -72394,12 +72383,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -72411,12 +72400,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -72428,12 +72417,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -72445,12 +72434,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -72462,12 +72451,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 33f618ddba720fdf64d2218eeacca1992d0d8072..804218b65e2a27f15e0a56c07e835bf4c9a71dd6 100644
GIT binary patch
delta 815
zcmbQeQu6e2$%Yoj7N#xC2fXT^oteoj@&Et-?Q9a?bcDn>__Tz$csaNQ(8c+2hzsBl
z7sMehgetBJw^$fe0xm9sB)&bzo7skoX+F#JRiVtejOx=R!kE>Wgw&@80BIH>bq=2C
zjFHUB^?S^PR5^IH6uEdf_yjgTJHrU_A-fPC2M>a$!6*S%#z&koe&Un~fRxn}wpEZg
z<AjJ)CXA}g2A5w&P}N~oHhpFUbGhJq79oBPE_i6YXPK@T$t;nKAq)(~FQ&kN=hspO
sCL2WX;#4R=Na6H3K#Qz!>K7uY{~ccaB82p}J47)9G0S#`DAwp-0RDs^00000

delta 886
zcmX@TTypkG$%Yoj7N#xC2fXT!bWCKD`2YX^b~cG`IznO`d|E<Wyd2yD=;Hi1#07AO
z3*rzLLKWAATP%z!0T&lR65pQV&1}QP^qzJ4s!--!MziS>Va)1+Uc3eQ1*JKOC7Jno
zcD4pWX44&k!u9CFmK;1<%0Rzy32c6Lh7siF`OHH6C|nIji9P0C0tn-5j0}K4$dZGX
zWUcjZy?i9=g=^&}Uu(Sp`FaJ(*D3_lT2Fc)3&Zr1u2lp>s~T}}JN;xhbNTe@FlLeI
zArZ`?U>4gKQz3N@{^>bk%*qh90GK`fJgN#Ih^S&DiarsrXnS!aGZ3?EFOFo5_yquA
CvM8qj

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 763090777f..012d49dc96 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -67130,7 +67130,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -67141,7 +67141,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -67152,7 +67152,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -67163,7 +67163,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -67174,7 +67174,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -67185,7 +67185,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -67196,7 +67196,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -67207,7 +67207,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -68523,7 +68523,6 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 11
@@ -68541,13 +68540,12 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 872415231
       }
@@ -68559,151 +68557,142 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 20
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
 }
 cont {
@@ -68748,12 +68737,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -68765,12 +68754,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -68782,12 +68771,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -68799,12 +68788,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -68816,12 +68805,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -68833,12 +68822,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -68850,12 +68839,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -68867,12 +68856,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 719c53f7697b3829f71d644bb9ded1a7712364e7..c20fbfb75eddf3e00492ecd574c6905ebf9065c0 100644
GIT binary patch
delta 799
zcmZ2KU-JB1$%Yoj7N#xC5$^RfH$P*MXjpV)1DnJ*9U(CeJ}n_GUJh;nba8$h;sQ9t
z1#yTAp^EFmEfz+VfQySDiEn4|V1B^K)Xy^gSs-&Rqx$raAZB$YA@%7!K$=BJor7ok
z!%$}B`aR}C${f5}@?6{;d;;I!-DL*)&_#%sg9pyhV3YtW;v+^8KQW2~5Q^$?+b4)n
zg<FvjF^Yt7E7Doy0`s2;ZdFi4)31gwmkYjN5#s0If(6f!7cA3bLzyM4Foc2TelZ0G
zG{2TIFqy!^6Q}`Q|9ZUo1qteB3}co^#xNFUzc3;FFohz76t>rdF#|En_L?wO<DUTW
C<NI^~

delta 657
zcmX><S91M)$%Yoj7N#xC5$^TR&dg+%XjpV)1DnJ*9U(CeJ}n_GUJh;nba8$h;sQ9t
z1#yTAp^EFmEfz+VfQySDiEn4|V1B^K^qzJ4vq0utMziT5LCorcUc3eQ1*JKOC7Jno
zcD4pWX47kd!jkC1mK;1<%0RzyO<xzpEHC3FfY4=QWB>$0mK?kURqzp1!B0?y06`Uk
z1XTzTR3S`Ig$R-gA<XcY{xz7neERkvW|8R)A<Uv+7TXt7A$1P^=_`Vmm8V}q6%~Yt
ds)VAb6$Xn!^ofAk?ejyKftY3c{7_bdp8(W}xwilS

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 26bf2fb934..2397424333 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -67356,7 +67356,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -67367,7 +67367,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -67378,7 +67378,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -67389,7 +67389,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -67400,7 +67400,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -67411,7 +67411,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -67422,7 +67422,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -67433,7 +67433,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -68738,7 +68738,6 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 11
@@ -68756,13 +68755,12 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 10
+        height: 12
         color: 7829367
         stroke_color: 856756480
       }
@@ -68774,151 +68772,142 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 20
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
 }
 cont {
@@ -68963,12 +68952,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -68980,12 +68969,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -68997,12 +68986,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -69014,12 +69003,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -69031,12 +69020,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -69048,12 +69037,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -69065,12 +69054,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -69082,12 +69071,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index d95de931e0a0fca74ed664a113fbee5e108c33ae..68b9f60c176bd18f34e7e725531fc7abdb5bd9fd 100644
GIT binary patch
delta 838
zcmeBJFSTQ>R6`463)2>6iQ4*SXJ#@>{Qv)dJDbEe9U(CeJ}n_GUJh;nba8$h;sQ9t
z1#yTAp^EFmEfz+VfQySDiElqr%WT8NG@oTUQwMV{qx$rM4rX;GA@%7ifHaGcItR~m
z{~l)L`aR}CsvNvpid;M#d;*)FonZv|kX?w6g9pLWV3YtW<0DQPKXJ+gK+5U~+bT$$
zaYDo?6Gl~LgUhcXsOqpPoBpwjxxD^8ix58t7d*7yvjBtZizzUK`LvXQ=>rjtI2G~}
zt55)oLNly(3t~};qHwxw53__7PA3Ty)SnO3FNmSPeMS#65VHU=>-HHvY#+D)G4v{_

delta 663
zcmdn7R;pvYR6`463)2>6iQ4)j9TS-({{R2KolWAKj*u7!pOz38F9){(x;Q@$aRD6S
zf;hy5P{noO77L?Fz{N$7#J3-*WwzmBde1tYse?I}(QJA_2eZ1M7jHp+L1|86NoIbY
zovne8+4Pw}VM%mhOAa0_WuV`<rl0CymY4AoK<KhDG5`W0OAcOwD)<Ph;3ud;fS?LN
zf+~avst_iqLIg>L5N3ExSL|XgpMJT6S%mG2sgODc-}ECL%*qfpKN4F2i7g0bPY>v3
d7Ddu23=v%f6Ky};%?!jWK+L-RbT`{uE&wa1#y|i7

diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index 14e8c4481d..ab8d5ab53e 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -71506,7 +71506,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -71517,7 +71517,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -71528,7 +71528,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -71539,7 +71539,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -71550,7 +71550,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -71561,7 +71561,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -71572,7 +71572,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -71583,7 +71583,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 5750
@@ -72899,7 +72899,6 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 11
@@ -72917,13 +72916,12 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 872415231
       }
@@ -72935,151 +72933,142 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 20
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
 }
 cont {
@@ -73124,12 +73113,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -73141,12 +73130,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -73158,12 +73147,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -73175,12 +73164,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -73192,12 +73181,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -73209,12 +73198,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -73226,12 +73215,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
@@ -73243,12 +73232,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 6900
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index a48b40cedbdb23ec54de5e7bf45f40a7bfb0855f..df0e8e8a7775512c16a4fd0d239436019cb79b17 100644
GIT binary patch
delta 803
zcmZ3vMC#-ssfHHD7N#xCD=O<}Zhpoh(Xi;q1~!RrIznO`d|E<Wyd2yD=;Hi1#07AO
z3*rzLLKWAATP%z!0T&lR65k$D#r%Mish?%KSqpP6qx$qEEzIgnLh94+0BIH>bq=2C
zh8@hx^?S^PlsR~{<hi&x_yoScyUPspp^FeN2M?U1!6*S%#7B%Geqs~}AQaW(woeeD
z3b!I5ViXDER;07Y1?E2y+^V38rmMCymkYjN5#s0If(6f!7cA4)wlhmuVF&}w{bC9X
zXnrkaU^0P+Cr|^r{{MLO3lh{H*ugB3jA1OyeqloTVG2bEDQrK}!3@MKK+L-ROb1&m
FCje{E06PEx

delta 661
zcmX@PNNVL0sfHHD7N#xCD=O=soteoj(Xi;q1~!RrIznO`d|E<Wyd2yD=;Hi1#07AO
z3*rzLLKWAATP%z!0T&lR65k$D#r%Mi={@UovlixDMziTlTA0-Zy?6`q3rcemOEUBG
z>}(B$%%-0O3QM93TXOJdDFgk+HT_=;v%HL#0793IkpU10S#t0aRKZ731wTO*0t8hE
z5>z2XP=zo-6(UF~gfPQnx@#MA`E>SHW|8R^+L%SbEVeJELh2m+(|@!uD^FKyM-df-
gh?by=3WG%<`b5C&_V?|~K+FQftlQtWvqf<N0AZTKwEzGB

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 2d52ce9d82..88502778d5 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -71732,7 +71732,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -71743,7 +71743,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -71754,7 +71754,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -71765,7 +71765,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -71776,7 +71776,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -71787,7 +71787,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -71798,7 +71798,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -71809,7 +71809,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 5750
@@ -73114,7 +73114,6 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 11
@@ -73132,13 +73131,12 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 10
+        height: 12
         color: 7829367
         stroke_color: 856756480
       }
@@ -73150,151 +73148,142 @@ cont {
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 20
     caption {
       primary {
-        height: 10
+        height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 7100
     }
-    apply_if: "population<20000"
   }
 }
 cont {
@@ -73339,12 +73328,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -73356,12 +73345,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -73373,12 +73362,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -73390,12 +73379,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -73407,12 +73396,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -73424,12 +73413,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -73441,12 +73430,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
@@ -73458,12 +73447,12 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 6900
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index af66f3320c3ba50217b7f36b404d23d77f43f445..910524a5eaff151bddb498449f825ad70f95b642 100644
GIT binary patch
delta 839
zcmbQ<DtNqEu%U%<3)3zB`e$cmGE4mb|9?B1#2Y>#F%CX0Aue7HZUJ<0ejMTgIK%~U
zhzp^L>%uJ-MwNhziy(<_Zxdje!Ok?FWx9d{lOH43^n3{>IY#yAeG*LSOhW3@j{#{G
zA$1O(=?kQpl<PN13aN7NYAJH@aPSFies+ct<WY7ZJ`NrPPlHhctc;I1W&Fe`696fz
zCv2-AamEP|r%V`CnGG(#ilC~)s%$#HG*h|Ndln&n4la0Ty=MUi*DG;g2=i$v1Ct3N
z95ED5KOoH{QI8=E(=R|sKTM$@u?mH-C^W<Bc3~_kQ4~(^m0^+)#Bh82HW?-$X5PL{
IhUK9u0QiR@lmGw#

delta 668
zcmX@!EI7SYu%U%<3)3zB`Xe0^nI!)I|G%A0;tijW7zdx05Em~8w*b00KMrvL9O8mF
z#D!4Bb>S8Zqe{TVMUcd|w+S%KU}t*II$c46$#1%y1d}AYkpU10nN9DLU{V+K;w{K8
zD9uSM$;{8Qvjqun2MSA~3tMvVXek4|$u<3j1e3gsmjFVS4a7W44qk#P_z0@tC#XVz
zpb9~PDuf8C5GJTX1WAPuW_V1umtrcP{!xNSgzc5MkU9t7^hXj*%F{nfF^M9H3V=l+
fDg=?(LP%_3h|UAjP@U~BrI~=3dHYLgmV2rIrx3fx

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 287896148c..12d510ced8 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -41426,7 +41426,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 1900
@@ -41437,7 +41437,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 1900
@@ -41448,7 +41448,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 1900
@@ -41459,7 +41459,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 1900
@@ -41470,7 +41470,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 1900
@@ -41481,7 +41481,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 1900
@@ -41492,7 +41492,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 1900
@@ -41503,7 +41503,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 4473924
+        color: 6710886
         stroke_color: 1728053247
       }
       priority: 1900
@@ -42465,7 +42465,7 @@ cont {
         color: 6710886
       }
       secondary {
-        height: 9
+        height: 10
         color: 6710886
         offset_y: 1
       }
@@ -42489,7 +42489,6 @@ cont {
       }
       priority: 3250
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 11
@@ -42507,13 +42506,12 @@ cont {
       }
       priority: 3250
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 10
+        height: 12
         color: 3355443
         stroke_color: 872415231
       }
@@ -42525,151 +42523,142 @@ cont {
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 20
     caption {
       primary {
-        height: 10
+        height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 16777215
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
 }
 cont {
@@ -42714,12 +42703,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 3050
@@ -42731,12 +42720,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 3050
@@ -42748,12 +42737,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 3050
@@ -42765,12 +42754,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 3050
@@ -42782,12 +42771,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 3050
@@ -42799,12 +42788,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 3050
@@ -42816,12 +42805,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 3050
@@ -42833,12 +42822,12 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1308622847
         offset_y: 1
       }
       priority: 3050
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 55e9595ae19fb5f4689fa0ef4c6b8926bf4be408..014917bf8c5d5ef0128ef4d7b7a8eb3427d428ec 100644
GIT binary patch
delta 780
zcmaFdCfM96*wDhbh3TrG%*@TtSR@)29ofJp@rF-GjDt^0h>MqlTL2_J{i7h02!;v)
zWEF}+SX2lhs|duVLIg?0_C_J540fh|mg%o0nfw^Jrdvrd$uX)=kCb9kXA)AMJ`qT>
z2&r@MOiz?!Qm)@5DWuH7t0m9H&A}(oGjkKj^)5oZ96WH22BQR65g##%_=!;@fKXJA
z+de^rD%^^Mh*2brTanHp7nuJ<aI1nUntn@$sl5ILix58t7c6*=ykG$u@JbvQqI_D)
zz_^A798d;_LVjWu3Sd#li(>cmyRu9YRyb`E!eRibetkK7`b7xoZ*P=i0%GRvjdCoH
FQ~(~<*A@T(

delta 853
zcmZo}6@1(#*wDhbh3TrG%(F8ynI#$)9ofJp@rF-GjDt^0h>MqlTL2_J{i7h02!;v)
zWEF}+SX2lhs|duVLIg?0_C_J540fjXtkYjhGWkvClwy)(H!=VMA+za`QcUWCUc3eQ
z1*JKOC7JnocD5klCZKRVy09e&kCrmf?OXyqGdHn-{4|4Eh#!Tk!6>mw(n|ngoDIYx
zOAcO=wbsM+@{z0;u9csBt@Q%r>lGwls}M|UJ?Vig4AV=xRuK%XYQ)9u^k33U<<s{_
zF^RCf5*JeE;G4cyib)y5=0{=+fZ5YznM9Ek3xNfv2ce3JfJNJv$T9&j^Y$gOEcaCa
DDv$Vl

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index fe886b4b14..e8e878bf7e 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -41966,7 +41966,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 1900
@@ -41977,7 +41977,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 1900
@@ -41988,7 +41988,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 1900
@@ -41999,7 +41999,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 1900
@@ -42010,7 +42010,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 1900
@@ -42021,7 +42021,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 1900
@@ -42032,7 +42032,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 1900
@@ -42043,7 +42043,7 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 10066329
         stroke_color: 1712394496
       }
       priority: 1900
@@ -43005,7 +43005,7 @@ cont {
         color: 10066329
       }
       secondary {
-        height: 9
+        height: 10
         color: 10066329
         offset_y: 1
       }
@@ -43029,7 +43029,6 @@ cont {
       }
       priority: 3250
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 11
@@ -43047,13 +43046,12 @@ cont {
       }
       priority: 3250
     }
-    apply_if: "population>=0"
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 10
+        height: 12
         color: 9211020
         stroke_color: 856756480
       }
@@ -43065,151 +43063,142 @@ cont {
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 10
+        height: 14
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 10
+        height: 14
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 10
+        height: 14
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 10
+        height: 14
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 10
+        height: 14
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 10
+        height: 14
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 10
+        height: 14
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
   element {
     scale: 20
     caption {
       primary {
-        height: 10
+        height: 14
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
       }
       secondary {
-        height: 10
+        height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1118464
         offset_y: 1
       }
       priority: 3250
     }
-    apply_if: "population<20000"
   }
 }
 cont {
@@ -43254,12 +43243,12 @@ cont {
       primary {
         height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 3050
@@ -43271,12 +43260,12 @@ cont {
       primary {
         height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 3050
@@ -43288,12 +43277,12 @@ cont {
       primary {
         height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 3050
@@ -43305,12 +43294,12 @@ cont {
       primary {
         height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 3050
@@ -43322,12 +43311,12 @@ cont {
       primary {
         height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 3050
@@ -43339,12 +43328,12 @@ cont {
       primary {
         height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 3050
@@ -43356,12 +43345,12 @@ cont {
       primary {
         height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 3050
@@ -43373,12 +43362,12 @@ cont {
       primary {
         height: 12
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
       }
       secondary {
         height: 10
         color: 9211020
-        stroke_color: 856756480
+        stroke_color: 1292964096
         offset_y: 1
       }
       priority: 3050