Regenerated stylesbeta-653new-style-27-02

14 files changed, 3548 insertions, 3076 deletions

diff --git a/data/classificator.txt b/data/classificator.txt
index 450fb15fee..cc3aab476a 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -773,6 +773,7 @@ world  +
             {}
         chemist  -
         clothes  -
+        coffee  -
         computer  -
         confectionery  -
         convenience  -
@@ -802,6 +803,7 @@ world  +
         shoes  -
         sports  -
         supermarket  -
+        tea  -
         ticket  -
         toys  -
         travel_agency  -
diff --git a/data/colors.txt b/data/colors.txt
index 84e021f1f3..2ef8ff602b 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -8,64 +8,68 @@
 401446
 462602
 593674
-705791
 855309
 988160
 1118464
 1118481
 1184274
 1251584
+1272880
 1314836
 1317888
-1407476
 1512724
 1643545
 1644825
+1728193
+1842204
 1913758
 1973790
 2038288
 2038555
 2171163
+2171169
 2236945
 2236962
-2257467
 2302755
 2496790
 2498323
 2499106
 2631706
-2641970
 2695475
+2706568
 2770241
 2827062
 2828327
 2836760
-3043273
 3155515
 3158064
+3183362
 3354413
 3354672
 3354929
 3355443
 3418688
+3522830
 3552308
 3584191
+3629602
 3677969
 3677972
 3681605
+3684408
 3813419
 3832097
 3881273
 4011550
-4263680
 4272975
 4311295
 4334872
 4473924
 4495803
 4605510
-4622165
+4666933
 4671303
+4985359
 4991511
 4991513
 4991515
@@ -73,10 +77,11 @@
 5064516
 5131837
 5286655
-5592345
+5395026
 5592405
 6052945
 6052956
+6164237
 6173981
 6381914
 6381921
@@ -85,15 +90,18 @@
 6513500
 6645086
 6710886
-7033108
 7224647
+7542806
 7565931
 7566195
 7829367
-7870745
 8026746
+8163038
+8263442
+8327953
 8355711
 8421504
+8853524
 8947848
 9163744
 9210752
@@ -102,10 +110,10 @@
 9868950
 10066329
 10167040
-10167045
 10197647
-10202935
+10426903
 10592406
+11057133
 11184810
 11190117
 11453035
@@ -113,17 +121,19 @@
 11710882
 11711154
 11781233
+11836942
+12039862
 12303274
 12372094
 12763315
 12876543
+12895428
 13029267
 13031851
 13155550
 13163437
 13224123
 13229526
-13445160
 13484259
 13615592
 13620648
@@ -133,13 +143,15 @@
 13947850
 14604512
 14934482
+14951168
 15000299
 15066325
-15088695
+15086900
+15214341
 15591638
 15592411
 15658734
-15744010
+15790320
 15920858
 15921870
 16118756
@@ -153,13 +165,14 @@
 16742950
 16744243
 16746278
+16746306
 16746413
 16749632
 16750592
 16752972
 16760320
 16763432
-16764006
+16765952
 16774560
 16777215
 436207616
@@ -237,12 +250,13 @@
 2149720610
 2150311975
 2151957572
-2156681728
+2156687378
 2157549977
+2157871638
 2160707771
-2163595048
 2163800312
-2163913763
+2164055552
+2164253952
 2787649562
 2801593470
 3019898879
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f841bea7b6..9579feaa97 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 716eecab86..541e6092bc 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -13815,11 +13815,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -13841,11 +13841,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -13867,11 +13867,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -13893,11 +13893,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -13919,11 +13919,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -13945,11 +13945,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -13971,11 +13971,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -13997,11 +13997,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -14023,11 +14023,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14053,7 +14053,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -14108,11 +14108,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -14134,11 +14134,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14160,11 +14160,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14200,11 +14200,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -14240,11 +14240,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -14280,11 +14280,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -14320,11 +14320,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -14360,11 +14360,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -14400,11 +14400,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14444,7 +14444,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -14499,11 +14499,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -14525,11 +14525,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14562,11 +14562,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14599,11 +14599,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -14636,11 +14636,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -14673,11 +14673,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -14710,11 +14710,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -14747,11 +14747,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -14784,11 +14784,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14825,7 +14825,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -14936,11 +14936,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -14962,11 +14962,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -14988,11 +14988,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -15014,11 +15014,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -15040,11 +15040,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -15066,11 +15066,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -15096,7 +15096,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -15154,11 +15154,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -15194,11 +15194,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -15234,11 +15234,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -15274,11 +15274,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -15314,11 +15314,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -15354,11 +15354,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -15398,7 +15398,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -15467,11 +15467,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -15504,11 +15504,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -15541,11 +15541,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -15578,11 +15578,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -15615,11 +15615,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -15652,11 +15652,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -15693,7 +15693,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -18071,11 +18071,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -18097,11 +18097,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18123,11 +18123,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18149,11 +18149,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -18175,11 +18175,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -18201,11 +18201,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -18227,11 +18227,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -18253,11 +18253,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -18279,11 +18279,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -18309,7 +18309,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -18354,11 +18354,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -18380,11 +18380,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18406,11 +18406,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18432,11 +18432,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -18472,11 +18472,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -18512,11 +18512,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -18552,11 +18552,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -18592,11 +18592,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -18632,11 +18632,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -18676,7 +18676,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -18721,11 +18721,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -18747,11 +18747,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18773,11 +18773,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18799,11 +18799,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -18836,11 +18836,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -18873,11 +18873,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -18910,11 +18910,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -18947,11 +18947,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -18984,11 +18984,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -19025,7 +19025,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -19094,11 +19094,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -19120,11 +19120,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -19146,11 +19146,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -19172,11 +19172,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -19198,11 +19198,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -19228,7 +19228,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -19311,11 +19311,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -19351,11 +19351,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -19391,11 +19391,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -19431,11 +19431,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -19471,11 +19471,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -19515,7 +19515,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -19595,11 +19595,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -19632,11 +19632,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -19669,11 +19669,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -19706,11 +19706,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -19743,11 +19743,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -19784,7 +19784,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -20055,11 +20055,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -20081,11 +20081,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -20107,11 +20107,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -20133,11 +20133,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -20159,11 +20159,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -20185,11 +20185,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -20211,11 +20211,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -20241,7 +20241,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -20276,11 +20276,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -20302,11 +20302,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -20328,11 +20328,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -20354,11 +20354,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -20380,11 +20380,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -20406,11 +20406,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -20432,11 +20432,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -20462,7 +20462,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -20497,11 +20497,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -20523,11 +20523,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -20563,11 +20563,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -20603,11 +20603,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -20643,11 +20643,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -20683,11 +20683,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -20723,11 +20723,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -20767,7 +20767,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -20802,11 +20802,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -20828,11 +20828,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -20854,11 +20854,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -20880,11 +20880,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -20917,11 +20917,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -20954,11 +20954,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -20991,11 +20991,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -21032,7 +21032,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -21542,11 +21542,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -21568,11 +21568,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -21594,11 +21594,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -21620,11 +21620,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -21646,11 +21646,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -21672,11 +21672,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -21698,11 +21698,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -21728,7 +21728,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -21789,11 +21789,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -21815,11 +21815,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -21855,11 +21855,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -21895,11 +21895,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -21935,11 +21935,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -21975,11 +21975,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -22015,11 +22015,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -22059,7 +22059,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -22120,11 +22120,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -22146,11 +22146,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -22172,11 +22172,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -22198,11 +22198,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -22235,11 +22235,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -22272,11 +22272,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -22309,11 +22309,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -22350,7 +22350,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -24189,11 +24189,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -24215,11 +24215,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -24241,11 +24241,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -24267,11 +24267,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -24293,11 +24293,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -24319,11 +24319,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -24345,11 +24345,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -24375,7 +24375,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -24410,11 +24410,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -24436,11 +24436,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -24476,11 +24476,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -24516,11 +24516,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -24556,11 +24556,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -24596,11 +24596,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -24636,11 +24636,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -24680,7 +24680,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -24715,11 +24715,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -24741,11 +24741,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -24767,11 +24767,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -24793,11 +24793,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -24830,11 +24830,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -24867,11 +24867,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -24904,11 +24904,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -24945,7 +24945,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -27480,11 +27480,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -27506,11 +27506,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27532,11 +27532,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27558,11 +27558,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -27584,11 +27584,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -27610,11 +27610,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -27636,11 +27636,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -27662,11 +27662,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -27688,11 +27688,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -27718,7 +27718,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -27773,11 +27773,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -27799,11 +27799,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27825,11 +27825,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27865,11 +27865,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -27905,11 +27905,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -27945,11 +27945,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -27985,11 +27985,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -28025,11 +28025,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -28065,11 +28065,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -28109,7 +28109,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -28164,11 +28164,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -28190,11 +28190,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -28227,11 +28227,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -28264,11 +28264,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -28301,11 +28301,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -28338,11 +28338,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -28375,11 +28375,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -28412,11 +28412,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -28449,11 +28449,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -28490,7 +28490,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -28548,11 +28548,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -28574,11 +28574,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -28600,11 +28600,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -28626,11 +28626,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -28652,11 +28652,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -28678,11 +28678,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -28708,7 +28708,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -28766,11 +28766,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -28806,11 +28806,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -28846,11 +28846,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -28886,11 +28886,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -28926,11 +28926,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -28966,11 +28966,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -29010,7 +29010,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -29079,11 +29079,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -29116,11 +29116,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -29153,11 +29153,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -29190,11 +29190,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -29227,11 +29227,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -29264,11 +29264,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -29305,7 +29305,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -47034,12 +47034,6 @@ cont {
         height: 10
         color: 8355711
       }
-      secondary {
-        height: 9
-        color: 8355711
-        offset_y: 20
-        text: "int_name"
-      }
       priority: 15000
     }
   }
@@ -58335,6 +58329,73 @@ cont {
   }
 }
 cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
+cont {
   name: "shop-computer"
   element {
     scale: 16
@@ -60374,6 +60435,73 @@ cont {
   }
 }
 cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
+cont {
   name: "shop-ticket"
   element {
     scale: 16
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index f45f65ca08..aca924c618 100644
--- a/data/drules_proto_clear.bin
+++ b/data/drules_proto_clear.bin
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 617dad82db..91c0141d5b 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -13769,11 +13769,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -13795,11 +13795,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -13821,11 +13821,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -13847,11 +13847,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -13873,11 +13873,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -13899,11 +13899,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -13925,11 +13925,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -13951,11 +13951,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -13977,11 +13977,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14007,7 +14007,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -14062,11 +14062,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -14088,11 +14088,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14114,11 +14114,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14154,11 +14154,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -14194,11 +14194,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -14234,11 +14234,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -14274,11 +14274,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -14314,11 +14314,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -14354,11 +14354,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14398,7 +14398,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -14453,11 +14453,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -14479,11 +14479,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14516,11 +14516,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14553,11 +14553,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -14590,11 +14590,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -14627,11 +14627,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -14664,11 +14664,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -14701,11 +14701,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -14738,11 +14738,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14779,7 +14779,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -14890,11 +14890,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -14916,11 +14916,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -14942,11 +14942,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -14968,11 +14968,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -14994,11 +14994,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -15020,11 +15020,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -15050,7 +15050,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -15108,11 +15108,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -15148,11 +15148,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -15188,11 +15188,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -15228,11 +15228,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -15268,11 +15268,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -15308,11 +15308,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -15352,7 +15352,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -15421,11 +15421,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -15458,11 +15458,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -15495,11 +15495,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -15532,11 +15532,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -15569,11 +15569,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -15606,11 +15606,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -15647,7 +15647,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -18025,11 +18025,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -18051,11 +18051,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18077,11 +18077,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18103,11 +18103,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -18129,11 +18129,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -18155,11 +18155,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -18181,11 +18181,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -18207,11 +18207,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -18233,11 +18233,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -18263,7 +18263,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -18308,11 +18308,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -18334,11 +18334,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18360,11 +18360,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18386,11 +18386,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -18426,11 +18426,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -18466,11 +18466,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -18506,11 +18506,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -18546,11 +18546,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -18586,11 +18586,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -18630,7 +18630,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -18675,11 +18675,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -18701,11 +18701,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18727,11 +18727,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -18753,11 +18753,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -18790,11 +18790,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -18827,11 +18827,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -18864,11 +18864,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -18901,11 +18901,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -18938,11 +18938,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -18979,7 +18979,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -19048,11 +19048,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -19074,11 +19074,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -19100,11 +19100,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -19126,11 +19126,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -19152,11 +19152,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -19182,7 +19182,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -19265,11 +19265,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -19305,11 +19305,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -19345,11 +19345,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -19385,11 +19385,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -19425,11 +19425,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -19469,7 +19469,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -19549,11 +19549,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -19586,11 +19586,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -19623,11 +19623,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -19660,11 +19660,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -19697,11 +19697,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -19738,7 +19738,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -20009,11 +20009,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -20035,11 +20035,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -20061,11 +20061,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -20087,11 +20087,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -20113,11 +20113,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -20139,11 +20139,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -20165,11 +20165,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -20195,7 +20195,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -20230,11 +20230,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -20256,11 +20256,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -20282,11 +20282,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -20308,11 +20308,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -20334,11 +20334,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -20360,11 +20360,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -20386,11 +20386,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -20416,7 +20416,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -20451,11 +20451,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -20477,11 +20477,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -20517,11 +20517,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -20557,11 +20557,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -20597,11 +20597,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -20637,11 +20637,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -20677,11 +20677,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -20721,7 +20721,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -20756,11 +20756,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -20782,11 +20782,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -20808,11 +20808,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -20834,11 +20834,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -20871,11 +20871,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -20908,11 +20908,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -20945,11 +20945,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -20986,7 +20986,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -21496,11 +21496,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -21522,11 +21522,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -21548,11 +21548,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -21574,11 +21574,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -21600,11 +21600,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -21626,11 +21626,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -21652,11 +21652,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -21682,7 +21682,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -21743,11 +21743,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -21769,11 +21769,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -21809,11 +21809,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -21849,11 +21849,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -21889,11 +21889,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -21929,11 +21929,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -21969,11 +21969,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -22013,7 +22013,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -22074,11 +22074,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -22100,11 +22100,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -22126,11 +22126,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -22152,11 +22152,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -22189,11 +22189,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -22226,11 +22226,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -22263,11 +22263,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -22304,7 +22304,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -23897,11 +23897,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -23923,11 +23923,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -23949,11 +23949,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -23975,11 +23975,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -24001,11 +24001,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -24027,11 +24027,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -24053,11 +24053,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -24083,7 +24083,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -24118,11 +24118,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -24144,11 +24144,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -24184,11 +24184,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -24224,11 +24224,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -24264,11 +24264,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -24304,11 +24304,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -24344,11 +24344,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -24388,7 +24388,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -24423,11 +24423,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -24449,11 +24449,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -24475,11 +24475,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -24501,11 +24501,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -24538,11 +24538,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -24575,11 +24575,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -24612,11 +24612,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -24653,7 +24653,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -27188,11 +27188,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -27214,11 +27214,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27240,11 +27240,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27266,11 +27266,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -27292,11 +27292,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -27318,11 +27318,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -27344,11 +27344,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -27370,11 +27370,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -27396,11 +27396,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -27426,7 +27426,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -27481,11 +27481,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -27507,11 +27507,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27533,11 +27533,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27573,11 +27573,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -27613,11 +27613,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -27653,11 +27653,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -27693,11 +27693,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -27733,11 +27733,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -27773,11 +27773,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -27817,7 +27817,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -27872,11 +27872,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -27898,11 +27898,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27935,11 +27935,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -27972,11 +27972,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -28009,11 +28009,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -28046,11 +28046,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -28083,11 +28083,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -28120,11 +28120,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -28157,11 +28157,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -28198,7 +28198,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -28256,11 +28256,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -28282,11 +28282,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -28308,11 +28308,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -28334,11 +28334,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -28360,11 +28360,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -28386,11 +28386,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -28416,7 +28416,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -28474,11 +28474,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -28514,11 +28514,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -28554,11 +28554,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -28594,11 +28594,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -28634,11 +28634,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -28674,11 +28674,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -28718,7 +28718,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -28787,11 +28787,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -28824,11 +28824,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -28861,11 +28861,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -28898,11 +28898,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -28935,11 +28935,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 0
     }
   }
@@ -28972,11 +28972,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 0
     }
   }
@@ -29013,7 +29013,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -46742,12 +46742,6 @@ cont {
         height: 10
         color: 8355711
       }
-      secondary {
-        height: 9
-        color: 8355711
-        offset_y: 20
-        text: "int_name"
-      }
       priority: 15000
     }
   }
@@ -57794,6 +57788,73 @@ cont {
   }
 }
 cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
+cont {
   name: "shop-computer"
   element {
     scale: 16
@@ -59769,6 +59830,73 @@ cont {
   }
 }
 cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
+cont {
   name: "shop-ticket"
   element {
     scale: 16
@@ -64811,13 +64939,13 @@ colors {
   }
   value {
     name: "RoadShieldUKYellowText"
-    color: 16764006
+    color: 16765952
     x: 0
     y: 0
   }
   value {
     name: "RoadShieldBlueBackground"
-    color: 3043273
+    color: 1728193
     x: 0
     y: 0
   }
@@ -64829,7 +64957,7 @@ colors {
   }
   value {
     name: "TrafficArrowDark"
-    color: 7033108
+    color: 4666933
     x: 0
     y: 0
   }
@@ -64853,7 +64981,7 @@ colors {
   }
   value {
     name: "RoadShieldRedBackground"
-    color: 13445160
+    color: 15086900
     x: 0
     y: 0
   }
@@ -64877,19 +65005,19 @@ colors {
   }
   value {
     name: "RouteOutline"
-    color: 352205
+    color: 8853524
     x: 0
     y: 0
   }
   value {
     name: "TrackPlaneSpeed"
-    color: 705791
+    color: 11057133
     x: 0
     y: 0
   }
   value {
     name: "TrackCarSpeed"
-    color: 1407476
+    color: 8163038
     x: 0
     y: 0
   }
@@ -64901,37 +65029,37 @@ colors {
   }
   value {
     name: "TrafficG3"
-    color: 2163913763
+    color: 2164055552
     x: 0
     y: 0
   }
   value {
     name: "TrafficG2"
-    color: 15088695
+    color: 14951168
     x: 0
     y: 0
   }
   value {
     name: "TrafficG1"
-    color: 15088695
+    color: 14951168
     x: 0
     y: 0
   }
   value {
     name: "TrafficG0"
-    color: 10167045
+    color: 8263442
     x: 0
     y: 0
   }
   value {
     name: "TrafficTempBlock"
-    color: 4605510
+    color: 5395026
     x: 0
     y: 0
   }
   value {
     name: "TrafficG5"
-    color: 4622165
+    color: 3522830
     x: 0
     y: 0
   }
@@ -64955,13 +65083,13 @@ colors {
   }
   value {
     name: "TrafficG4"
-    color: 10202935
+    color: 3522830
     x: 0
     y: 0
   }
   value {
     name: "RoadShieldGreenBackground"
-    color: 2257467
+    color: 3183362
     x: 0
     y: 0
   }
@@ -64973,7 +65101,7 @@ colors {
   }
   value {
     name: "RouteTrafficG1"
-    color: 15744010
+    color: 15214341
     x: 0
     y: 0
   }
@@ -64985,13 +65113,13 @@ colors {
   }
   value {
     name: "RouteTrafficG3"
-    color: 2163595048
+    color: 2164253952
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG2"
-    color: 15744010
+    color: 15214341
     x: 0
     y: 0
   }
@@ -65003,7 +65131,7 @@ colors {
   }
   value {
     name: "TrafficOutline"
-    color: 16777215
+    color: 15790320
     x: 0
     y: 0
   }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 55c29217e8..dfce38826a 100644
--- a/data/drules_proto_dark.bin
+++ b/data/drules_proto_dark.bin
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 5fdf4bffad..5fdf293954 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -13769,11 +13769,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -13795,11 +13795,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -13821,11 +13821,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -13847,11 +13847,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -13873,11 +13873,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -13899,11 +13899,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -13925,11 +13925,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -13951,11 +13951,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -13977,11 +13977,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -14007,7 +14007,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -14062,11 +14062,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -14088,11 +14088,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -14114,11 +14114,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -14154,11 +14154,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -14194,11 +14194,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -14234,11 +14234,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -14274,11 +14274,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -14314,11 +14314,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -14354,11 +14354,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -14398,7 +14398,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -14453,11 +14453,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -14479,11 +14479,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -14516,11 +14516,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -14553,11 +14553,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -14590,11 +14590,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -14627,11 +14627,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -14664,11 +14664,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -14701,11 +14701,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -14738,11 +14738,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -14779,7 +14779,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -14890,11 +14890,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -14916,11 +14916,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -14942,11 +14942,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -14968,11 +14968,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -14994,11 +14994,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -15020,11 +15020,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -15050,7 +15050,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -15108,11 +15108,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -15148,11 +15148,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -15188,11 +15188,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -15228,11 +15228,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -15268,11 +15268,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -15308,11 +15308,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -15352,7 +15352,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -15421,11 +15421,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -15458,11 +15458,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -15495,11 +15495,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -15532,11 +15532,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -15569,11 +15569,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -15606,11 +15606,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -15647,7 +15647,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -18025,11 +18025,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -18051,11 +18051,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -18077,11 +18077,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -18103,11 +18103,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -18129,11 +18129,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -18155,11 +18155,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -18181,11 +18181,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -18207,11 +18207,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -18233,11 +18233,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -18263,7 +18263,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -18308,11 +18308,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -18334,11 +18334,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -18360,11 +18360,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -18386,11 +18386,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -18426,11 +18426,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -18466,11 +18466,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -18506,11 +18506,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -18546,11 +18546,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -18586,11 +18586,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -18630,7 +18630,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -18675,11 +18675,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -18701,11 +18701,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -18727,11 +18727,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -18753,11 +18753,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -18790,11 +18790,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -18827,11 +18827,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -18864,11 +18864,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -18901,11 +18901,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -18938,11 +18938,11 @@ cont {
       priority: 16431
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -18979,7 +18979,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16431
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -19048,11 +19048,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -19074,11 +19074,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -19100,11 +19100,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -19126,11 +19126,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -19152,11 +19152,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -19182,7 +19182,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -19265,11 +19265,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -19305,11 +19305,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -19345,11 +19345,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -19385,11 +19385,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -19425,11 +19425,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -19469,7 +19469,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -19549,11 +19549,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -19586,11 +19586,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -19623,11 +19623,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -19660,11 +19660,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -19697,11 +19697,11 @@ cont {
       priority: 16421
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -19738,7 +19738,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16421
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -20009,11 +20009,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -20035,11 +20035,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -20061,11 +20061,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -20087,11 +20087,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -20113,11 +20113,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -20139,11 +20139,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -20165,11 +20165,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -20195,7 +20195,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -20230,11 +20230,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -20256,11 +20256,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -20282,11 +20282,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -20308,11 +20308,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -20334,11 +20334,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -20360,11 +20360,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -20386,11 +20386,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -20416,7 +20416,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -20451,11 +20451,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -20477,11 +20477,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -20517,11 +20517,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -20557,11 +20557,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -20597,11 +20597,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -20637,11 +20637,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -20677,11 +20677,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -20721,7 +20721,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -20756,11 +20756,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -20782,11 +20782,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -20808,11 +20808,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -20834,11 +20834,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -20871,11 +20871,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -20908,11 +20908,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -20945,11 +20945,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -20986,7 +20986,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -21496,11 +21496,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -21522,11 +21522,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -21548,11 +21548,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -21574,11 +21574,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -21600,11 +21600,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -21626,11 +21626,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -21652,11 +21652,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -21682,7 +21682,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -21743,11 +21743,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -21769,11 +21769,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -21809,11 +21809,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -21849,11 +21849,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -21889,11 +21889,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -21929,11 +21929,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -21969,11 +21969,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -22013,7 +22013,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -22074,11 +22074,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -22100,11 +22100,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -22126,11 +22126,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -22152,11 +22152,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -22189,11 +22189,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -22226,11 +22226,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -22263,11 +22263,11 @@ cont {
       priority: 16410
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -22304,7 +22304,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16410
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -23897,11 +23897,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -23923,11 +23923,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -23949,11 +23949,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -23975,11 +23975,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -24001,11 +24001,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -24027,11 +24027,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -24053,11 +24053,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -24083,7 +24083,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -24118,11 +24118,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -24144,11 +24144,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -24184,11 +24184,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -24224,11 +24224,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -24264,11 +24264,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -24304,11 +24304,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -24344,11 +24344,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -24388,7 +24388,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -24423,11 +24423,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -24449,11 +24449,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -24475,11 +24475,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -24501,11 +24501,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -24538,11 +24538,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -24575,11 +24575,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -24612,11 +24612,11 @@ cont {
       priority: 16389
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -24653,7 +24653,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16389
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -27188,11 +27188,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -27214,11 +27214,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -27240,11 +27240,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -27266,11 +27266,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -27292,11 +27292,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -27318,11 +27318,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -27344,11 +27344,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -27370,11 +27370,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -27396,11 +27396,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -27426,7 +27426,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -27481,11 +27481,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -27507,11 +27507,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -27533,11 +27533,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -27573,11 +27573,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -27613,11 +27613,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -27653,11 +27653,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -27693,11 +27693,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -27733,11 +27733,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -27773,11 +27773,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -27817,7 +27817,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -27872,11 +27872,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 150
       text_color: 11711154
     }
   }
@@ -27898,11 +27898,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -27935,11 +27935,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 60
+      min_distance: 250
       text_color: 11711154
     }
   }
@@ -27972,11 +27972,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -28009,11 +28009,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -28046,11 +28046,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -28083,11 +28083,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -28120,11 +28120,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -28157,11 +28157,11 @@ cont {
       priority: 16452
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -28198,7 +28198,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16452
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -28256,11 +28256,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -28282,11 +28282,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -28308,11 +28308,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -28334,11 +28334,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -28360,11 +28360,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -28386,11 +28386,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -28416,7 +28416,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -28474,11 +28474,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -28514,11 +28514,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -28554,11 +28554,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -28594,11 +28594,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -28634,11 +28634,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -28674,11 +28674,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -28718,7 +28718,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -28787,11 +28787,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 300
       text_color: 11711154
     }
   }
@@ -28824,11 +28824,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 100
+      min_distance: 400
       text_color: 11711154
     }
   }
@@ -28861,11 +28861,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 150
+      min_distance: 450
       text_color: 11711154
     }
   }
@@ -28898,11 +28898,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 10
+      height: 9
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 250
+      min_distance: 500
       text_color: 11711154
     }
   }
@@ -28935,11 +28935,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 400
+      min_distance: 550
       text_color: 11711154
     }
   }
@@ -28972,11 +28972,11 @@ cont {
       priority: 16442
     }
     shield {
-      height: 11
+      height: 10
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 800
       text_color: 11711154
     }
   }
@@ -29013,7 +29013,7 @@ cont {
       color: 0
       stroke_color: 11711154
       priority: 16442
-      min_distance: 500
+      min_distance: 1050
       text_color: 11711154
     }
   }
@@ -46742,12 +46742,6 @@ cont {
         height: 10
         color: 5592405
       }
-      secondary {
-        height: 9
-        color: 5592405
-        offset_y: 20
-        text: "int_name"
-      }
       priority: 15000
     }
   }
@@ -57794,6 +57788,73 @@ cont {
   }
 }
 cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
+cont {
   name: "shop-computer"
   element {
     scale: 16
@@ -59769,6 +59830,73 @@ cont {
   }
 }
 cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
+cont {
   name: "shop-ticket"
   element {
     scale: 16
@@ -64775,7 +64903,7 @@ cont {
 colors {
   value {
     name: "RoadShieldWhiteText"
-    color: 16777215
+    color: 12039862
     x: 0
     y: 0
   }
@@ -64811,13 +64939,13 @@ colors {
   }
   value {
     name: "RoadShieldUKYellowText"
-    color: 16764006
+    color: 11836942
     x: 0
     y: 0
   }
   value {
     name: "RoadShieldBlueBackground"
-    color: 3043273
+    color: 2706568
     x: 0
     y: 0
   }
@@ -64829,7 +64957,7 @@ colors {
   }
   value {
     name: "TrafficArrowDark"
-    color: 1973790
+    color: 1644825
     x: 0
     y: 0
   }
@@ -64841,7 +64969,7 @@ colors {
   }
   value {
     name: "RoadShieldOrangeBackground"
-    color: 16760320
+    color: 1272880
     x: 0
     y: 0
   }
@@ -64853,7 +64981,7 @@ colors {
   }
   value {
     name: "RoadShieldRedBackground"
-    color: 13445160
+    color: 10426903
     x: 0
     y: 0
   }
@@ -64865,7 +64993,7 @@ colors {
   }
   value {
     name: "RoadShieldBlackText"
-    color: 0
+    color: 2171169
     x: 0
     y: 0
   }
@@ -64901,25 +65029,25 @@ colors {
   }
   value {
     name: "TrafficG3"
-    color: 2156681728
+    color: 2156687378
     x: 0
     y: 0
   }
   value {
     name: "TrafficG2"
-    color: 7870745
+    color: 7542806
     x: 0
     y: 0
   }
   value {
     name: "TrafficG1"
-    color: 7870745
+    color: 7542806
     x: 0
     y: 0
   }
   value {
     name: "TrafficG0"
-    color: 4263680
+    color: 4985359
     x: 0
     y: 0
   }
@@ -64931,7 +65059,7 @@ colors {
   }
   value {
     name: "TrafficG5"
-    color: 2641970
+    color: 3629602
     x: 0
     y: 0
   }
@@ -64955,43 +65083,43 @@ colors {
   }
   value {
     name: "TrafficG4"
-    color: 5592345
+    color: 3629602
     x: 0
     y: 0
   }
   value {
     name: "RoadShieldGreenBackground"
-    color: 2257467
+    color: 1272880
     x: 0
     y: 0
   }
   value {
     name: "TrafficArrowLight"
-    color: 11184810
+    color: 12895428
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG1"
-    color: 15744010
+    color: 8327953
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG0"
-    color: 10167040
+    color: 6164237
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG3"
-    color: 2163595048
+    color: 2157871638
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG2"
-    color: 15744010
+    color: 8327953
     x: 0
     y: 0
   }
@@ -65003,7 +65131,7 @@ colors {
   }
   value {
     name: "TrafficOutline"
-    color: 0
+    color: 3684408
     x: 0
     y: 0
   }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 30eb228043..e25a60df2a 100644
--- a/data/drules_proto_vehicle_clear.bin
+++ b/data/drules_proto_vehicle_clear.bin
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 60b6908ecf..1f63d9f6fd 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -862,7 +862,7 @@ cont {
       color: 869585866
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: -15711
     }
@@ -873,7 +873,7 @@ cont {
       color: 869585866
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: -15711
     }
@@ -891,7 +891,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: -15711
     }
@@ -909,7 +909,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: -15711
     }
@@ -927,7 +927,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: -15711
     }
@@ -945,7 +945,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: -15711
     }
@@ -4694,7 +4694,7 @@ cont {
       color: 1523897290
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4705,7 +4705,7 @@ cont {
       color: 1943327690
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4716,7 +4716,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4735,7 +4735,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4754,7 +4754,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4843,7 +4843,7 @@ cont {
       color: 1523897290
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4854,7 +4854,7 @@ cont {
       color: 1943327690
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4865,7 +4865,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4884,7 +4884,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4903,7 +4903,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4925,7 +4925,7 @@ cont {
       color: 1523897290
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4936,7 +4936,7 @@ cont {
       color: 1943327690
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4947,7 +4947,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4966,7 +4966,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -4985,7 +4985,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -5091,7 +5091,7 @@ cont {
       color: 1523897290
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1961
     }
@@ -5123,7 +5123,7 @@ cont {
       color: 1943327690
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1961
     }
@@ -5155,7 +5155,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -5188,7 +5188,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -5221,7 +5221,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1329
     }
@@ -5257,7 +5257,7 @@ cont {
       color: 1943327690
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -5268,7 +5268,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -5279,7 +5279,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -5290,7 +5290,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -5840,7 +5840,7 @@ cont {
     scale: 7
     lines {
       width: 1.05
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -5850,7 +5850,7 @@ cont {
     scale: 8
     lines {
       width: 1.25
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -5860,7 +5860,7 @@ cont {
     scale: 9
     lines {
       width: 1.4
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -5884,11 +5884,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -5910,11 +5910,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -5936,11 +5936,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -5962,11 +5962,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -5995,11 +5995,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -6028,11 +6028,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -6061,11 +6061,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -6098,7 +6098,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -6127,11 +6127,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -6164,7 +6164,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -6175,7 +6175,7 @@ cont {
     scale: 7
     lines {
       width: 1.05
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -6185,7 +6185,7 @@ cont {
     scale: 8
     lines {
       width: 1.25
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -6195,7 +6195,7 @@ cont {
     scale: 9
     lines {
       width: 1.4
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -6219,11 +6219,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -6245,11 +6245,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -6271,11 +6271,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -6297,11 +6297,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -6344,11 +6344,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -6391,11 +6391,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -6438,11 +6438,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -6489,7 +6489,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -6532,11 +6532,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -6583,7 +6583,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -6594,7 +6594,7 @@ cont {
     scale: 7
     lines {
       width: 1.05
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -6604,7 +6604,7 @@ cont {
     scale: 8
     lines {
       width: 1.25
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -6614,7 +6614,7 @@ cont {
     scale: 9
     lines {
       width: 1.4
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -6638,11 +6638,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -6664,11 +6664,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -6701,11 +6701,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -6738,11 +6738,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -6775,11 +6775,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -6812,11 +6812,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -6849,11 +6849,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -6890,7 +6890,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -6923,11 +6923,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -6964,7 +6964,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -7075,11 +7075,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -7108,11 +7108,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -7141,11 +7141,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -7174,11 +7174,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -7211,7 +7211,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -7240,11 +7240,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -7277,7 +7277,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -7335,11 +7335,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -7382,11 +7382,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -7429,11 +7429,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -7476,11 +7476,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -7527,7 +7527,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -7570,11 +7570,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -7621,7 +7621,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -7690,11 +7690,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -7727,11 +7727,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -7764,11 +7764,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -7801,11 +7801,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -7842,7 +7842,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -7875,11 +7875,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -7916,7 +7916,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -7961,11 +7961,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -7987,11 +7987,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -8013,11 +8013,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -8039,11 +8039,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -8072,11 +8072,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -8105,11 +8105,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -8138,11 +8138,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -8175,7 +8175,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -8204,11 +8204,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -8241,7 +8241,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -8286,11 +8286,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -8312,11 +8312,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -8338,11 +8338,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -8364,11 +8364,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -8411,11 +8411,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -8458,11 +8458,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -8505,11 +8505,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -8556,7 +8556,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -8599,11 +8599,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -8650,7 +8650,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -8695,11 +8695,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -8721,11 +8721,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -8747,11 +8747,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -8773,11 +8773,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -8810,11 +8810,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -8847,11 +8847,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -8884,11 +8884,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -8925,7 +8925,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -8958,11 +8958,11 @@ cont {
       priority: 16539
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -8999,7 +8999,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16539
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -9075,11 +9075,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -9108,11 +9108,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -9141,11 +9141,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -9178,7 +9178,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -9207,11 +9207,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -9244,7 +9244,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -9334,11 +9334,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -9381,11 +9381,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -9428,11 +9428,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -9479,7 +9479,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -9522,11 +9522,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -9573,7 +9573,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -9653,11 +9653,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -9690,11 +9690,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -9727,11 +9727,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -9768,7 +9768,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -9801,11 +9801,11 @@ cont {
       priority: 16526
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -9842,7 +9842,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16526
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -9978,11 +9978,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -10004,11 +10004,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -10030,11 +10030,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -10063,11 +10063,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -10096,11 +10096,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -10133,7 +10133,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -10162,11 +10162,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -10199,7 +10199,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -10234,11 +10234,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -10260,11 +10260,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -10286,11 +10286,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -10319,11 +10319,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -10352,11 +10352,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -10389,7 +10389,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -10418,11 +10418,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -10455,7 +10455,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -10490,11 +10490,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -10516,11 +10516,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -10556,11 +10556,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -10603,11 +10603,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -10650,11 +10650,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -10701,7 +10701,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -10744,11 +10744,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -10795,7 +10795,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -10830,11 +10830,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -10856,11 +10856,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -10882,11 +10882,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -10915,11 +10915,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -10952,11 +10952,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -10993,7 +10993,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -11026,11 +11026,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -11067,7 +11067,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -11521,11 +11521,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -11547,11 +11547,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -11580,11 +11580,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -11613,11 +11613,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -11646,11 +11646,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -11683,7 +11683,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -11712,11 +11712,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -11749,7 +11749,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -11810,11 +11810,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -11836,11 +11836,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -11883,11 +11883,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -11930,11 +11930,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -11977,11 +11977,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -12028,7 +12028,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -12071,11 +12071,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -12122,7 +12122,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -12183,11 +12183,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -12209,11 +12209,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -12242,11 +12242,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -12275,11 +12275,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -12312,11 +12312,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -12353,7 +12353,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -12386,11 +12386,11 @@ cont {
       priority: 16513
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -12427,7 +12427,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16513
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -13847,11 +13847,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -13873,11 +13873,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -13899,11 +13899,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -13932,11 +13932,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -13965,11 +13965,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -14002,7 +14002,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -14031,11 +14031,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14068,7 +14068,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -14103,11 +14103,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14129,11 +14129,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -14169,11 +14169,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -14216,11 +14216,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -14263,11 +14263,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -14314,7 +14314,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -14357,11 +14357,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14408,7 +14408,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -14443,11 +14443,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -14469,11 +14469,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -14495,11 +14495,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -14528,11 +14528,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -14565,11 +14565,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -14606,7 +14606,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -14639,11 +14639,11 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -14680,7 +14680,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16486
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -15089,7 +15089,7 @@ cont {
     scale: 7
     lines {
       width: 1.05
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15099,7 +15099,7 @@ cont {
     scale: 8
     lines {
       width: 1.25
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15109,7 +15109,7 @@ cont {
     scale: 9
     lines {
       width: 1.4
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15133,11 +15133,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -15159,11 +15159,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -15185,11 +15185,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -15211,11 +15211,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -15244,11 +15244,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -15277,11 +15277,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -15310,11 +15310,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -15347,7 +15347,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -15376,11 +15376,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -15413,7 +15413,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -15424,7 +15424,7 @@ cont {
     scale: 7
     lines {
       width: 1.05
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15434,7 +15434,7 @@ cont {
     scale: 8
     lines {
       width: 1.25
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15444,7 +15444,7 @@ cont {
     scale: 9
     lines {
       width: 1.4
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15468,11 +15468,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -15494,11 +15494,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -15520,11 +15520,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -15546,11 +15546,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -15593,11 +15593,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -15640,11 +15640,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -15687,11 +15687,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -15738,7 +15738,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -15781,11 +15781,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -15832,7 +15832,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -15843,7 +15843,7 @@ cont {
     scale: 7
     lines {
       width: 1.05
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15853,7 +15853,7 @@ cont {
     scale: 8
     lines {
       width: 1.25
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15863,7 +15863,7 @@ cont {
     scale: 9
     lines {
       width: 1.4
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -15887,11 +15887,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 150
       text_color: 0
     }
   }
@@ -15913,11 +15913,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -15950,11 +15950,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 60
+      min_distance: 250
       text_color: 0
     }
   }
@@ -15987,11 +15987,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -16024,11 +16024,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -16061,11 +16061,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -16098,11 +16098,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -16139,7 +16139,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -16172,11 +16172,11 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -16213,7 +16213,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16565
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -16271,11 +16271,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -16304,11 +16304,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -16337,11 +16337,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -16370,11 +16370,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -16407,7 +16407,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -16436,11 +16436,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -16473,7 +16473,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -16531,11 +16531,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -16578,11 +16578,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -16625,11 +16625,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -16672,11 +16672,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -16723,7 +16723,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -16766,11 +16766,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -16817,7 +16817,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -16886,11 +16886,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 300
       text_color: 0
     }
   }
@@ -16923,11 +16923,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 100
+      min_distance: 400
       text_color: 0
     }
   }
@@ -16960,11 +16960,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 150
+      min_distance: 450
       text_color: 0
     }
   }
@@ -16997,11 +16997,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
+      height: 9
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 500
       text_color: 0
     }
   }
@@ -17038,7 +17038,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 250
+      min_distance: 550
       text_color: 0
     }
   }
@@ -17071,11 +17071,11 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
+      height: 10
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 400
+      min_distance: 800
       text_color: 0
     }
   }
@@ -17112,7 +17112,7 @@ cont {
       color: 16777215
       stroke_color: 0
       priority: 16552
-      min_distance: 500
+      min_distance: 1050
       text_color: 0
     }
   }
@@ -17775,7 +17775,7 @@ cont {
     scale: 4
     lines {
       width: 0.85
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17785,7 +17785,7 @@ cont {
     scale: 5
     lines {
       width: 0.95
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17795,7 +17795,7 @@ cont {
     scale: 6
     lines {
       width: 0.95
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17805,7 +17805,7 @@ cont {
     scale: 7
     lines {
       width: 1.0
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17815,7 +17815,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16746306
       priority: 1539
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17825,7 +17825,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16746306
       priority: 1539
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17838,7 +17838,7 @@ cont {
     scale: 6
     lines {
       width: 0.95
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17848,7 +17848,7 @@ cont {
     scale: 7
     lines {
       width: 1.0
-      color: 16742950
+      color: 16746306
       priority: 1565
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17858,7 +17858,7 @@ cont {
     scale: 8
     lines {
       width: 1.1
-      color: 16742950
+      color: 16746306
       priority: 1539
       join: BEVELJOIN
       cap: BUTTCAP
@@ -17868,7 +17868,7 @@ cont {
     scale: 9
     lines {
       width: 1.2
-      color: 16742950
+      color: 16746306
       priority: 1539
       join: BEVELJOIN
       cap: BUTTCAP
@@ -19317,7 +19317,7 @@ cont {
       color: 1523897290
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -19328,7 +19328,7 @@ cont {
       color: 1943327690
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -19339,7 +19339,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -19350,7 +19350,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -19361,7 +19361,7 @@ cont {
       color: 13947850
       border {
         width: 1.0
-        color: 10592406
+        color: 13947850
       }
       priority: 1277
     }
@@ -29525,42 +29525,6 @@ cont {
 cont {
   name: "place-suburb"
   element {
-    scale: 10
-    caption {
-      primary {
-        height: 8
-        color: 8355711
-      }
-      priority: 15000
-    }
-  }
-  element {
-    scale: 11
-    caption {
-      primary {
-        height: 8
-        color: 8355711
-      }
-      priority: 15000
-    }
-  }
-  element {
-    scale: 12
-    caption {
-      primary {
-        height: 9
-        color: 8355711
-      }
-      secondary {
-        height: 8
-        color: 8355711
-        offset_y: 20
-        text: "int_name"
-      }
-      priority: 15000
-    }
-  }
-  element {
     scale: 13
     caption {
       primary {
@@ -40146,6 +40110,41 @@ cont {
   }
 }
 cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+}
+cont {
   name: "shop-computer"
   element {
     scale: 16
@@ -41321,6 +41320,41 @@ cont {
   }
 }
 cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+}
+cont {
   name: "shop-ticket"
   element {
     scale: 16
@@ -43409,13 +43443,13 @@ colors {
   }
   value {
     name: "RoadShieldUKYellowText"
-    color: 16764006
+    color: 16765952
     x: 0
     y: 0
   }
   value {
     name: "RoadShieldBlueBackground"
-    color: 3043273
+    color: 1728193
     x: 0
     y: 0
   }
@@ -43427,7 +43461,7 @@ colors {
   }
   value {
     name: "TrafficArrowDark"
-    color: 7033108
+    color: 4666933
     x: 0
     y: 0
   }
@@ -43451,7 +43485,7 @@ colors {
   }
   value {
     name: "RoadShieldRedBackground"
-    color: 13445160
+    color: 15086900
     x: 0
     y: 0
   }
@@ -43481,13 +43515,13 @@ colors {
   }
   value {
     name: "TrackPlaneSpeed"
-    color: 705791
+    color: 11057133
     x: 0
     y: 0
   }
   value {
     name: "TrackCarSpeed"
-    color: 1407476
+    color: 8163038
     x: 0
     y: 0
   }
@@ -43499,25 +43533,25 @@ colors {
   }
   value {
     name: "TrafficG3"
-    color: 2163913763
+    color: 2164055552
     x: 0
     y: 0
   }
   value {
     name: "TrafficG2"
-    color: 15088695
+    color: 14951168
     x: 0
     y: 0
   }
   value {
     name: "TrafficG1"
-    color: 15088695
+    color: 14951168
     x: 0
     y: 0
   }
   value {
     name: "TrafficG0"
-    color: 10167045
+    color: 8263442
     x: 0
     y: 0
   }
@@ -43529,7 +43563,7 @@ colors {
   }
   value {
     name: "TrafficG5"
-    color: 4622165
+    color: 3522830
     x: 0
     y: 0
   }
@@ -43553,13 +43587,13 @@ colors {
   }
   value {
     name: "TrafficG4"
-    color: 10202935
+    color: 3522830
     x: 0
     y: 0
   }
   value {
     name: "RoadShieldGreenBackground"
-    color: 2257467
+    color: 3183362
     x: 0
     y: 0
   }
@@ -43571,7 +43605,7 @@ colors {
   }
   value {
     name: "RouteTrafficG1"
-    color: 15744010
+    color: 15214341
     x: 0
     y: 0
   }
@@ -43583,13 +43617,13 @@ colors {
   }
   value {
     name: "RouteTrafficG3"
-    color: 2163595048
+    color: 2164253952
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG2"
-    color: 15744010
+    color: 15214341
     x: 0
     y: 0
   }
@@ -43601,7 +43635,7 @@ colors {
   }
   value {
     name: "TrafficOutline"
-    color: 16777215
+    color: 15790320
     x: 0
     y: 0
   }
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index b7d0fa5480..26ac1ad6f7 100644
--- a/data/drules_proto_vehicle_dark.bin
+++ b/data/drules_proto_vehicle_dark.bin
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index b403f921f5..09d1930669 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -862,7 +862,7 @@ cont {
       color: 857282841
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: -15711
     }
@@ -873,7 +873,7 @@ cont {
       color: 857282841
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: -15711
     }
@@ -891,7 +891,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: -15711
     }
@@ -909,7 +909,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: -15711
     }
@@ -927,7 +927,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: -15711
     }
@@ -945,7 +945,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: -15711
     }
@@ -4694,7 +4694,7 @@ cont {
       color: 1511594265
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4705,7 +4705,7 @@ cont {
       color: 1931024665
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4716,7 +4716,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4735,7 +4735,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4754,7 +4754,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4843,7 +4843,7 @@ cont {
       color: 1511594265
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4854,7 +4854,7 @@ cont {
       color: 1931024665
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4865,7 +4865,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4884,7 +4884,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4903,7 +4903,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4925,7 +4925,7 @@ cont {
       color: 1511594265
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4936,7 +4936,7 @@ cont {
       color: 1931024665
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4947,7 +4947,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4966,7 +4966,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -4985,7 +4985,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -5091,7 +5091,7 @@ cont {
       color: 1511594265
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1961
     }
@@ -5123,7 +5123,7 @@ cont {
       color: 1931024665
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1961
     }
@@ -5155,7 +5155,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -5188,7 +5188,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -5221,7 +5221,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1329
     }
@@ -5257,7 +5257,7 @@ cont {
       color: 1931024665
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -5268,7 +5268,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -5279,7 +5279,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -5290,7 +5290,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -5884,12 +5884,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -5910,12 +5910,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -5936,12 +5936,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -5962,12 +5962,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -5995,12 +5995,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -6028,12 +6028,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -6061,12 +6061,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -6095,11 +6095,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -6127,12 +6127,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -6161,11 +6161,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -6219,12 +6219,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -6245,12 +6245,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -6271,12 +6271,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -6297,12 +6297,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -6344,12 +6344,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -6391,12 +6391,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -6438,12 +6438,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -6486,11 +6486,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -6532,12 +6532,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -6580,11 +6580,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -6638,12 +6638,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -6664,12 +6664,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -6701,12 +6701,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -6738,12 +6738,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -6775,12 +6775,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -6812,12 +6812,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -6849,12 +6849,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -6887,11 +6887,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -6923,12 +6923,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -6961,11 +6961,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -7075,12 +7075,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -7108,12 +7108,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -7141,12 +7141,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -7174,12 +7174,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -7208,11 +7208,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -7240,12 +7240,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -7274,11 +7274,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -7335,12 +7335,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -7382,12 +7382,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -7429,12 +7429,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -7476,12 +7476,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -7524,11 +7524,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -7570,12 +7570,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -7618,11 +7618,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -7690,12 +7690,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -7727,12 +7727,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -7764,12 +7764,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -7801,12 +7801,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -7839,11 +7839,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -7875,12 +7875,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -7913,11 +7913,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -7961,12 +7961,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -7987,12 +7987,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -8013,12 +8013,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -8039,12 +8039,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -8072,12 +8072,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -8105,12 +8105,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -8138,12 +8138,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -8172,11 +8172,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -8204,12 +8204,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -8238,11 +8238,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -8286,12 +8286,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -8312,12 +8312,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -8338,12 +8338,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -8364,12 +8364,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -8411,12 +8411,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -8458,12 +8458,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -8505,12 +8505,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -8553,11 +8553,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -8599,12 +8599,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -8647,11 +8647,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -8695,12 +8695,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -8721,12 +8721,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -8747,12 +8747,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -8773,12 +8773,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -8810,12 +8810,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -8847,12 +8847,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -8884,12 +8884,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -8922,11 +8922,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -8958,12 +8958,12 @@ cont {
       priority: 16539
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -8996,11 +8996,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16539
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -9075,12 +9075,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -9108,12 +9108,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -9141,12 +9141,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -9175,11 +9175,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -9207,12 +9207,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -9241,11 +9241,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -9334,12 +9334,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -9381,12 +9381,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -9428,12 +9428,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -9476,11 +9476,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -9522,12 +9522,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -9570,11 +9570,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -9653,12 +9653,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -9690,12 +9690,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -9727,12 +9727,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -9765,11 +9765,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -9801,12 +9801,12 @@ cont {
       priority: 16526
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -9839,11 +9839,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16526
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -9978,12 +9978,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -10004,12 +10004,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -10030,12 +10030,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -10063,12 +10063,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -10096,12 +10096,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -10130,11 +10130,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -10162,12 +10162,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -10196,11 +10196,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -10234,12 +10234,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -10260,12 +10260,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -10286,12 +10286,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -10319,12 +10319,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -10352,12 +10352,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -10386,11 +10386,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -10418,12 +10418,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -10452,11 +10452,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -10490,12 +10490,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -10516,12 +10516,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -10556,12 +10556,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -10603,12 +10603,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -10650,12 +10650,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -10698,11 +10698,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -10744,12 +10744,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -10792,11 +10792,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -10830,12 +10830,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -10856,12 +10856,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -10882,12 +10882,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -10915,12 +10915,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -10952,12 +10952,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -10990,11 +10990,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -11026,12 +11026,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -11064,11 +11064,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -11521,12 +11521,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -11547,12 +11547,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -11580,12 +11580,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -11613,12 +11613,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -11646,12 +11646,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -11680,11 +11680,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -11712,12 +11712,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -11746,11 +11746,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -11810,12 +11810,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -11836,12 +11836,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -11883,12 +11883,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -11930,12 +11930,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -11977,12 +11977,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -12025,11 +12025,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -12071,12 +12071,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -12119,11 +12119,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -12183,12 +12183,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -12209,12 +12209,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -12242,12 +12242,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -12275,12 +12275,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -12312,12 +12312,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -12350,11 +12350,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -12386,12 +12386,12 @@ cont {
       priority: 16513
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -12424,11 +12424,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16513
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -13847,12 +13847,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -13873,12 +13873,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -13899,12 +13899,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -13932,12 +13932,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -13965,12 +13965,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -13999,11 +13999,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -14031,12 +14031,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -14065,11 +14065,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -14103,12 +14103,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -14129,12 +14129,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -14169,12 +14169,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -14216,12 +14216,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -14263,12 +14263,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -14311,11 +14311,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -14357,12 +14357,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -14405,11 +14405,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -14443,12 +14443,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -14469,12 +14469,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -14495,12 +14495,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -14528,12 +14528,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -14565,12 +14565,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -14603,11 +14603,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -14639,12 +14639,12 @@ cont {
       priority: 16486
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -14677,11 +14677,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16486
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -15133,12 +15133,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -15159,12 +15159,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -15185,12 +15185,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -15211,12 +15211,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -15244,12 +15244,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -15277,12 +15277,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -15310,12 +15310,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -15344,11 +15344,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -15376,12 +15376,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -15410,11 +15410,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -15468,12 +15468,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -15494,12 +15494,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -15520,12 +15520,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -15546,12 +15546,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -15593,12 +15593,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -15640,12 +15640,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -15687,12 +15687,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -15735,11 +15735,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -15781,12 +15781,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -15829,11 +15829,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -15887,12 +15887,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 150
+      text_color: 3158064
     }
   }
   element {
@@ -15913,12 +15913,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -15950,12 +15950,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 60
-      text_color: 11711154
+      min_distance: 250
+      text_color: 3158064
     }
   }
   element {
@@ -15987,12 +15987,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -16024,12 +16024,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -16061,12 +16061,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -16098,12 +16098,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -16136,11 +16136,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -16172,12 +16172,12 @@ cont {
       priority: 16565
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -16210,11 +16210,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16565
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -16271,12 +16271,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -16304,12 +16304,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -16337,12 +16337,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -16370,12 +16370,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -16404,11 +16404,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -16436,12 +16436,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -16470,11 +16470,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -16531,12 +16531,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -16578,12 +16578,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -16625,12 +16625,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -16672,12 +16672,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -16720,11 +16720,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -16766,12 +16766,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -16814,11 +16814,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -16886,12 +16886,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 300
+      text_color: 3158064
     }
   }
   element {
@@ -16923,12 +16923,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 100
-      text_color: 11711154
+      min_distance: 400
+      text_color: 3158064
     }
   }
   element {
@@ -16960,12 +16960,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 150
-      text_color: 11711154
+      min_distance: 450
+      text_color: 3158064
     }
   }
   element {
@@ -16997,12 +16997,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 10
-      color: 0
-      stroke_color: 11711154
+      height: 9
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 500
+      text_color: 3158064
     }
   }
   element {
@@ -17035,11 +17035,11 @@ cont {
     }
     shield {
       height: 10
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 250
-      text_color: 11711154
+      min_distance: 550
+      text_color: 3158064
     }
   }
   element {
@@ -17071,12 +17071,12 @@ cont {
       priority: 16552
     }
     shield {
-      height: 11
-      color: 0
-      stroke_color: 11711154
+      height: 10
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 400
-      text_color: 11711154
+      min_distance: 800
+      text_color: 3158064
     }
   }
   element {
@@ -17109,11 +17109,11 @@ cont {
     }
     shield {
       height: 11
-      color: 0
-      stroke_color: 11711154
+      color: 10066329
+      stroke_color: 3158064
       priority: 16552
-      min_distance: 500
-      text_color: 11711154
+      min_distance: 1050
+      text_color: 3158064
     }
   }
 }
@@ -19317,7 +19317,7 @@ cont {
       color: 1511594265
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -19328,7 +19328,7 @@ cont {
       color: 1931024665
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -19339,7 +19339,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -19350,7 +19350,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -19361,7 +19361,7 @@ cont {
       color: 1644825
       border {
         width: 1.0
-        color: 3158064
+        color: 1842204
       }
       priority: 1277
     }
@@ -29525,42 +29525,6 @@ cont {
 cont {
   name: "place-suburb"
   element {
-    scale: 10
-    caption {
-      primary {
-        height: 8
-        color: 5592405
-      }
-      priority: 15000
-    }
-  }
-  element {
-    scale: 11
-    caption {
-      primary {
-        height: 8
-        color: 5592405
-      }
-      priority: 15000
-    }
-  }
-  element {
-    scale: 12
-    caption {
-      primary {
-        height: 9
-        color: 5592405
-      }
-      secondary {
-        height: 8
-        color: 5592405
-        offset_y: 20
-        text: "int_name"
-      }
-      priority: 15000
-    }
-  }
-  element {
     scale: 13
     caption {
       primary {
@@ -40146,6 +40110,41 @@ cont {
   }
 }
 cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+}
+cont {
   name: "shop-computer"
   element {
     scale: 16
@@ -41321,6 +41320,41 @@ cont {
   }
 }
 cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+}
+cont {
   name: "shop-ticket"
   element {
     scale: 16
@@ -43373,7 +43407,7 @@ cont {
 colors {
   value {
     name: "RoadShieldWhiteText"
-    color: 16777215
+    color: 12039862
     x: 0
     y: 0
   }
@@ -43409,13 +43443,13 @@ colors {
   }
   value {
     name: "RoadShieldUKYellowText"
-    color: 16764006
+    color: 11836942
     x: 0
     y: 0
   }
   value {
     name: "RoadShieldBlueBackground"
-    color: 3043273
+    color: 2706568
     x: 0
     y: 0
   }
@@ -43439,7 +43473,7 @@ colors {
   }
   value {
     name: "RoadShieldOrangeBackground"
-    color: 16760320
+    color: 1272880
     x: 0
     y: 0
   }
@@ -43451,7 +43485,7 @@ colors {
   }
   value {
     name: "RoadShieldRedBackground"
-    color: 13445160
+    color: 10426903
     x: 0
     y: 0
   }
@@ -43463,7 +43497,7 @@ colors {
   }
   value {
     name: "RoadShieldBlackText"
-    color: 0
+    color: 2171169
     x: 0
     y: 0
   }
@@ -43499,25 +43533,25 @@ colors {
   }
   value {
     name: "TrafficG3"
-    color: 2156681728
+    color: 2156687378
     x: 0
     y: 0
   }
   value {
     name: "TrafficG2"
-    color: 7870745
+    color: 7542806
     x: 0
     y: 0
   }
   value {
     name: "TrafficG1"
-    color: 7870745
+    color: 7542806
     x: 0
     y: 0
   }
   value {
     name: "TrafficG0"
-    color: 4263680
+    color: 4985359
     x: 0
     y: 0
   }
@@ -43529,7 +43563,7 @@ colors {
   }
   value {
     name: "TrafficG5"
-    color: 2641970
+    color: 3629602
     x: 0
     y: 0
   }
@@ -43553,13 +43587,13 @@ colors {
   }
   value {
     name: "TrafficG4"
-    color: 5592345
+    color: 3629602
     x: 0
     y: 0
   }
   value {
     name: "RoadShieldGreenBackground"
-    color: 2257467
+    color: 1272880
     x: 0
     y: 0
   }
@@ -43571,25 +43605,25 @@ colors {
   }
   value {
     name: "RouteTrafficG1"
-    color: 15744010
+    color: 8327953
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG0"
-    color: 10167040
+    color: 6164237
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG3"
-    color: 2163595048
+    color: 2157871638
     x: 0
     y: 0
   }
   value {
     name: "RouteTrafficG2"
-    color: 15744010
+    color: 8327953
     x: 0
     y: 0
   }
@@ -43601,7 +43635,7 @@ colors {
   }
   value {
     name: "TrafficOutline"
-    color: 0
+    color: 3684408
     x: 0
     y: 0
   }
diff --git a/data/types.txt b/data/types.txt
index bc79430407..52bed12fd5 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1151,3 +1151,5 @@ hwtag|yescar
 hwtag|nocar
 tourism|gallery
 historic|fort
+shop|coffee
+shop|tea
diff --git a/data/visibility.txt b/data/visibility.txt
index 8babd4335c..5e6a3c965e 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -602,7 +602,7 @@ world  00000000000000000000  +
         state  00000011111000000000  +
             USA  00000111111000000000  -
             {}
-        suburb  00000000001111100000  -
+        suburb  00000000000001100000  -
         town  00000000111111111111  -
         village  00000000000111111111  -
         {}
@@ -773,6 +773,7 @@ world  00000000000000000000  +
             {}
         chemist  00000000000000001111  -
         clothes  00000000000000001111  -
+        coffee  00000000000000001111  -
         computer  00000000000000001111  -
         confectionery  00000000000000001111  -
         convenience  00000000000000001111  -
@@ -802,6 +803,7 @@ world  00000000000000000000  +
         shoes  00000000000000001111  -
         sports  00000000000000001111  -
         supermarket  00000000000000111111  -
+        tea  00000000000000001111  -
         ticket  00000000000000001111  -
         toys  00000000000000001111  -
         travel_agency  00000000000000001111  -