From 415e2fc0c2abd871f9f2f4d1b0f13201a7efc006 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 8 Jul 2025 15:56:34 +0700
Subject: [PATCH] [styles] Regenerate for area fills changes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/drules_proto.bin                         |  Bin 436075 -> 441200 bytes
 data/drules_proto.txt                         | 1590 +++++++++++++++--
 data/drules_proto_default_dark.bin            |  Bin 416530 -> 421357 bytes
 data/drules_proto_default_dark.txt            | 1414 ++++++++++++++-
 data/drules_proto_default_light.bin           |  Bin 418327 -> 423877 bytes
 data/drules_proto_default_light.txt           | 1535 +++++++++++++++-
 data/drules_proto_outdoors_dark.bin           |  Bin 437208 -> 441929 bytes
 data/drules_proto_outdoors_dark.txt           | 1384 +++++++++++++-
 data/drules_proto_outdoors_light.bin          |  Bin 439086 -> 444560 bytes
 data/drules_proto_outdoors_light.txt          | 1511 +++++++++++++++-
 data/drules_proto_vehicle_dark.bin            |  Bin 279780 -> 281771 bytes
 data/drules_proto_vehicle_dark.txt            |  675 ++++++-
 data/drules_proto_vehicle_light.bin           |  Bin 279586 -> 281655 bytes
 data/drules_proto_vehicle_light.txt           |  675 ++++++-
 .../include/priorities_1_BG-by-size.prio.txt  |  122 +-
 .../default/include/priorities_3_FG.prio.txt  |    2 +-
 .../include/priorities_4_overlays.prio.txt    |  210 +--
 .../include/priorities_1_BG-by-size.prio.txt  |  120 +-
 .../include/priorities_4_overlays.prio.txt    |  206 +--
 .../include/priorities_1_BG-by-size.prio.txt  |   28 +-
 data/visibility.txt                           |   30 +-
 21 files changed, 8840 insertions(+), 662 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0dac813cae5332a8c4b0981224a7702a442a7f36..549e36471789023b3791544afb545f7cdd4eae77 100644
GIT binary patch
delta 6287
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
E0VT$dWdHyG

delta 3316
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

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 7e7030f4e..552c9b042 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -4340,8 +4340,26 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4359,6 +4377,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4376,6 +4398,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4393,6 +4419,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4669,6 +4699,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4686,6 +4720,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4703,6 +4741,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4719,6 +4761,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4735,6 +4781,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4751,6 +4801,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4768,8 +4822,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4786,6 +4872,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4802,6 +4892,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4818,6 +4912,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4902,8 +5000,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4921,6 +5051,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4937,6 +5071,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4953,6 +5091,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4970,6 +5112,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5315,8 +5471,26 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5333,6 +5507,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5349,6 +5527,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5365,6 +5547,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5449,13 +5635,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 16767702
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6160,8 +6339,33 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6178,6 +6382,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6194,6 +6402,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6477,6 +6689,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6494,6 +6710,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6511,6 +6731,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6527,6 +6751,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6543,6 +6771,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6559,6 +6791,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6855,6 +7091,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7231,6 +7474,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7514,8 +7771,19 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7533,6 +7801,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7550,6 +7822,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7567,6 +7843,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7584,6 +7864,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9972,6 +10256,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10122,6 +10413,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10272,6 +10570,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10422,6 +10727,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10572,6 +10884,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10722,6 +11041,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10872,6 +11198,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11022,6 +11355,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11172,6 +11512,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11322,6 +11669,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11472,6 +11826,13 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -12070,8 +12431,26 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12079,6 +12458,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12086,6 +12469,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12102,6 +12489,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12378,6 +12769,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -13098,8 +13503,26 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13116,6 +13539,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13132,6 +13559,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13148,6 +13579,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13744,6 +14179,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13946,8 +14388,19 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13964,6 +14417,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13981,6 +14438,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13998,6 +14459,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14015,6 +14480,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14869,8 +15338,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14878,6 +15379,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14885,6 +15390,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14901,6 +15410,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -21924,70 +22437,38 @@ cont {
   name: "emergency-mountain_rescue"
   element {
     scale: 12
-    symbol {
-      name: "hospital-m"
-      priority: 3900
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6100
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 13
-    symbol {
-      name: "hospital-m"
-      priority: 3900
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6100
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 14
-    symbol {
-      name: "hospital-m"
-      priority: 3900
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6100
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 15
-    symbol {
-      name: "hospital-m"
-      priority: 3900
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6100
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -22004,6 +22485,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -22020,6 +22505,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -22036,6 +22525,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -22052,6 +22545,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -33966,24 +34463,25 @@ cont {
 cont {
   name: "highway-rest_area"
   element {
-    scale: 14
-    symbol {
-      name: "picnic-m"
-      priority: 3800
-      min_distance: 10
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -6200
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34001,6 +34499,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34017,6 +34519,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34033,6 +34539,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34049,6 +34559,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34065,6 +34579,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -36576,40 +37094,24 @@ cont {
   name: "highway-services"
   element {
     scale: 12
-    symbol {
-      name: "car-repair-s"
-      priority: 4250
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5750
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 13
-    symbol {
-      name: "car-repair-s"
-      priority: 4250
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -5750
+    area {
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -36627,6 +37129,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36644,6 +37150,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36660,6 +37170,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36676,6 +37190,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36692,6 +37210,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36708,6 +37230,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -48356,6 +48882,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -48443,6 +48983,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -50002,46 +50556,60 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
 }
@@ -50120,6 +50688,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -50207,6 +50789,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -50330,6 +50926,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -51012,6 +51622,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -51135,6 +51759,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -52414,8 +53052,19 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52433,6 +53082,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52450,6 +53103,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52467,6 +53124,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52484,6 +53145,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52656,8 +53321,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52675,6 +53358,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52692,6 +53379,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52709,6 +53400,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -55242,6 +55937,20 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -55475,6 +56184,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -55649,6 +56372,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55666,6 +56393,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -56225,8 +56956,33 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -56244,6 +57000,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -56261,6 +57021,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -56278,6 +57042,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -56295,6 +57063,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -58777,8 +59549,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58786,6 +59583,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58802,6 +59603,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58818,6 +59623,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58834,6 +59643,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -66265,8 +67078,26 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66283,6 +67114,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66299,6 +67134,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66315,6 +67154,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -74765,8 +75608,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74774,6 +75649,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74781,6 +75660,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74788,6 +75671,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74796,8 +75683,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74805,6 +75724,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74812,6 +75735,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74819,6 +75746,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74827,8 +75758,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74836,6 +75799,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74843,6 +75810,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74850,6 +75821,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74857,23 +75832,86 @@ cont {
   }
 }
 cont {
-  name: "power-generator-wind"
+  name: "power-generator-solar"
   element {
     scale: 13
-    symbol {
-      name: "dot-m"
-      priority: 120
+    area {
+      color: 15066596
+      priority: -1950
     }
   }
   element {
     scale: 14
-    symbol {
-      name: "dot-m"
-      priority: 120
+    area {
+      color: 15066596
+      priority: -1950
     }
   }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74881,6 +75919,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74888,6 +75930,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74895,6 +75941,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74911,6 +75961,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74927,6 +75981,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75200,8 +76258,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75209,6 +76299,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75216,6 +76310,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75223,6 +76321,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75231,8 +76333,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75240,6 +76374,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75247,6 +76385,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75254,6 +76396,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75262,8 +76408,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75271,6 +76449,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75278,6 +76460,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75285,6 +76471,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75293,8 +76483,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75302,6 +76524,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75309,6 +76535,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75316,6 +76546,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75324,8 +76558,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75333,6 +76599,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75340,6 +76610,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75347,6 +76621,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75357,20 +76635,24 @@ cont {
   name: "power-plant-wind"
   element {
     scale: 13
-    symbol {
-      name: "power_plant_wind-m"
-      priority: 230
+    area {
+      color: 15066596
+      priority: -1950
     }
   }
   element {
     scale: 14
-    symbol {
-      name: "power_plant_wind-m"
-      priority: 230
+    area {
+      color: 15066596
+      priority: -1950
     }
   }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75378,6 +76660,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75394,6 +76680,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75410,6 +76700,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75426,6 +76720,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75442,6 +76740,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75571,8 +76873,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -75589,6 +76937,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 039563ec05cc84b62d92a87b648920f18538dc38..32a4163ef40059db0cae69d83e42ef78b204ffa4 100644
GIT binary patch
delta 6857
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
F{{XZ*;YI)e

delta 3296
zcmb_feQXrh5!ZWrcRnxRyL-ELJ{ucjSAp92Y%s=-KN5pf(e$sF1ga8hPV2k1Z_DoO
zWp@wb`~hu3piruqyyEACP%QN$Q3cenglm<SkfzWm5lM;~+R}VhO;M%LQ2s!wBB!0b
zyS2|YQY#co*8JY=%<s*cH#56;<1bZDpR1a>)e*gl_@Jc8X~i0iB_tz0BAF@D>JQPb
z&K6d2#>><7ohw<N3o-?;!d`xFFNc0c2YR-1o&Ep~^;Xl5dujj&0e8@iUDY(*TT64@
zjx3|oy%BmguPfktdR%?Dn*RXtp_v#`ikgH#WU>Z=ShHQAH}0!tncH3;ZQmY*MH$_F
ze}qj=%~fz~{9@7CF$mK?-TzwT65=ancvU5>BuETMm#=T;R{05));EC^ic$pG80D{H
zJ}~2>tExOK6A=!0cv7(A8#Z{VKS4a1HOLxPO3#`yX$N9`<65pAhzn9EN)com{oBUN
zjlVD9PU;CuH%#EJs1Ewa&rG1`_^tmG{*e9KuPT20b3|MFE8%2>9_U{UQYcE%F5mP!
zj9<a@%EP^IgaBQ(**Qv(eq(b}u+blCSj78=va%Y}qNnQVWY1Er5lCL&{AG|rQHpl=
zmX|p3GB<nwDc#H{mZaKsTd}9+D&|G^pgWXwQZ|Mq!;;g*bcF5Q182FV&tP6~tu)El
zAzK+$O30)QqR|J#^xIMm>$~hNqvl|<2ego#!PV@kt6smOVZm!&zikdGb)LN*K1x4&
zGU_2;@mJ8(Pc+!Ak6%QdcR0Qt)K&h$Y%-ZrOv`TCYa{d?egDZ7c6i?}5jsxa+TY2!
zPQBj+r?)u15u6&zVw!GfdfM(g_!H#$HODV=sLE4tnk?ypZ4Mu*wA&6nfzU;|f!6rG
zC66d(iuN50+n;}b%++dHQ&lw3Mri+-&wl@@1MU+Om@GYSKXtfh|0TNqph)lgL76>9
z4<K>?&(>f@SCxcp_a1r2_rOmPA9eF)$cfPe)aP(4A*U@UeG#rO$S<1JYtajfK}!~D
z>C{n?o_nsA#Xo?KxPEjAENbk)v9EKHUzBWZCQ`btx>rYc4~X{LlNY^p|3ZAF8-}ST
z6iJN_NeM-TagZ<R6VJDK01#RPf(u0Z#Pd6S(F@+$ZpfyUow8v%t{ds50g;|Owb;&_
z`d+?Lr>AQ3!=dMN2iFC?@}1N7f+R&L6r~8V(;hq1yBME9^v(12tL~7BE519W;)*Yy
zirX*O&<~G__U)Iy`C$D%%vZ@86t0|3j6yAB)0U*9<A!V|vNFtqAp10cnmHH>E+8%t
zTp&7NRqo9o3hl!`!tA4QB!WkPtz_T|O~*nLNMs`nMPL=0U9o>W;0v;46R4I&zE(tF
zAvzX~IcoylTpGQB`Cv*JPK`*TF;g~nLV1`l_$t`5XOYwK0d~y+t*}e=i>L)a$OVLr
z7c_zkL<hujedo}w$7}wIcu|$0&P_R%(9@=6WD}O6r^#|4-Oz>W+3|k-LKTD2>zc{Q
zY(mQ0z`$em-8h_E-i@CXAKA(WTpJhx(lErx`vcWJ|1&QnqiMjw5*#YQqy!5kSadPl
z@*w`W`a>A0?gmb4La<PXb0e+$4D*!>jbfUTmZ6p5Ob_Ai-0Pe0JqZ1n-Fyg(xt53V
zbXnvUbb;&lXjU?e(Rt>T@1fcA8Iq#HWz5|>_lE&|r~>V0l8VLrWsIx1a2fqt9uQUp
zf(t|k#BwibcpTOJ8@f!D6*Ftdu_47u%cdDOtwOFl;7U*FcpcZ_CoT|NAUdEucOirS
zSVvxSPEurn64nhX_r@503|GC1`LO%I%z)mE7Y0f0AjQ+Da+-q!79C;Rq>|N0i+>55
zI)Y<d3sf6`)?EEKHhtAFuZU|qB3ZH#&%jiNFM=TZ=X1D);gvqZdXC{bwsr<3XV8%%
zT9y-jh;gLpU3dd)QaY|lNjWy68#_!w{K19_z8t0uy#JsnqrdW!X2`+hS-gsCh8z@u
z-~!PBO}YIq;%nQg-hg`5hlZd}Vo4>V>KY_5k@v47T$r5?aS=LkGQ?tpt7WUpQ5n5_
zk}s@2MX>s;u&T-JCEVK0d$#a_j6Nb8F_;jtAwfhWkbixa71UaE7bpn4Pv<Cv`3iB4
zg5Syu^JrtklDUw&{Vuq-v12JNy61}s^Up9N=Epe#4M>*w0}bW8H>q22Kf7QVoVyG)
zRFphk4VN~ygKP1S)qY_Hi4Hms8D3P_0zM1U770Rj7tbd1?+7$xfks%M5$9_7NBCd~
zElfC=7kA>`b2sEL?@Gy?tGg5T|3kfJe&E~qP$_q6G->E}&Hg{gO<jdA=`W1^H}JA5
zjXhr~OJVfB`zTlCA?sj70BYyfK{poxae?3h(E)4Ob%T4g@-dgs%nrKaunkIRlf|uJ
zH;>~ow#DL__g}I&`1j;4S>EHXgx|(|$kMZhVruY%Ma#tDgF|MA184>Nyu;U&`=rB%
GI{ynS$?)0$

diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index bd50b0537..b25a6baee 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -4308,8 +4308,23 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4327,6 +4342,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4344,6 +4362,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4361,6 +4382,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4637,6 +4661,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4654,6 +4681,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4671,6 +4701,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4687,6 +4720,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4703,6 +4739,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4719,6 +4758,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4736,8 +4778,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4754,6 +4828,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4770,6 +4848,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4786,6 +4868,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4870,8 +4956,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4889,6 +5007,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4905,6 +5027,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4921,6 +5047,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4938,6 +5068,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5283,8 +5427,23 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5301,6 +5460,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5317,6 +5479,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5333,6 +5498,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5417,13 +5585,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 2496790
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6100,8 +6261,29 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6118,6 +6300,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6134,6 +6319,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6383,6 +6571,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6400,6 +6591,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6417,6 +6611,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6433,6 +6630,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6449,6 +6649,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6465,6 +6668,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6761,6 +6967,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7073,6 +7286,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7356,8 +7583,17 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7375,6 +7611,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7392,6 +7631,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7409,6 +7651,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7426,6 +7671,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9670,6 +9918,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9813,6 +10067,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9956,6 +10216,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10099,6 +10365,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10242,6 +10514,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10385,6 +10663,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10528,6 +10812,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10671,6 +10961,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10814,6 +11110,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10957,6 +11259,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11100,6 +11408,12 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -11693,8 +12007,23 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11702,6 +12031,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11709,6 +12041,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11725,6 +12060,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12001,6 +12339,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -12465,8 +12817,23 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12483,6 +12850,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12499,6 +12869,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12515,6 +12888,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13063,6 +13439,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13265,8 +13648,17 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13283,6 +13675,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13300,6 +13695,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13317,6 +13715,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13334,6 +13735,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14172,8 +14576,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14181,6 +14617,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14188,6 +14628,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14204,6 +14648,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -20564,8 +21012,29 @@ cont {
 }
 cont {
   name: "emergency-mountain_rescue"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20582,6 +21051,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20598,6 +21070,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20614,6 +21089,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20630,6 +21108,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -31523,8 +32004,23 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31542,6 +32038,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31558,6 +32057,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31574,6 +32076,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31590,6 +32095,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31606,6 +32114,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -34045,8 +34556,17 @@ cont {
 }
 cont {
   name: "highway-services"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -34064,6 +34584,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34081,6 +34604,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34097,6 +34623,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34113,6 +34642,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34129,6 +34661,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34145,6 +34680,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -45165,6 +45703,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -45252,6 +45804,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -46811,46 +47377,52 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
 }
@@ -46929,6 +47501,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47016,6 +47602,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47139,6 +47739,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -47821,6 +48435,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47944,6 +48572,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49223,8 +49865,17 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49242,6 +49893,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49259,6 +49913,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49276,6 +49933,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49293,6 +49953,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49433,8 +50096,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 2763300
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2763300
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49452,6 +50133,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49469,6 +50154,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49486,6 +50175,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -51973,6 +52666,18 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -52200,6 +52905,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 2171163
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2171163
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -52374,6 +53093,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 2500128
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -52391,6 +53114,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 2500128
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -52950,8 +53677,29 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52969,6 +53717,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52986,6 +53737,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -53003,6 +53757,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -53020,6 +53777,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -54864,8 +55624,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54873,6 +55658,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54889,6 +55678,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54905,6 +55698,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54921,6 +55718,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -61966,8 +62767,23 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -61984,6 +62800,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -62000,6 +62819,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -62016,6 +62838,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -69792,8 +70617,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69801,6 +70658,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69808,6 +70669,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69815,6 +70680,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69823,8 +70692,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69832,6 +70733,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69839,6 +70744,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69846,6 +70755,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69854,8 +70767,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69863,6 +70808,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69870,6 +70819,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69877,6 +70830,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69884,9 +70841,86 @@ cont {
   }
 }
 cont {
-  name: "power-generator-wind"
+  name: "power-generator-solar"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69894,6 +70928,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69901,6 +70939,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69908,6 +70950,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69924,6 +70970,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69940,6 +70990,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69994,8 +71048,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70003,6 +71089,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70010,6 +71100,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70017,6 +71111,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70025,8 +71123,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70034,6 +71164,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70041,6 +71175,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70048,6 +71186,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70056,8 +71198,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70065,6 +71239,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70072,6 +71250,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70079,6 +71261,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70087,8 +71273,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70096,6 +71314,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70103,6 +71325,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70110,6 +71336,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70118,8 +71348,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70127,6 +71389,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70134,6 +71400,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70141,6 +71411,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70149,8 +71423,26 @@ cont {
 }
 cont {
   name: "power-plant-wind"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70158,6 +71450,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70174,6 +71470,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70190,6 +71490,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70206,6 +71510,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70222,6 +71530,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70306,8 +71618,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -70324,6 +71682,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -124181,6 +125543,18 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 867adbdcdc15cc31f7520a086ca2ede8e37806f3..3d369f0aabc6513c4a994b651a89d41364cf233c 100644
GIT binary patch
delta 6038
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
MH(zmhTEDvNKQVM&9smFU

delta 3224
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
ZSB(Vx-bkc+;DdqAd_R;8b-I4N?*EfB*cSi*

diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 5b1ce9f4f..a6d8e5ad4 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -4308,8 +4308,26 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4327,6 +4345,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4344,6 +4366,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4361,6 +4387,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4637,6 +4667,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4654,6 +4688,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4671,6 +4709,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4687,6 +4729,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4703,6 +4749,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4719,6 +4769,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4736,8 +4790,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4754,6 +4840,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4770,6 +4860,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4786,6 +4880,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4870,8 +4968,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4889,6 +5019,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4905,6 +5039,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4921,6 +5059,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4938,6 +5080,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5283,8 +5439,26 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5301,6 +5475,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5317,6 +5495,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5333,6 +5515,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5417,13 +5603,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 16767702
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6100,8 +6279,33 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6118,6 +6322,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6134,6 +6342,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6383,6 +6595,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6400,6 +6616,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6417,6 +6637,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6433,6 +6657,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6449,6 +6677,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6465,6 +6697,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6761,6 +6997,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7073,6 +7316,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7356,8 +7613,19 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7375,6 +7643,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7392,6 +7664,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7409,6 +7685,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7426,6 +7706,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9670,6 +9954,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9820,6 +10111,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9970,6 +10268,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10120,6 +10425,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10270,6 +10582,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10420,6 +10739,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10570,6 +10896,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10720,6 +11053,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10870,6 +11210,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11020,6 +11367,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11170,6 +11524,13 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -11768,8 +12129,26 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11777,6 +12156,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11784,6 +12167,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11800,6 +12187,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12076,6 +12467,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -12540,8 +12945,26 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12558,6 +12981,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12574,6 +13001,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12590,6 +13021,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13138,6 +13573,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13340,8 +13782,19 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13358,6 +13811,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13375,6 +13832,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13392,6 +13853,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13409,6 +13874,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14247,8 +14716,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14256,6 +14757,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14263,6 +14768,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14279,6 +14788,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -20639,8 +21152,33 @@ cont {
 }
 cont {
   name: "emergency-mountain_rescue"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20657,6 +21195,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20673,6 +21215,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20689,6 +21235,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -20705,6 +21255,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -31445,8 +31999,26 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31464,6 +32036,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31480,6 +32056,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31496,6 +32076,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31512,6 +32096,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -31528,6 +32116,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33940,8 +34532,19 @@ cont {
 }
 cont {
   name: "highway-services"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -33959,6 +34562,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -33976,6 +34583,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -33992,6 +34603,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34008,6 +34623,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34024,6 +34643,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -34040,6 +34663,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -44976,6 +45603,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -45063,6 +45704,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -46622,46 +47277,60 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
 }
@@ -46740,6 +47409,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -46827,6 +47510,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -46950,6 +47647,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -47632,6 +48343,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47755,6 +48480,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49034,8 +49773,19 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49053,6 +49803,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49070,6 +49824,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49087,6 +49845,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49104,6 +49866,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -49244,8 +50010,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49263,6 +50047,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49280,6 +50068,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -49297,6 +50089,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -51784,6 +52580,20 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -52017,6 +52827,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -52191,6 +53015,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -52208,6 +53036,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -52767,8 +53599,33 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52786,6 +53643,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52803,6 +53664,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52820,6 +53685,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -52837,6 +53706,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -54699,8 +55572,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54708,6 +55606,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54724,6 +55626,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54740,6 +55646,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -54756,6 +55666,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -61821,8 +62735,26 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -61839,6 +62771,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -61855,6 +62791,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -61871,6 +62811,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -69658,8 +70602,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69667,6 +70643,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69674,6 +70654,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69681,6 +70665,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69689,8 +70677,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69698,6 +70718,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69705,6 +70729,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69712,6 +70740,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69720,8 +70752,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69729,6 +70793,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69736,6 +70804,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69743,6 +70815,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -69750,9 +70826,86 @@ cont {
   }
 }
 cont {
-  name: "power-generator-wind"
+  name: "power-generator-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69760,6 +70913,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69767,6 +70924,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -69774,6 +70935,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69790,6 +70955,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69806,6 +70975,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -69860,8 +71033,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69869,6 +71074,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69876,6 +71085,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69883,6 +71096,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69891,8 +71108,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69900,6 +71149,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69907,6 +71160,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69914,6 +71171,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69922,8 +71183,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69931,6 +71224,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69938,6 +71235,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69945,6 +71246,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69953,8 +71258,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69962,6 +71299,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69969,6 +71310,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69976,6 +71321,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69984,8 +71333,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -69993,6 +71374,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70000,6 +71385,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70007,6 +71396,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -70015,8 +71408,26 @@ cont {
 }
 cont {
   name: "power-plant-wind"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70024,6 +71435,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70040,6 +71455,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70056,6 +71475,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70072,6 +71495,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70088,6 +71515,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -70172,8 +71603,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -70190,6 +71667,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -124047,6 +125528,20 @@ cont {
 }
 cont {
   name: "tourism-camp_site"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 44f785b741b6fd771a97b3a7c87f5d787a2f886a..826b054e170bd688e0af35eee0a8b72dc1a1be6d 100644
GIT binary patch
delta 7414
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
HzgGWW2dzXh

delta 3459
zcmb`Ke{dAl9l+<kz1&@1NbYWTb6hS-L*gJml1l;tF>)ZWolNVr<JcA|q0F(|ExDDw
z+jIA>A(UShI!p=(@l_tQHN}Xf)1ec{3X4!d$7*#PP}<S*hmO`xb!u&^cI-^2So+<&
zU2-}2!*Tp0`F_6Neeb*9?|a|(-FGitjb8a<^h8Hb<aI=XQbx`y`Qcbn(i20Hk><Pn
zA$qc>lc`s$YUoovx3WiFxKx7K=D_W7&hsmdw9<8VG*ENtU0jbpKrbw<r|aTXv?bm|
zAG{+<*T-AvS&-e!d~_lnrdF@b&2;Y4lAK+9))XagAriVCMp{u*5R1$&fH=mMM``Es
zFt@<Z19yWIY)Ov{`sn!bcFN!RV)z9_>aNdLm8_EFV=#4KMF-ao(|)>QK1jilBFK3W
z@*XCE>vJ?!l?P>BgcMLhFc0_jd7>X6!cPq-==ro(Fl2raIR2o2p$C9>L2y9?xYl~P
z%ymjj<~7{_*LBgL|KQ{y6gl`Y4XzMP^3?^^cmmO7_s%RP$L=j9SCXPR^P9iJ_*qQf
z{&pOq573U4^K07u!M0lB-B6HKnuxb?^B|ZbE9ZjbX>gS-1xJb?=a|~6A9LbGZfc9u
znvqlTl4`~V&Ul($$3%2f+^A$zvOXy3c{%GWL_OUxF4Aku=9=3Qo4Cfqm<aCZjHGXr
z^Ep*Y%KSoqke*D|)2}3(*tQn0kDf}#*tIqXx&tNP7WzdP)@>$J%UaMb`q<7U^U}`u
zk>@qLh`MNle|;g9N-IX*{KpSX<av`LZMK<Cj8vOfcArI_pL@t{j-`=a+Bt_F9c`iF
zt~qqwo>uzZU9)XzPW&j0Jg;zMo->koGn$^!vNS>K>4CjIvt{oH@;uFvFWCdC(~xz6
z@AcQwzWp=JfA8Cg(DSr|HhJ%thZG}Sob|u`KJ%shBhC}5jr!<1D$;u%_L<|Oj`<dI
z9X;yK%}W}jVb3+c@yG$hkKn2D%xS8UlqcD1-mm`xk%+sVx||$NLgfy|l5#c=r7!wJ
zZ9!5qWzR&OnE_V*Ce}{a_4~(S^od6Wx_PY0{KMEPE_|l!rA9KXX{x)c=8o|f{4F0L
zGShv#p(PbbO>B^oiVBUOSmSGtJ2mcrKphaxwZ|vD=ouO`!(2bC+~wtPw9FcFt+}UI
zu<xI0uIhn8ZJ@c+4fM;W8@XO6)9mTnLGq3i94UhAF}GUr8TdG&=bmeg-z4$hdvBIF
zSRwIg%R!(0&aC1p?7FXc^7+TVMZ2HyuwxPQH7@3_J=lOcK-RGj8&H@%1phz_Ow)q4
zW)BLvz`G#0AllGwy%I&A(2moXgwo1jdPo|M>9UbeK-ZG^kiQO2sXwPAp%cY2kt@y6
zjsmQ40(G#b9`Od**aT{3@4967C^kBQME2GM1O=UHnkHV?>aFw%w52KXcT9rrTMb$N
z9u$-Ty|Ru)FCx2#1lWKLUH%~Z$wkx&5ORTM;Y&q};DTsF%(`$1eSakK4kDr|!I3cJ
zSW?RxdA*R#D_WLG58#Up44Sn2R8AF=lKsf8D)#DXTu=YDtlB!h8h=thu$lzianMkt
zK?sld15vO4@Gn!5EO4-lLuJgDu~5dM%PgM5e+j=0t=WBneSjfOsNZ6c_`jHS>o|&f
z*+;+T1a{9>JkQ#@1<yv2qtFN4S+?Aus4CwF(f=ur@3IE+_>52d7*35l=7EBw>%;sF
zj)XVSRDQaosIdFRcU$MS;k|W{-LO5XtQZAdj-|B0L=Ji-d{TpK>pooCjB_R6nFE3g
zq75-?{2_b=;r}4E<p7RyOJMt2NAY3+-UY!0(S}9VUq|u4EdE71dgskhj+&mgh9>c5
z-0&PG_3i^B2X-S->ND1oQ}|Of^HUBoawZyiDWw!LaJXvOn1y3pr@zhu826$P)^{F<
zONDhFcd|qT``8=j@qBi`rUN-|4SVlAZeeG0UcN-l@zRia)`biBpRM!XfKPQs$|f>W
zN{$U_`bLB2p;y$AYUn=jr5uLy@|!BY19I+t2e)$_kh24V3!)A4tyzD@C)PK-3`MDJ
z*Z^lBmQr%6mVv5F7UxI$xpsDKH}=v!lQryT{aiD9l^`EIJ4s5~hd$(E5BGDoTL0?j
z?p|}>N)pIvL$V$ll(VufK{R{-+Hei=mCTvQCNS`o2BFd*PBW0ztm|<uy#0%CwT9GJ
zL>NmCr*!Qz#JMp5&9Wkuia?)+>p-RZAvj-rt-rRdnpCB<JnYUUQ0u0vfpWDQD!uC%
z*Tr?i9y-9gAh;mf&}khx#>G6_SCX32d*MQn&GSK6^cho&{w@Lwe}hH1!6Ht#kO2}b
za|;bkQg7;e`{!{EJ+9pOpk&<C_h)gvy)y7MBvkIZw8dZ4s#G{PG!^dJpF8%-(62)C
zE04WcKaJ2z_MPM!JbWX3rCbU)v=|BoY>T+XP%sYgE(k7&Hr!?%n&f&A+RQGSoB&r!
z=$ub--5$7uio1c}&tsi?vPyk<)?*$L%4-E(F*5MOCX-7TN?wL`Uklgp@!uXoY{w37
zgbnQQwvxW$-P|?yf*vRv)JyJ!@0By@#Dm@*&_fkEU!e;Xx>%+!vD$v%ofH2*__iH~

diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 639aded0e..a271cc71e 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -4331,8 +4331,23 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4350,6 +4365,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4367,6 +4385,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4384,6 +4405,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4660,6 +4684,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4677,6 +4704,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4694,6 +4724,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4710,6 +4743,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4726,6 +4762,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4742,6 +4781,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4759,8 +4801,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4777,6 +4851,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4793,6 +4871,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4809,6 +4891,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2498323
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4893,8 +4979,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4912,6 +5030,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4928,6 +5050,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4944,6 +5070,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2496790
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4961,6 +5091,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5306,8 +5450,23 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5324,6 +5483,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5340,6 +5502,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5356,6 +5521,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5440,13 +5608,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 2496790
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6187,8 +6348,29 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6205,6 +6387,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6221,6 +6406,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6470,6 +6658,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6487,6 +6678,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6504,6 +6698,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6520,6 +6717,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6536,6 +6736,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6552,6 +6755,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6848,6 +7054,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 2496790
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7215,6 +7428,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7498,8 +7725,17 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7517,6 +7753,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7534,6 +7773,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7551,6 +7793,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7568,6 +7813,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9812,6 +10060,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9955,6 +10209,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10098,6 +10358,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10241,6 +10507,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10384,6 +10656,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10527,6 +10805,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10670,6 +10954,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10813,6 +11103,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10956,6 +11252,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11099,6 +11401,12 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11242,6 +11550,12 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -11835,8 +12149,23 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11844,6 +12173,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11851,6 +12183,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11867,6 +12202,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12143,6 +12481,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -12850,8 +13202,23 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12868,6 +13235,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12884,6 +13254,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12900,6 +13273,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13469,6 +13845,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13671,8 +14054,17 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13689,6 +14081,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13706,6 +14101,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13723,6 +14121,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13740,6 +14141,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14578,8 +14982,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14587,6 +15023,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14594,6 +15034,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14610,6 +15054,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -21320,6 +21768,9 @@ cont {
   }
   element {
     scale: 13
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-s"
       priority: 3900
@@ -21336,6 +21787,9 @@ cont {
   }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21352,6 +21806,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21368,6 +21825,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21384,6 +21844,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21400,6 +21863,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21416,6 +21882,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21432,6 +21901,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -33506,8 +33978,17 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33515,6 +33996,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33532,6 +34016,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33548,6 +34035,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33564,6 +34054,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33580,6 +34073,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33596,6 +34092,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -36107,8 +36606,17 @@ cont {
 }
 cont {
   name: "highway-services"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -36126,6 +36634,9 @@ cont {
   }
   element {
     scale: 15
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36143,6 +36654,9 @@ cont {
   }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36159,6 +36673,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36175,6 +36692,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36191,6 +36711,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36207,6 +36730,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -47857,6 +48383,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47944,6 +48484,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 2498323
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2498323
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -49595,46 +50149,52 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 1643545
-      priority: 110
+      priority: -1830
     }
   }
 }
@@ -49713,6 +50273,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49800,6 +50374,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49923,6 +50511,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -50605,6 +51207,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -50728,6 +51344,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -52007,8 +52637,17 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52026,6 +52665,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52043,6 +52685,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52060,6 +52705,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52077,6 +52725,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52240,8 +52891,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 2763300
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2763300
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52259,6 +52928,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52276,6 +52949,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52293,6 +52970,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 2763300
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -54817,6 +55498,18 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -55044,6 +55737,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 2171163
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 2171163
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -55218,6 +55925,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 2500128
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55235,6 +55946,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 2500128
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55794,8 +56509,29 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55813,6 +56549,9 @@ cont {
   }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55830,6 +56569,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55847,6 +56589,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55864,6 +56609,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -58669,8 +59417,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58678,6 +59451,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58694,6 +59471,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58710,6 +59491,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58726,6 +59511,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -66323,8 +67112,23 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66341,6 +67145,9 @@ cont {
   }
   element {
     scale: 18
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66357,6 +67164,9 @@ cont {
   }
   element {
     scale: 19
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66373,6 +67183,9 @@ cont {
   }
   element {
     scale: 20
+    area {
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -74847,8 +75660,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74856,6 +75701,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74863,6 +75712,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74870,6 +75723,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74878,8 +75735,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74887,6 +75776,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74894,6 +75787,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74901,6 +75798,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74909,8 +75810,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74918,6 +75851,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74925,6 +75862,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74932,16 +75873,83 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
     }
   }
 }
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+}
 cont {
   name: "power-generator-wind"
   element {
     scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74949,6 +75957,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74956,6 +75968,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74963,6 +75979,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74979,6 +75999,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74995,6 +76019,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75011,6 +76039,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75027,6 +76059,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75344,8 +76380,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75353,6 +76421,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75360,6 +76432,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75367,6 +76443,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75375,8 +76455,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75384,6 +76496,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75391,6 +76507,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75398,6 +76518,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75406,8 +76530,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75415,6 +76571,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75422,6 +76582,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75429,6 +76593,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75437,8 +76605,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75446,6 +76646,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75453,6 +76657,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75460,6 +76668,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75468,8 +76680,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75477,6 +76721,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75484,6 +76732,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75491,6 +76743,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75501,6 +76757,10 @@ cont {
   name: "power-plant-wind"
   element {
     scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75508,6 +76768,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75515,6 +76779,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75522,6 +76790,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75538,6 +76810,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75554,6 +76830,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75570,6 +76850,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75586,6 +76870,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75715,8 +77003,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1643545
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -75733,6 +77067,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 1643545
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -130339,7 +131677,6 @@ cont {
   element {
     scale: 13
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130360,7 +131697,6 @@ cont {
   element {
     scale: 14
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130381,7 +131717,6 @@ cont {
   element {
     scale: 15
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130402,7 +131737,6 @@ cont {
   element {
     scale: 16
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130422,7 +131756,6 @@ cont {
   element {
     scale: 17
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130442,7 +131775,6 @@ cont {
   element {
     scale: 18
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130462,7 +131794,6 @@ cont {
   element {
     scale: 19
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
@@ -130482,7 +131813,6 @@ cont {
   element {
     scale: 20
     area {
-      color: 2499106
       priority: -1830
     }
     symbol {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 0807a7984c4e4a5b44d8cd048af7fb2f93679a7e..8f71318e1559dade61a911f92af9784d117ca1bf 100644
GIT binary patch
delta 7484
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
U2D3=jdh;Xr@xiPp4F0w7-x@Y+`2YX_

delta 3452
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

diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index abb5ffd63..6b9ae9c2b 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -4331,8 +4331,26 @@ cont {
 }
 cont {
   name: "amenity-car_wash"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4350,6 +4368,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4367,6 +4389,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4384,6 +4410,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-wash-m"
       priority: 1600
@@ -4660,6 +4690,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4677,6 +4711,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4694,6 +4732,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4710,6 +4752,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4726,6 +4772,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4742,6 +4792,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "charging-station-m"
       priority: 4270
@@ -4759,8 +4813,40 @@ cont {
 }
 cont {
   name: "amenity-childcare"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4777,6 +4863,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4793,6 +4883,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4809,6 +4903,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16113596
+      priority: -1960
+    }
     symbol {
       name: "kindergarten-m"
       priority: 1600
@@ -4893,8 +4991,40 @@ cont {
 }
 cont {
   name: "amenity-clinic"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4912,6 +5042,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4928,6 +5062,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4944,6 +5082,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16767702
+      priority: -1960
+    }
     symbol {
       name: "clinic-m"
       priority: 2000
@@ -4961,6 +5103,20 @@ cont {
 }
 cont {
   name: "amenity-college"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -5306,8 +5462,26 @@ cont {
 }
 cont {
   name: "amenity-courthouse"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5324,6 +5498,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5340,6 +5518,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5356,6 +5538,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "public-building-m"
       priority: 2000
@@ -5440,13 +5626,6 @@ cont {
 }
 cont {
   name: "amenity-doctors"
-  element {
-    scale: 14
-    area {
-      color: 16767702
-      priority: -1770
-    }
-  }
   element {
     scale: 15
     area {
@@ -6187,8 +6366,33 @@ cont {
 }
 cont {
   name: "amenity-fire_station"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6205,6 +6409,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6221,6 +6429,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fire_station-m"
       priority: 500
@@ -6470,6 +6682,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6487,6 +6703,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6504,6 +6724,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6520,6 +6744,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6536,6 +6764,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6552,6 +6784,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "fuel-m"
       priority: 4270
@@ -6848,6 +7084,13 @@ cont {
 }
 cont {
   name: "amenity-hospital"
+  element {
+    scale: 13
+    area {
+      color: 16767702
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -7215,6 +7458,20 @@ cont {
 }
 cont {
   name: "amenity-kindergarten"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -7498,8 +7755,19 @@ cont {
 }
 cont {
   name: "amenity-marketplace"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7517,6 +7785,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7534,6 +7806,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7551,6 +7827,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -7568,6 +7848,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "marketplace-m"
       priority: 2700
@@ -9812,6 +10096,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -9962,6 +10253,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10112,6 +10410,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10262,6 +10567,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-jehovahs_witness"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10412,6 +10724,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-christian-mormon"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10562,6 +10881,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10712,6 +11038,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -10862,6 +11195,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11012,6 +11352,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11162,6 +11509,13 @@ cont {
 }
 cont {
   name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
   element {
     scale: 14
     area {
@@ -11312,6 +11666,13 @@ cont {
 }
 cont {
   name: "amenity-police"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
     area {
@@ -11910,8 +12271,26 @@ cont {
 }
 cont {
   name: "amenity-recycling-centre"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11919,6 +12298,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11926,6 +12309,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -11942,6 +12329,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "recycling-m"
       priority: 1600
@@ -12218,6 +12609,20 @@ cont {
 }
 cont {
   name: "amenity-school"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 15
     area {
@@ -12925,8 +13330,26 @@ cont {
 }
 cont {
   name: "amenity-social_facility"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12943,6 +13366,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12959,6 +13386,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -12975,6 +13406,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "social_facility-m"
       priority: 850
@@ -13544,6 +13979,13 @@ cont {
 }
 cont {
   name: "amenity-university"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1960
+    }
+  }
   element {
     scale: 14
     area {
@@ -13746,8 +14188,19 @@ cont {
 }
 cont {
   name: "amenity-vehicle_inspection"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13764,6 +14217,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13781,6 +14238,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13798,6 +14259,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -13815,6 +14280,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "vehicle_inspection-m"
       priority: 2400
@@ -14653,8 +15122,40 @@ cont {
 }
 cont {
   name: "amenity-waste_transfer_station"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14662,6 +15163,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14669,6 +15174,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -14685,6 +15194,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "recycling-m"
       priority: 850
@@ -21395,6 +21908,10 @@ cont {
   }
   element {
     scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-s"
       priority: 3900
@@ -21411,6 +21928,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21427,6 +21948,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21443,6 +21968,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21459,6 +21988,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21475,6 +22008,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21491,6 +22028,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -21507,6 +22048,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "hospital-m"
       priority: 3900
@@ -33428,8 +33973,19 @@ cont {
 }
 cont {
   name: "highway-rest_area"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33437,6 +33993,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33454,6 +34014,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33470,6 +34034,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33486,6 +34054,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33502,6 +34074,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -33518,6 +34094,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "picnic-m"
       priority: 3800
@@ -36002,8 +36582,19 @@ cont {
 }
 cont {
   name: "highway-services"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-s"
       priority: 4250
@@ -36021,6 +36612,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36038,6 +36633,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36054,6 +36653,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36070,6 +36673,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36086,6 +36693,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -36102,6 +36713,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "car-repair-m"
       priority: 4250
@@ -47668,6 +48283,20 @@ cont {
 }
 cont {
   name: "landuse-construction"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -47755,6 +48384,20 @@ cont {
 }
 cont {
   name: "landuse-education"
+  element {
+    scale: 13
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16113596
+      priority: -1970
+    }
+  }
   element {
     scale: 15
     area {
@@ -49406,46 +50049,60 @@ cont {
 }
 cont {
   name: "landuse-garages"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 16
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 17
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 18
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 19
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
   element {
     scale: 20
     area {
-      color: 15066596
-      priority: 110
+      color: 16445409
+      priority: -1830
     }
   }
 }
@@ -49524,6 +50181,20 @@ cont {
 }
 cont {
   name: "landuse-industrial"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49611,6 +50282,20 @@ cont {
 }
 cont {
   name: "landuse-industrial-mine"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -49734,6 +50419,20 @@ cont {
 }
 cont {
   name: "landuse-landfill"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1780
+    }
+  }
   element {
     scale: 15
     area {
@@ -50416,6 +51115,20 @@ cont {
 }
 cont {
   name: "landuse-quarry"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -50539,6 +51252,20 @@ cont {
 }
 cont {
   name: "landuse-railway"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 15
     area {
@@ -51818,8 +52545,19 @@ cont {
 }
 cont {
   name: "leisure-dog_park"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -51837,6 +52575,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -51854,6 +52596,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -51871,6 +52617,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -51888,6 +52638,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "dog_park-m"
       priority: 2300
@@ -52051,8 +52805,26 @@ cont {
 }
 cont {
   name: "leisure-fitness_station"
+  element {
+    scale: 15
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13952918
+      priority: -1920
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52070,6 +52842,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52087,6 +52863,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -52104,6 +52884,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 13952918
+      priority: -1920
+    }
     symbol {
       name: "fitness_station-m"
       priority: 1500
@@ -54628,6 +55412,20 @@ cont {
 }
 cont {
   name: "leisure-resort"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 15
     area {
@@ -54861,6 +55659,20 @@ cont {
 }
 cont {
   name: "leisure-sports_centre"
+  element {
+    scale: 13
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16117459
+      priority: -1810
+    }
+  }
   element {
     scale: 15
     area {
@@ -55035,6 +55847,10 @@ cont {
   name: "leisure-stadium"
   element {
     scale: 13
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55052,6 +55868,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15263939
+      priority: -1750
+    }
     symbol {
       name: "stadium-s"
       priority: 5100
@@ -55611,8 +56431,33 @@ cont {
 }
 cont {
   name: "leisure-water_park"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55630,6 +56475,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55647,6 +56496,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55664,6 +56517,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -55681,6 +56538,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "swimming-m"
       priority: 5200
@@ -58504,8 +59365,33 @@ cont {
 }
 cont {
   name: "man_made-works"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58513,6 +59399,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58529,6 +59419,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58545,6 +59439,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -58561,6 +59459,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "factory-m"
       priority: 700
@@ -66178,8 +67080,26 @@ cont {
 }
 cont {
   name: "office-diplomatic"
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1830
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66196,6 +67116,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66212,6 +67136,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -66228,6 +67156,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 16445409
+      priority: -1830
+    }
     symbol {
       name: "embassy-m"
       priority: 500
@@ -74713,8 +75645,40 @@ cont {
 }
 cont {
   name: "power-generator"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74722,6 +75686,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74729,6 +75697,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74736,6 +75708,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74744,8 +75720,40 @@ cont {
 }
 cont {
   name: "power-generator-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74753,6 +75761,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74760,6 +75772,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74767,6 +75783,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74775,8 +75795,40 @@ cont {
 }
 cont {
   name: "power-generator-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74784,6 +75836,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74791,6 +75847,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
@@ -74798,16 +75858,83 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 120
     }
   }
 }
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+}
 cont {
   name: "power-generator-wind"
   element {
     scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74815,6 +75942,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74822,6 +75953,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "dot-m"
       priority: 120
@@ -74829,6 +75964,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74845,6 +75984,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74861,6 +76004,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74877,6 +76024,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -74893,6 +76044,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "wind_turbine-m"
       priority: 120
@@ -75210,8 +76365,40 @@ cont {
 }
 cont {
   name: "power-plant"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75219,6 +76406,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75226,6 +76417,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75233,6 +76428,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75241,8 +76440,40 @@ cont {
 }
 cont {
   name: "power-plant-coal"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75250,6 +76481,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75257,6 +76492,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75264,6 +76503,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75272,8 +76515,40 @@ cont {
 }
 cont {
   name: "power-plant-gas"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75281,6 +76556,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75288,6 +76567,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75295,6 +76578,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75303,8 +76590,40 @@ cont {
 }
 cont {
   name: "power-plant-hydro"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75312,6 +76631,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75319,6 +76642,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75326,6 +76653,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75334,8 +76665,40 @@ cont {
 }
 cont {
   name: "power-plant-solar"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75343,6 +76706,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75350,6 +76717,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75357,6 +76728,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: 230
@@ -75367,6 +76742,10 @@ cont {
   name: "power-plant-wind"
   element {
     scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75374,6 +76753,10 @@ cont {
   }
   element {
     scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75381,6 +76764,10 @@ cont {
   }
   element {
     scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75388,6 +76775,10 @@ cont {
   }
   element {
     scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75404,6 +76795,10 @@ cont {
   }
   element {
     scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75420,6 +76815,10 @@ cont {
   }
   element {
     scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75436,6 +76835,10 @@ cont {
   }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75452,6 +76855,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power_plant_wind-m"
       priority: 230
@@ -75581,8 +76988,54 @@ cont {
 }
 cont {
   name: "power-substation"
+  element {
+    scale: 13
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15066596
+      priority: -1950
+    }
+  }
   element {
     scale: 19
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -75599,6 +77052,10 @@ cont {
   }
   element {
     scale: 20
+    area {
+      color: 15066596
+      priority: -1950
+    }
     symbol {
       name: "power-m"
       priority: -9990
@@ -130205,7 +131662,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130226,7 +131683,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130247,7 +131704,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130268,7 +131725,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130288,7 +131745,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130308,7 +131765,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130328,7 +131785,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
@@ -130348,7 +131805,7 @@ cont {
   element {
     scale: 20
     area {
-      color: 16577510
+      color: 16445409
       priority: -1830
     }
     symbol {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 262274f1c97ccdfada4dd88c9d7e0126f62c9a19..ff0724db151755e7d75f765f278ed30058cf4c7e 100644
GIT binary patch
delta 558
zcmaFTDY$y3;087ywRwzOa*4UAd6^}Zy5)(*C8_ZxMTvREX{kl=#U+U)nfZA_!W{h5
zKV~qBO!v-YOmAlM+0N#}7%aVgOFCnzo>(6v7hi5-UVLt1N~&&oeo=NYs`~Ak(-<c=
ziT5*d@fYNmrxxj^r{<*=C6?qDp{kRf%*Z8-rb0J85zRE&sf=8r=&CX*Q;PCYO~b0L
zI6o&5%~qKyj9en<=9OpWrJx!o+|9_v4N+E*lbBb6Dl0L8kxKwcRyR36F$Yx%lK;U5
vVERmQA|sa|vLRS}g`ozEk1!mA=^G>^#idDDW4V2g1QQT5Z{H)qqM-u-cV4y3

delta 134
zcmZ2IQ}9Wr;089I=H))ym-{dVOGia=@#iGwrIZ$@>ZT_aC8nnq3vqGqOR;hEPBD>)
t0<r~=*n&uGAtbgi5?chu-u^S4u}p8<bjHa|?ac~IK+L?oS%F1E2LSuVBq;y@

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 45730b3cd..fc7ac6484 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -5738,6 +5738,51 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-waste_transfer_station"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "amenity-water_point"
   element {
@@ -28725,51 +28770,6 @@ cont {
     apply_if: "!name"
   }
 }
-cont {
-  name: "landuse-garages"
-  element {
-    scale: 15
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 854541
-      priority: 90
-    }
-  }
-}
 cont {
   name: "landuse-grass"
   element {
@@ -32450,6 +32450,51 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-works"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "natural-bare_rock"
   element {
@@ -43165,6 +43210,546 @@ cont {
     }
   }
 }
+cont {
+  name: "power-generator"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-gas"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-hydro"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-coal"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-gas"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-hydro"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-solar"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-wind"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-substation"
+  element {
+    scale: 15
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 854541
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 9de3261d6b46671c6d2353a2986e6d2b20f6f3bd..d44f0c902fd5ce9241ca0b3595c56584e10ebd02 100644
GIT binary patch
delta 429
zcmZ3~A-H{p;D#<Axh0HTa*4UAd6^}Zy5)(*C8_ZxMTvREX{kl=#U+W;XL~VrHh1}K
z@A6?>FSLDDJmV&Pp(%`9e7T8v@wtg9sk-I)McKvE=X)`>POq5D$g@47pYd9|@Ki=F
z{(}7S)FR#V)V$Q9#FG3Xup051j9kKK61wS$5CbG<GjfTdOJ-E26y<~UVwEn=&q;(B
zEisFcO9Wkad1hV;STp}bMlNoMY(Y+9UI|!GWEvxv0Ft0?a(-eCSO&=hVC8T(icV+b
o5=7R5a36*g!fhB9!QCZ*a6)lu5-h~q^~9Ngn0dRNILj9u0KY4ma{vGU

delta 141
zcmdl!LvT@t;D#=rW<%fYhQ5sJg%aYq_;V8TQc8<cb<-1z64O(Qg}6ERrPw(h?`&t6
vhyrp1kU4_L93f<mFfvC3&e?uHo^iAOcFhTlkJ{Uv<(Yt(dAqYb%NHF0y#OhY

diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 950991951..5e70f3a75 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -5738,6 +5738,51 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-waste_transfer_station"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "amenity-water_point"
   element {
@@ -28185,51 +28230,6 @@ cont {
     apply_if: "!name"
   }
 }
-cont {
-  name: "landuse-garages"
-  element {
-    scale: 15
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 14802147
-      priority: 90
-    }
-  }
-}
 cont {
   name: "landuse-grass"
   element {
@@ -31910,6 +31910,51 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-works"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "natural-bare_rock"
   element {
@@ -42625,6 +42670,546 @@ cont {
     }
   }
 }
+cont {
+  name: "power-generator"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-gas"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-hydro"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-coal"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-gas"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-hydro"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-solar"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-plant-wind"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
+cont {
+  name: "power-substation"
+  element {
+    scale: 15
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 14802147
+      priority: -1960
+    }
+  }
+}
 cont {
   name: "railway-abandoned"
   element {
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index 539532f03..df59ece0e 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -14,34 +14,34 @@
 # - BG-top: water (linear and areal)
 # - BG-by-size: landcover areas sorted by their size
 
-leisure-stadium                                     # area z15- (also has icon z13-, caption(optional) z13-)
+leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
 === 250
 
-amenity-place_of_worship                            # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
 === 240
 
-amenity-doctors                                     # area z14- (also has icon z17-, caption(optional) z17-)
+amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
 leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
 leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
 === 230
 
-landuse-landfill                                    # area z15- (also has icon z15-, caption(optional) z15-)
+landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
 === 220
 
 leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
 === 200
 
 amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre                               # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z17-, caption(optional) z17-)
 === 190
 
 amenity-grave_yard                                  # area z14- (also has icon z17-, caption(optional) z17-)
@@ -50,26 +50,26 @@ landuse-cemetery                                    # area z14- (also has icon z
 landuse-cemetery-christian                          # area z14- (also has icon z15-, caption(optional) z15-)
 === 180
 
-amenity-courthouse
-amenity-car_wash
-amenity-fire_station
-amenity-marketplace
-amenity-police                                      # area z16- (also has icon z17-, caption(optional) z17-)
-amenity-recycling-centre
-amenity-social_facility
-amenity-vehicle_inspection
-amenity-charging_station-motorcar
-amenity-fuel
-emergency-mountain_rescue
-highway-services
-highway-rest_area
+amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-fire_station                                # area z15- (also has icon z18-, caption(optional) z18-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z19-)
+amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
+emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
-landuse-garages
-leisure-dog_park
-leisure-resort                                      # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-water_park
-office-diplomatic
-tourism-camp_site                                   # area z15- (also has icon z16-, caption(optional) z16-)
+highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
+highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-garages                                     # area z13-
+leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
+office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
+tourism-camp_site                                   # area z13- (also has icon z16-, caption(optional) z16-)
 === 170
 
 highway-footway-area                                # area z14- (also has line z15-, pathtext z15-)
@@ -130,7 +130,7 @@ landuse-orchard                                     # area z12- (also has captio
 landuse-recreation_ground                           # area z12- (also has caption z15-)
 landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station
+leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
 natural-bare_rock                                   # area z11- (also has caption z14-)
 natural-scree                                       # area z11-
@@ -152,40 +152,40 @@ landuse-forest-deciduous                            # area z10- (also has icon z
 landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
 === 60
 
-amenity-waste_transfer_station
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z19-)
 landuse-churchyard                                  # area z15-
-landuse-construction                                # area z15- (also has caption z15-)
-landuse-industrial                                  # area z15- (also has caption z15-)
-landuse-industrial-mine                             # area z15- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z15- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z15- (also has caption z15-)
-man_made-works
-power-plant
-power-plant-coal
-power-plant-gas
-power-plant-hydro
-power-plant-solar
-power-plant-wind
-power-substation
-power-generator
-power-generator-gas
-power-generator-hydro
-power-generator-solar
-power-generator-wind
+landuse-construction                                # area z13- (also has caption z15-)
+landuse-industrial                                  # area z13- (also has caption z15-)
+landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-railway                                     # area z13- (also has caption z15-)
+man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
+power-generator                                     # area z13- (also has icon z17-)
+power-generator-gas                                 # area z13- (also has icon z17-)
+power-generator-hydro                               # area z13- (also has icon z17-)
+power-generator-solar                               # area z13-
+power-generator-wind                                # area z13- (also has icon z15-, caption(optional) z18-)
+power-plant                                         # area z13- (also has icon z17-)
+power-plant-coal                                    # area z13- (also has icon z17-)
+power-plant-gas                                     # area z13- (also has icon z17-)
+power-plant-hydro                                   # area z13- (also has icon z17-)
+power-plant-solar                                   # area z13- (also has icon z17-)
+power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
+power-substation                                    # area z13- (also has icon z19-, caption(optional) z19-)
 === 50
 
-amenity-college                                     # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-clinic
-amenity-childcare
-amenity-hospital                                    # area z14- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-university                                  # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
+amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
 === 40
 
 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
 aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z15-
+landuse-education                                   # area z13-
 leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
 natural-beach                                       # area z10- (also has caption z15-)
 natural-beach-gravel                                # area z10- (also has caption z15-)
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 96e9ba50e..1c000e9f1 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -414,7 +414,7 @@ piste:type-sled                                     # line z14- (also has pathte
 === 120
 
 building:part                                       # area z16-
-landuse-garages                                     # area z15-
+landuse-garages                                     # area z13-
 === 110
 
 barrier-retaining_wall                              # line z16-
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 2a9eb75d2..b7092661d 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -314,7 +314,7 @@ amenity-theatre                                     # icon z14- (also has captio
 historic-battlefield                                # icon z15- (also has caption(optional) z15-)
 historic-city_gate                                  # icon z13- (also has caption(optional) z13-)
 historic-memorial-war_memorial                      # icon z15- (also has caption(optional) z15-)
-leisure-water_park                                  # icon z16- (also has caption(optional) z16-)
+leisure-water_park                                  # icon z16- (also has caption(optional) z16-, area z13-)
 shop-mall                                           # icon z14- (also has caption(optional) z14-)
 tourism-aquarium                                    # icon z16- (also has caption(optional) z16-)
 tourism-museum                                      # icon z13- (also has caption(optional) z13-)
@@ -322,9 +322,9 @@ tourism-theme_park                                  # icon z14- (also has captio
 tourism-zoo                                         # icon z13- (also has caption(optional) z13-)
 === 5200
 
-amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z14-)
-amenity-university                                  # icon z14- (also has caption(optional) z14-, area z14-)
-leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z15-)
+amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z13-)
+amenity-university                                  # icon z14- (also has caption(optional) z14-, area z13-)
+leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z13-)
 === 5100
 
 leisure-marina                                      # icon z16- (also has caption(optional) z16-)
@@ -370,25 +370,25 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300
 
-amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-)
-amenity-fuel                                        # icon z14- (also has caption(optional) z14-)
+amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270
 
-highway-services                                    # icon z14- (also has caption(optional) z14-)
+highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
 === 4250
 
-amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z13-)
 === 4200
 
-amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z13-)
 historic-memorial                                   # icon z15- (also has caption(optional) z15-)
 === 4150
 
@@ -409,12 +409,12 @@ amenity-pub                                         # icon z15- (also has captio
 
 amenity-shelter-basic_hut                           # icon z16- (also has caption(optional) z16-)
 amenity-shelter-lean_to                             # icon z16- (also has caption(optional) z16-)
-emergency-mountain_rescue                           # icon z16- (also has caption(optional) z16-)
+emergency-mountain_rescue                           # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-wilderness_hut                              # icon z16- (also has caption(optional) z16-)
 === 3900
 
-highway-rest_area                                   # icon z15- (also has caption(optional) z15-)
-tourism-camp_site                                   # icon z16- (also has caption(optional) z16-, area z15-)
+highway-rest_area                                   # icon z15- (also has caption(optional) z15-, area z13-)
+tourism-camp_site                                   # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-caravan_site                                # icon z16- (also has caption(optional) z16-)
 tourism-chalet                                      # icon z16- (also has caption(optional) z16-)
 === 3800
@@ -747,14 +747,14 @@ piste:type-snow_park                                # caption z15- (also has are
 === 2770
 
 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
-leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z15-)
+leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
 amenity-bank                                        # icon z16- (also has caption(optional) z16-)
 amenity-library                                     # icon z18- (also has caption(optional) z18-)
-amenity-marketplace                                 # icon z16- (also has caption(optional) z16-)
+amenity-marketplace                                 # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-pharmacy                                    # icon z16- (also has caption(optional) z17-)
 shop-convenience                                    # icon z16- (also has caption(optional) z16-)
 shop-deli                                           # icon z16- (also has caption(optional) z16-)
@@ -825,7 +825,7 @@ tourism-zoo-petting                                 # icon z15- (also has captio
 
 amenity-bureau_de_change                            # icon z17- (also has caption(optional) z18-)
 amenity-public_bath                                 # icon z17- (also has caption(optional) z17-)
-amenity-vehicle_inspection                          # icon z16- (also has caption(optional) z16-)
+amenity-vehicle_inspection                          # icon z16- (also has caption(optional) z16-, area z15-)
 craft-brewery                                       # icon z17- (also has caption(optional) z18-)
 craft-confectionery                                 # icon z17- (also has caption(optional) z18-)
 craft-winery                                        # icon z17- (also has caption(optional) z18-)
@@ -873,7 +873,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
-leisure-dog_park                                    # icon z16- (also has caption(optional) z16-)
+leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
 highway-busway                                      # pathtext z16- (also has line z15-)
@@ -881,9 +881,9 @@ highway-busway-bridge                               # pathtext z16- (also has li
 highway-busway-tunnel                               # pathtext z16- (also has line z15-)
 === 2250
 
-amenity-clinic                                      # icon z17- (also has caption(optional) z17-)
-amenity-college                                     # icon z16- (also has caption(optional) z16-, area z15-)
-amenity-courthouse                                  # icon z17- (also has caption(optional) z17-)
+amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-college                                     # icon z16- (also has caption(optional) z16-, area z13-)
+amenity-courthouse                                  # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-dentist                                     # icon z17- (also has caption(optional) z17-)
 landuse-military                                    # icon z16- (also has caption(optional) z17-, area z12-)
 landuse-military-danger_area                        # icon z16- (also has caption(optional) z17-, area z10-)
@@ -905,14 +905,14 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650
 
-amenity-car_wash                                    # icon z17- (also has caption(optional) z17-)
-amenity-childcare                                   # icon z17- (also has caption(optional) z17-)
-amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z14-)
+amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-driving_school                              # icon z17- (also has caption(optional) z19-)
 amenity-language_school                             # icon z17- (also has caption(optional) z19-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z19-)
-amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-)
+amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
 craft-electronics_repair                            # icon z17- (also has caption(optional) z18-)
@@ -984,8 +984,8 @@ shop-video_games                                    # icon z16- (also has captio
 === 1600
 
 aeroway-gate                                        # icon z17- (also has caption(optional) z17-)
-amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z15-)
-amenity-school                                      # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-school                                      # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-studio                                      # icon z16- (also has caption(optional) z16-)
 historic-archaeological_site                        # icon z17- (also has caption(optional) z17-)
 historic-boundary_stone                             # icon z16- (also has caption(optional) z16-)
@@ -1004,7 +1004,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 amenity-shelter                                     # icon z17- (also has caption(optional) z17-)
 amenity-shelter-public_transport                    # icon z17- (also has caption(optional) z17-)
 emergency-lifeguard                                 # icon z17- (also has caption(optional) z18-)
-leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
+leisure-fitness_station                             # icon z17- (also has caption(optional) z17-, area z15-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z15-)
 natural-cliff                                       # pathtext z16- (also has line z14-)
 === 1500
@@ -1057,7 +1057,7 @@ isoline-step_50                                     # pathtext z16- (also has li
 landuse-recreation_ground                           # caption z15- (also has area z12-)
 leisure-dance                                       # icon z17- (also has caption(optional) z17-)
 leisure-recreation_ground                           # caption z17-
-leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z15-)
+leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z13-)
 leisure-sports_hall                                 # icon z17- (also has caption(optional) z17-)
 === 1250
 
@@ -1084,8 +1084,8 @@ amenity-grave_yard                                  # icon z17- (also has captio
 amenity-grave_yard-christian                        # icon z17- (also has caption(optional) z17-, area z14-)
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
-amenity-social_facility                             # icon z17- (also has caption(optional) z17-)
-amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-)
+amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-, area z13-)
 highway-ladder                                      # icon z17- (also has caption(optional) z17-)
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
@@ -1106,18 +1106,18 @@ junction-circular                                   # caption z17-
 junction-roundabout                                 # caption z17-
 man_made-breakwater                                 # caption z17- (also has line z14-, area z12-)
 man_made-pier                                       # caption z17- (also has line z14-, area z12-)
-man_made-works                                      # icon z16- (also has caption(optional) z17-)
+man_made-works                                      # icon z16- (also has caption(optional) z17-, area z13-)
 public_transport-platform                           # caption z17- (also has area z16-)
 waterway-lock_gate                                  # icon z16-
 === 700
 
 amenity-brothel                                     # icon z18- (also has caption(optional) z18-)
 amenity-casino                                      # icon z17- (also has caption(optional) z17-)
-amenity-fire_station                                # icon z18- (also has caption(optional) z18-)
+amenity-fire_station                                # icon z18- (also has caption(optional) z18-, area z15-)
 amenity-gambling                                    # icon z17- (also has caption(optional) z17-)
 amenity-internet_cafe                               # icon z18- (also has caption(optional) z19-)
 amenity-love_hotel                                  # icon z18- (also has caption(optional) z18-)
-amenity-police                                      # icon z17- (also has caption(optional) z17-, area z16-)
+amenity-police                                      # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
 craft                                               # icon z18- (also has caption(optional) z18-)
 craft-beekeeper                                     # icon z17- (also has caption(optional) z18-)
@@ -1141,7 +1141,7 @@ healthcare-speech_therapist                         # icon z17- (also has captio
 leisure-adult_gaming_centre                         # icon z17- (also has caption(optional) z17-)
 leisure-amusement_arcade                            # icon z17- (also has caption(optional) z17-)
 office-company                                      # icon z18- (also has caption(optional) z18-)
-office-diplomatic                                   # icon z17- (also has caption(optional) z17-)
+office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
 shop-agrarian                                       # icon z18- (also has caption(optional) z18-)
@@ -1207,12 +1207,12 @@ emergency-emergency_ward_entrance                   # icon z18- (also has captio
 building                                            # caption z16- (also has area z14-)
 building-garage                                     # caption z16- (also has area z14-)
 building-has_parts                                  # caption z16- (also has area z14-)
-power-plant                                         # icon z17-
-power-plant-coal                                    # icon z17-
-power-plant-gas                                     # icon z17-
-power-plant-hydro                                   # icon z17-
-power-plant-solar                                   # icon z17-
-power-plant-wind                                    # icon z15- (also has caption(optional) z16-)
+power-plant                                         # icon z17- (also has area z13-)
+power-plant-coal                                    # icon z17- (also has area z13-)
+power-plant-gas                                     # icon z17- (also has area z13-)
+power-plant-hydro                                   # icon z17- (also has area z13-)
+power-plant-solar                                   # icon z17- (also has area z13-)
+power-plant-wind                                    # icon z15- (also has caption(optional) z16-, area z13-)
 power-station                                       # icon z17- (also has caption(optional) z17-)
 === 230
 
@@ -1241,23 +1241,23 @@ amenity-parking-street_side-fee                     # icon z18- (also has captio
 === 150
 
 landuse-commercial                                  # caption z17-
-landuse-construction                                # caption z15- (also has area z15-)
+landuse-construction                                # caption z15- (also has area z13-)
 landuse-farmyard                                    # caption z15- (also has area z10-)
-landuse-industrial                                  # caption z15- (also has area z15-)
-landuse-industrial-mine                             # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-landfill                                    # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-quarry                                      # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-railway                                     # caption z15- (also has area z15-)
+landuse-industrial                                  # caption z15- (also has area z13-)
+landuse-industrial-mine                             # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-landfill                                    # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-quarry                                      # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-railway                                     # caption z15- (also has area z13-)
 landuse-residential                                 # caption z17-
 leisure-common                                      # caption z17-
 leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z17- (also has caption(optional) z18-)
-power-generator                                     # icon z17-
-power-generator-gas                                 # icon z17-
-power-generator-hydro                               # icon z17-
-power-generator-wind                                # icon z15- (also has caption(optional) z18-)
+power-generator                                     # icon z17- (also has area z13-)
+power-generator-gas                                 # icon z17- (also has area z13-)
+power-generator-hydro                               # icon z17- (also has area z13-)
+power-generator-wind                                # icon z15- (also has caption(optional) z18-, area z13-)
 === 120
 
 amenity-parking-lane-private                        # icon z19- (also has caption(optional) z19-, area z17-)
@@ -1462,7 +1462,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-battlefield                              # caption(optional) z15- (also has icon z15-)
 # historic-city_gate                                # caption(optional) z13- (also has icon z13-)
 # historic-memorial-war_memorial                    # caption(optional) z15- (also has icon z15-)
-# leisure-water_park                                # caption(optional) z16- (also has icon z16-)
+# leisure-water_park                                # caption(optional) z16- (also has icon z16-, area z13-)
 # shop-mall                                         # caption(optional) z14- (also has icon z14-)
 # tourism-aquarium                                  # caption(optional) z16- (also has icon z16-)
 # tourism-museum                                    # caption(optional) z13- (also has icon z13-)
@@ -1470,9 +1470,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-zoo                                       # caption(optional) z13- (also has icon z13-)
 # === -4800
 
-# amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z14-)
-# amenity-university                                # caption(optional) z14- (also has icon z14-, area z14-)
-# leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z15-)
+# amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z13-)
+# amenity-university                                # caption(optional) z14- (also has icon z14-, area z13-)
+# leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z13-)
 # === -4900
 
 # leisure-marina                                    # caption(optional) z16- (also has icon z16-)
@@ -1516,25 +1516,25 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700
 
-# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-)
-# amenity-fuel                                      # caption(optional) z14- (also has icon z14-)
+# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730
 
-# highway-services                                  # caption(optional) z14- (also has icon z14-)
+# highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5750
 
-# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5800
 
-# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z13-)
 # historic-memorial                                 # caption(optional) z15- (also has icon z15-)
 # === -5850
 
@@ -1555,12 +1555,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-shelter-basic_hut                         # caption(optional) z16- (also has icon z16-)
 # amenity-shelter-lean_to                           # caption(optional) z16- (also has icon z16-)
-# emergency-mountain_rescue                         # caption(optional) z16- (also has icon z16-)
+# emergency-mountain_rescue                         # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-wilderness_hut                            # caption(optional) z16- (also has icon z16-)
 # === -6100
 
-# highway-rest_area                                 # caption(optional) z15- (also has icon z15-)
-# tourism-camp_site                                 # caption(optional) z16- (also has icon z16-, area z15-)
+# highway-rest_area                                 # caption(optional) z15- (also has icon z15-, area z13-)
+# tourism-camp_site                                 # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-caravan_site                              # caption(optional) z16- (also has icon z16-)
 # tourism-chalet                                    # caption(optional) z16- (also has icon z16-)
 # === -6200
@@ -1719,14 +1719,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7150
 
 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
-# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z15-)
+# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # === -7250
 
 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
 # amenity-bank                                      # caption(optional) z16- (also has icon z16-)
 # amenity-library                                   # caption(optional) z18- (also has icon z18-)
-# amenity-marketplace                               # caption(optional) z16- (also has icon z16-)
+# amenity-marketplace                               # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-pharmacy                                  # caption(optional) z17- (also has icon z16-)
 # shop-convenience                                  # caption(optional) z16- (also has icon z16-)
 # shop-deli                                         # caption(optional) z16- (also has icon z16-)
@@ -1793,7 +1793,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-bureau_de_change                          # caption(optional) z18- (also has icon z17-)
 # amenity-public_bath                               # caption(optional) z17- (also has icon z17-)
-# amenity-vehicle_inspection                        # caption(optional) z16- (also has icon z16-)
+# amenity-vehicle_inspection                        # caption(optional) z16- (also has icon z16-, area z15-)
 # craft-brewery                                     # caption(optional) z18- (also has icon z17-)
 # craft-confectionery                               # caption(optional) z18- (also has icon z17-)
 # craft-winery                                      # caption(optional) z18- (also has icon z17-)
@@ -1841,12 +1841,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
-# leisure-dog_park                                  # caption(optional) z16- (also has icon z16-)
+# leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
 
-# amenity-clinic                                    # caption(optional) z17- (also has icon z17-)
-# amenity-college                                   # caption(optional) z16- (also has icon z16-, area z15-)
-# amenity-courthouse                                # caption(optional) z17- (also has icon z17-)
+# amenity-clinic                                    # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-college                                   # caption(optional) z16- (also has icon z16-, area z13-)
+# amenity-courthouse                                # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-dentist                                   # caption(optional) z17- (also has icon z17-)
 # landuse-military                                  # caption(optional) z17- (also has icon z16-, area z12-)
 # landuse-military-danger_area                      # caption(optional) z17- (also has icon z16-, area z10-)
@@ -1858,14 +1858,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z16- (also has icon z16-)
 # === -8200
 
-# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-)
-# amenity-childcare                                 # caption(optional) z17- (also has icon z17-)
-# amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z14-)
+# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-driving_school                            # caption(optional) z19- (also has icon z17-)
 # amenity-language_school                           # caption(optional) z19- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z19- (also has icon z17-)
-# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-)
+# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
 # craft-electronics_repair                          # caption(optional) z18- (also has icon z17-)
@@ -1937,8 +1937,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8400
 
 # aeroway-gate                                      # caption(optional) z17- (also has icon z17-)
-# amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z15-)
-# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-studio                                    # caption(optional) z16- (also has icon z16-)
 # historic-archaeological_site                      # caption(optional) z17- (also has icon z17-)
 # historic-boundary_stone                           # caption(optional) z16- (also has icon z16-)
@@ -1957,7 +1957,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shelter                                   # caption(optional) z17- (also has icon z17-)
 # amenity-shelter-public_transport                  # caption(optional) z17- (also has icon z17-)
 # emergency-lifeguard                               # caption(optional) z18- (also has icon z17-)
-# leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
+# leisure-fitness_station                           # caption(optional) z17- (also has icon z17-, area z15-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z15-)
 # === -8500
 
@@ -2006,7 +2006,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-atm                                       # caption(optional) z18- (also has icon z18-)
 # amenity-dojo                                      # caption(optional) z18- (also has icon z17-)
 # leisure-dance                                     # caption(optional) z17- (also has icon z17-)
-# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z15-)
+# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z13-)
 # leisure-sports_hall                               # caption(optional) z17- (also has icon z17-)
 # === -8750
 
@@ -2028,8 +2028,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-grave_yard-christian                      # caption(optional) z17- (also has icon z17-, area z14-)
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
-# amenity-social_facility                           # caption(optional) z17- (also has icon z17-)
-# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-)
+# amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-, area z13-)
 # highway-ladder                                    # caption(optional) z17- (also has icon z17-)
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
@@ -2041,16 +2041,16 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-tower-communication                      # caption(optional) z18- (also has icon z16-)
 # === -9150
 
-# man_made-works                                    # caption(optional) z17- (also has icon z16-)
+# man_made-works                                    # caption(optional) z17- (also has icon z16-, area z13-)
 # === -9300
 
 # amenity-brothel                                   # caption(optional) z18- (also has icon z18-)
 # amenity-casino                                    # caption(optional) z17- (also has icon z17-)
-# amenity-fire_station                              # caption(optional) z18- (also has icon z18-)
+# amenity-fire_station                              # caption(optional) z18- (also has icon z18-, area z15-)
 # amenity-gambling                                  # caption(optional) z17- (also has icon z17-)
 # amenity-internet_cafe                             # caption(optional) z19- (also has icon z18-)
 # amenity-love_hotel                                # caption(optional) z18- (also has icon z18-)
-# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z16-)
+# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
 # craft                                             # caption(optional) z18- (also has icon z18-)
 # craft-beekeeper                                   # caption(optional) z18- (also has icon z17-)
@@ -2074,7 +2074,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
-# office-diplomatic                                 # caption(optional) z17- (also has icon z17-)
+# office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
 # shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
@@ -2133,7 +2133,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z18-)
 # === -9750
 
-# power-plant-wind                                  # caption(optional) z16- (also has icon z15-)
+# power-plant-wind                                  # caption(optional) z16- (also has icon z15-, area z13-)
 # power-station                                     # caption(optional) z17- (also has icon z17-)
 # === -9770
 
@@ -2158,11 +2158,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-street_side-fee                   # caption(optional) z18- (also has icon z18-, area z17-)
 # === -9850
 
-# landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z15-)
-# landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z15-)
-# landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z15-)
+# landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z13-)
+# landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z13-)
+# landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z13-)
 # man_made-petroleum_well                           # caption(optional) z18- (also has icon z17-)
-# power-generator-wind                              # caption(optional) z18- (also has icon z15-)
+# power-generator-wind                              # caption(optional) z18- (also has icon z15-, area z13-)
 # === -9880
 
 # amenity-parking-lane-private                      # caption(optional) z19- (also has icon z19-, area z17-)
@@ -2215,7 +2215,7 @@ emergency-phone                                     # icon z17-
 
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
-power-substation                                    # icon z19- (also has caption(optional) z19-)
+power-substation                                    # icon z19- (also has caption(optional) z19-, area z13-)
 === -9990
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2242,7 +2242,7 @@ entrance-exit                                       # icon z19- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
-# power-substation                                  # caption(optional) z19- (also has icon z19-)
+# power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)
 # tourism-information-guidepost                     # caption(optional) z16- (also has icon z16-)
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 73dfd81c5..0e03901dd 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -14,34 +14,34 @@
 # - BG-top: water (linear and areal)
 # - BG-by-size: landcover areas sorted by their size
 
-leisure-stadium                                     # area z15- (also has icon z13-, caption(optional) z13-)
+leisure-stadium                                     # area z13- (also has icon z13-, caption(optional) z13-)
 === 250
 
-amenity-place_of_worship                            # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-buddhist                   # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian                  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-christian-mormon           # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-hindu                      # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-jewish                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-muslim                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-shinto                     # area z14- (also has icon z14-, caption(optional) z14-)
-amenity-place_of_worship-taoist                     # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship                            # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-buddhist                   # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian                  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-jehovahs_witness  # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-christian-mormon           # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-hindu                      # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-jewish                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
+amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
 === 240
 
-amenity-doctors                                     # area z14- (also has icon z17-, caption(optional) z17-)
+amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
 leisure-swimming_pool                               # area z13- (also has icon z17-, caption(optional) z17-)
 leisure-swimming_pool-private                       # area z13- (also has icon z17-, caption(optional) z17-)
 === 230
 
-landuse-landfill                                    # area z15- (also has icon z15-, caption(optional) z15-)
+landuse-landfill                                    # area z13- (also has icon z15-, caption(optional) z15-)
 === 220
 
 leisure-playground                                  # area z15- (also has icon z17-, caption(optional) z17-)
 === 200
 
 amenity-fountain                                    # area z16- (also has icon z16-, caption(optional) z16-)
-leisure-sports_centre                               # area z15- (also has icon z17-, caption(optional) z17-)
+leisure-sports_centre                               # area z13- (also has icon z17-, caption(optional) z17-)
 === 190
 
 amenity-grave_yard                                  # area z14- (also has icon z17-, caption(optional) z17-)
@@ -50,25 +50,25 @@ landuse-cemetery                                    # area z14- (also has icon z
 landuse-cemetery-christian                          # area z14- (also has icon z15-, caption(optional) z15-)
 === 180
 
-amenity-courthouse
-amenity-car_wash
-amenity-fire_station
-amenity-marketplace
-amenity-police                                      # area z16- (also has icon z17-, caption(optional) z17-)
-amenity-recycling-centre
-amenity-social_facility
-amenity-vehicle_inspection
-amenity-charging_station-motorcar
-amenity-fuel
-emergency-mountain_rescue
-highway-services
-highway-rest_area
+amenity-car_wash                                    # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-charging_station-motorcar                   # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-courthouse                                  # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-fire_station                                # area z15- (also has icon z18-, caption(optional) z18-)
+amenity-fuel                                        # area z15- (also has icon z14-, caption(optional) z14-)
+amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
+amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z19-)
+amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
+amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
+emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
-landuse-garages
-leisure-dog_park
-leisure-resort                                      # area z15- (also has icon z16-, caption(optional) z16-)
-leisure-water_park
-office-diplomatic
+highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z15-)
+highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
+landuse-garages                                     # area z13-
+leisure-dog_park                                    # area z15- (also has icon z16-, caption(optional) z16-)
+leisure-resort                                      # area z13- (also has icon z16-, caption(optional) z16-)
+leisure-water_park                                  # area z13- (also has icon z16-, caption(optional) z16-)
+office-diplomatic                                   # area z15- (also has icon z17-, caption(optional) z17-)
 tourism-camp_site                                   # area z13- (also has icon z13-, caption(optional) z13-)
 === 170
 
@@ -130,7 +130,7 @@ landuse-orchard                                     # area z12- (also has captio
 landuse-recreation_ground                           # area z12- (also has caption z15-)
 landuse-village_green                               # area z12-
 landuse-vineyard                                    # area z12- (also has caption z15-)
-leisure-fitness_station
+leisure-fitness_station                             # area z15- (also has icon z17-, caption(optional) z17-)
 leisure-pitch                                       # area z15- (also has icon z17-, caption(optional) z17-)
 natural-bare_rock                                   # area z11- (also has caption z13-)
 natural-scree                                       # area z11-
@@ -152,40 +152,40 @@ landuse-forest-deciduous                            # area z10- (also has icon z
 landuse-forest-mixed                                # area z10- (also has icon z12-, caption(optional) z13-)
 === 60
 
-amenity-waste_transfer_station
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z19-)
 landuse-churchyard                                  # area z15-
-landuse-construction                                # area z15- (also has caption z15-)
-landuse-industrial                                  # area z15- (also has caption z15-)
-landuse-industrial-mine                             # area z15- (also has icon z15-, caption(optional) z15-)
-landuse-quarry                                      # area z15- (also has icon z15-, caption(optional) z15-)
-landuse-railway                                     # area z15- (also has caption z15-)
-man_made-works
-power-plant
-power-plant-coal
-power-plant-gas
-power-plant-hydro
-power-plant-solar
-power-plant-wind
-power-substation
-power-generator
-power-generator-gas
-power-generator-hydro
-power-generator-solar
-power-generator-wind
+landuse-construction                                # area z13- (also has caption z15-)
+landuse-industrial                                  # area z13- (also has caption z15-)
+landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
+landuse-railway                                     # area z13- (also has caption z15-)
+man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
+power-generator                                     # area z13- (also has icon z17-)
+power-generator-gas                                 # area z13- (also has icon z17-)
+power-generator-hydro                               # area z13- (also has icon z17-)
+power-generator-solar                               # area z13-
+power-generator-wind                                # area z13- (also has icon z13-, caption(optional) z16-)
+power-plant                                         # area z13- (also has icon z17-)
+power-plant-coal                                    # area z13- (also has icon z17-)
+power-plant-gas                                     # area z13- (also has icon z17-)
+power-plant-hydro                                   # area z13- (also has icon z17-)
+power-plant-solar                                   # area z13- (also has icon z17-)
+power-plant-wind                                    # area z13- (also has icon z13-, caption(optional) z16-)
+power-substation                                    # area z13- (also has icon z19-, caption(optional) z19-)
 === 50
 
-amenity-college                                     # area z15- (also has icon z16-, caption(optional) z16-)
-amenity-clinic
-amenity-childcare
-amenity-hospital                                    # area z14- (also has icon z14-, caption(optional) z15-)
-amenity-kindergarten                                # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-school                                      # area z15- (also has icon z17-, caption(optional) z17-)
-amenity-university                                  # area z14- (also has icon z14-, caption(optional) z14-)
+amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-clinic                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-college                                     # area z13- (also has icon z16-, caption(optional) z16-)
+amenity-hospital                                    # area z13- (also has icon z14-, caption(optional) z15-)
+amenity-kindergarten                                # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-school                                      # area z13- (also has icon z17-, caption(optional) z17-)
+amenity-university                                  # area z13- (also has icon z14-, caption(optional) z14-)
 === 40
 
 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
 aeroway-aerodrome-international                     # area z10- (also has icon z7-, caption(optional) z10-)
-landuse-education                                   # area z15-
+landuse-education                                   # area z13-
 leisure-beach_resort                                # area z10- (also has icon z16-, caption(optional) z16-)
 natural-beach                                       # area z10- (also has caption z14-)
 natural-beach-gravel                                # area z10- (also has caption z14-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 7e5f6b0b1..618259b3d 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -314,7 +314,7 @@ amenity-theatre                                     # icon z14- (also has captio
 historic-battlefield                                # icon z15- (also has caption(optional) z15-)
 historic-city_gate                                  # icon z13- (also has caption(optional) z13-)
 historic-memorial-war_memorial                      # icon z15- (also has caption(optional) z15-)
-leisure-water_park                                  # icon z16- (also has caption(optional) z16-)
+leisure-water_park                                  # icon z16- (also has caption(optional) z16-, area z13-)
 shop-mall                                           # icon z14- (also has caption(optional) z14-)
 tourism-aquarium                                    # icon z16- (also has caption(optional) z16-)
 tourism-museum                                      # icon z13- (also has caption(optional) z13-)
@@ -322,9 +322,9 @@ tourism-theme_park                                  # icon z14- (also has captio
 tourism-zoo                                         # icon z13- (also has caption(optional) z13-)
 === 5200
 
-amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z14-)
-amenity-university                                  # icon z14- (also has caption(optional) z14-, area z14-)
-leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z15-)
+amenity-hospital                                    # icon z14- (also has caption(optional) z15-, area z13-)
+amenity-university                                  # icon z14- (also has caption(optional) z14-, area z13-)
+leisure-stadium                                     # icon z13- (also has caption(optional) z13-, area z13-)
 === 5100
 
 leisure-marina                                      # icon z16- (also has caption(optional) z16-)
@@ -370,25 +370,25 @@ tourism-attraction                                  # icon z14- (also has captio
 tourism-gallery                                     # icon z15- (also has caption(optional) z15-)
 === 4300
 
-amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-)
-amenity-fuel                                        # icon z14- (also has caption(optional) z14-)
+amenity-charging_station-motorcar                   # icon z14- (also has caption(optional) z14-, area z15-)
+amenity-fuel                                        # icon z14- (also has caption(optional) z14-, area z15-)
 === 4270
 
-highway-services                                    # icon z14- (also has caption(optional) z14-)
+highway-services                                    # icon z14- (also has caption(optional) z14-, area z13-)
 === 4250
 
-amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z14-)
-amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship-buddhist                   # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian                  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian-jehovahs_witness  # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-christian-mormon           # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-hindu                      # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-jewish                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-muslim                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-shinto                     # icon z14- (also has caption(optional) z14-, area z13-)
+amenity-place_of_worship-taoist                     # icon z14- (also has caption(optional) z14-, area z13-)
 === 4200
 
-amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z14-)
+amenity-place_of_worship                            # icon z14- (also has caption(optional) z14-, area z13-)
 historic-memorial                                   # icon z15- (also has caption(optional) z15-)
 === 4150
 
@@ -409,11 +409,11 @@ amenity-pub                                         # icon z15- (also has captio
 
 amenity-shelter-basic_hut                           # icon z12- (also has caption(optional) z13-)
 amenity-shelter-lean_to                             # icon z12- (also has caption(optional) z13-)
-emergency-mountain_rescue                           # icon z12- (also has caption(optional) z12-)
+emergency-mountain_rescue                           # icon z12- (also has caption(optional) z12-, area z13-)
 tourism-wilderness_hut                              # icon z12- (also has caption(optional) z13-)
 === 3900
 
-highway-rest_area                                   # icon z14- (also has caption(optional) z15-)
+highway-rest_area                                   # icon z14- (also has caption(optional) z15-, area z13-)
 tourism-camp_site                                   # icon z13- (also has caption(optional) z13-, area z13-)
 tourism-caravan_site                                # icon z13- (also has caption(optional) z13-)
 tourism-chalet                                      # icon z14- (also has caption(optional) z14-)
@@ -747,14 +747,14 @@ piste:type-snow_park                                # caption z15- (also has are
 === 2770
 
 amenity-townhall                                    # icon z16- (also has caption(optional) z16-)
-leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z15-)
+leisure-resort                                      # icon z16- (also has caption(optional) z16-, area z13-)
 tourism-hotel                                       # icon z16- (also has caption(optional) z16-)
 === 2750
 
 amenity-arts_centre                                 # icon z17- (also has caption(optional) z17-)
 amenity-bank                                        # icon z16- (also has caption(optional) z16-)
 amenity-library                                     # icon z18- (also has caption(optional) z18-)
-amenity-marketplace                                 # icon z16- (also has caption(optional) z16-)
+amenity-marketplace                                 # icon z16- (also has caption(optional) z16-, area z15-)
 amenity-pharmacy                                    # icon z16- (also has caption(optional) z17-)
 shop-convenience                                    # icon z16- (also has caption(optional) z16-)
 shop-deli                                           # icon z16- (also has caption(optional) z16-)
@@ -825,7 +825,7 @@ tourism-zoo-petting                                 # icon z15- (also has captio
 
 amenity-bureau_de_change                            # icon z17- (also has caption(optional) z18-)
 amenity-public_bath                                 # icon z17- (also has caption(optional) z17-)
-amenity-vehicle_inspection                          # icon z16- (also has caption(optional) z16-)
+amenity-vehicle_inspection                          # icon z16- (also has caption(optional) z16-, area z15-)
 craft-brewery                                       # icon z17- (also has caption(optional) z18-)
 craft-confectionery                                 # icon z17- (also has caption(optional) z18-)
 craft-winery                                        # icon z17- (also has caption(optional) z18-)
@@ -873,7 +873,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
-leisure-dog_park                                    # icon z16- (also has caption(optional) z16-)
+leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
 highway-busway                                      # pathtext z16- (also has line z15-)
@@ -881,9 +881,9 @@ highway-busway-bridge                               # pathtext z16- (also has li
 highway-busway-tunnel                               # pathtext z16- (also has line z15-)
 === 2250
 
-amenity-clinic                                      # icon z17- (also has caption(optional) z17-)
-amenity-college                                     # icon z16- (also has caption(optional) z16-, area z15-)
-amenity-courthouse                                  # icon z17- (also has caption(optional) z17-)
+amenity-clinic                                      # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-college                                     # icon z16- (also has caption(optional) z16-, area z13-)
+amenity-courthouse                                  # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-dentist                                     # icon z17- (also has caption(optional) z17-)
 landuse-military                                    # icon z16- (also has caption(optional) z17-, area z12-)
 landuse-military-danger_area                        # icon z16- (also has caption(optional) z17-, area z10-)
@@ -905,14 +905,14 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650
 
-amenity-car_wash                                    # icon z17- (also has caption(optional) z17-)
-amenity-childcare                                   # icon z17- (also has caption(optional) z17-)
-amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z14-)
+amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-driving_school                              # icon z17- (also has caption(optional) z19-)
 amenity-language_school                             # icon z17- (also has caption(optional) z19-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
 amenity-music_school                                # icon z17- (also has caption(optional) z19-)
-amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-)
+amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
 craft-electronics_repair                            # icon z17- (also has caption(optional) z18-)
@@ -984,8 +984,8 @@ shop-video_games                                    # icon z16- (also has captio
 === 1600
 
 aeroway-gate                                        # icon z17- (also has caption(optional) z17-)
-amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z15-)
-amenity-school                                      # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-kindergarten                                # icon z17- (also has caption(optional) z17-, area z13-)
+amenity-school                                      # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-studio                                      # icon z16- (also has caption(optional) z16-)
 historic-archaeological_site                        # icon z17- (also has caption(optional) z17-)
 historic-boundary_stone                             # icon z16- (also has caption(optional) z16-)
@@ -1004,7 +1004,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 amenity-shelter                                     # icon z12- (also has caption(optional) z13-)
 amenity-shelter-public_transport                    # icon z14- (also has caption(optional) z14-)
 emergency-lifeguard                                 # icon z14- (also has caption(optional) z18-)
-leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
+leisure-fitness_station                             # icon z17- (also has caption(optional) z17-, area z15-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z15-)
 natural-cliff                                       # pathtext z14- (also has line z12-)
 === 1500
@@ -1057,7 +1057,7 @@ isoline-step_50                                     # pathtext z15- (also has li
 landuse-recreation_ground                           # caption z15- (also has area z12-)
 leisure-dance                                       # icon z17- (also has caption(optional) z17-)
 leisure-recreation_ground                           # caption z17-
-leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z15-)
+leisure-sports_centre                               # icon z17- (also has caption(optional) z17-, area z13-)
 leisure-sports_hall                                 # icon z17- (also has caption(optional) z17-)
 === 1250
 
@@ -1085,8 +1085,8 @@ amenity-grave_yard                                  # icon z17- (also has captio
 amenity-grave_yard-christian                        # icon z17- (also has caption(optional) z17-, area z14-)
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
-amenity-social_facility                             # icon z17- (also has caption(optional) z17-)
-amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-)
+amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
+amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-, area z13-)
 highway-ladder                                      # icon z16- (also has caption(optional) z17-)
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
@@ -1107,18 +1107,18 @@ junction-circular                                   # caption z17-
 junction-roundabout                                 # caption z17-
 man_made-breakwater                                 # caption z17- (also has line z14-, area z12-)
 man_made-pier                                       # caption z17- (also has line z14-, area z12-)
-man_made-works                                      # icon z16- (also has caption(optional) z17-)
+man_made-works                                      # icon z16- (also has caption(optional) z17-, area z13-)
 public_transport-platform                           # caption z17- (also has area z16-)
 waterway-lock_gate                                  # icon z16-
 === 700
 
 amenity-brothel                                     # icon z18- (also has caption(optional) z18-)
 amenity-casino                                      # icon z17- (also has caption(optional) z17-)
-amenity-fire_station                                # icon z18- (also has caption(optional) z18-)
+amenity-fire_station                                # icon z18- (also has caption(optional) z18-, area z15-)
 amenity-gambling                                    # icon z17- (also has caption(optional) z17-)
 amenity-internet_cafe                               # icon z18- (also has caption(optional) z19-)
 amenity-love_hotel                                  # icon z18- (also has caption(optional) z18-)
-amenity-police                                      # icon z17- (also has caption(optional) z17-, area z16-)
+amenity-police                                      # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
 craft                                               # icon z18- (also has caption(optional) z18-)
 craft-beekeeper                                     # icon z17- (also has caption(optional) z18-)
@@ -1142,7 +1142,7 @@ healthcare-speech_therapist                         # icon z17- (also has captio
 leisure-adult_gaming_centre                         # icon z17- (also has caption(optional) z17-)
 leisure-amusement_arcade                            # icon z17- (also has caption(optional) z17-)
 office-company                                      # icon z18- (also has caption(optional) z18-)
-office-diplomatic                                   # icon z17- (also has caption(optional) z17-)
+office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
 shop-agrarian                                       # icon z18- (also has caption(optional) z18-)
@@ -1209,12 +1209,12 @@ building                                            # caption z16- (also has are
 building-garage                                     # caption z16- (also has area z14-)
 building-has_parts                                  # caption z16- (also has area z14-)
 man_made-utility_pole                               # icon z15-
-power-plant                                         # icon z17-
-power-plant-coal                                    # icon z17-
-power-plant-gas                                     # icon z17-
-power-plant-hydro                                   # icon z17-
-power-plant-solar                                   # icon z17-
-power-plant-wind                                    # icon z13- (also has caption(optional) z16-)
+power-plant                                         # icon z17- (also has area z13-)
+power-plant-coal                                    # icon z17- (also has area z13-)
+power-plant-gas                                     # icon z17- (also has area z13-)
+power-plant-hydro                                   # icon z17- (also has area z13-)
+power-plant-solar                                   # icon z17- (also has area z13-)
+power-plant-wind                                    # icon z13- (also has caption(optional) z16-, area z13-)
 power-pole                                          # icon z15-
 power-station                                       # icon z17- (also has caption(optional) z17-)
 === 230
@@ -1244,23 +1244,23 @@ amenity-parking-street_side-fee                     # icon z18- (also has captio
 === 150
 
 landuse-commercial                                  # caption z17-
-landuse-construction                                # caption z15- (also has area z15-)
+landuse-construction                                # caption z15- (also has area z13-)
 landuse-farmyard                                    # caption z15- (also has area z10-)
-landuse-industrial                                  # caption z15- (also has area z15-)
-landuse-industrial-mine                             # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-landfill                                    # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-quarry                                      # icon z15- (also has caption(optional) z15-, area z15-)
-landuse-railway                                     # caption z15- (also has area z15-)
+landuse-industrial                                  # caption z15- (also has area z13-)
+landuse-industrial-mine                             # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-landfill                                    # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-quarry                                      # icon z15- (also has caption(optional) z15-, area z13-)
+landuse-railway                                     # caption z15- (also has area z13-)
 landuse-residential                                 # caption z17-
 leisure-common                                      # caption z17-
 leisure-slipway                                     # caption z17-
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z14- (also has caption(optional) z18-)
-power-generator                                     # icon z17-
-power-generator-gas                                 # icon z17-
-power-generator-hydro                               # icon z17-
-power-generator-wind                                # icon z13- (also has caption(optional) z16-)
+power-generator                                     # icon z17- (also has area z13-)
+power-generator-gas                                 # icon z17- (also has area z13-)
+power-generator-hydro                               # icon z17- (also has area z13-)
+power-generator-wind                                # icon z13- (also has caption(optional) z16-, area z13-)
 === 120
 
 amenity-parking-lane-private                        # icon z19- (also has caption(optional) z19-, area z17-)
@@ -1465,7 +1465,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-battlefield                              # caption(optional) z15- (also has icon z15-)
 # historic-city_gate                                # caption(optional) z13- (also has icon z13-)
 # historic-memorial-war_memorial                    # caption(optional) z15- (also has icon z15-)
-# leisure-water_park                                # caption(optional) z16- (also has icon z16-)
+# leisure-water_park                                # caption(optional) z16- (also has icon z16-, area z13-)
 # shop-mall                                         # caption(optional) z14- (also has icon z14-)
 # tourism-aquarium                                  # caption(optional) z16- (also has icon z16-)
 # tourism-museum                                    # caption(optional) z13- (also has icon z13-)
@@ -1473,9 +1473,9 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-zoo                                       # caption(optional) z13- (also has icon z13-)
 # === -4800
 
-# amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z14-)
-# amenity-university                                # caption(optional) z14- (also has icon z14-, area z14-)
-# leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z15-)
+# amenity-hospital                                  # caption(optional) z15- (also has icon z14-, area z13-)
+# amenity-university                                # caption(optional) z14- (also has icon z14-, area z13-)
+# leisure-stadium                                   # caption(optional) z13- (also has icon z13-, area z13-)
 # === -4900
 
 # leisure-marina                                    # caption(optional) z16- (also has icon z16-)
@@ -1519,25 +1519,25 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-gallery                                   # caption(optional) z15- (also has icon z15-)
 # === -5700
 
-# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-)
-# amenity-fuel                                      # caption(optional) z14- (also has icon z14-)
+# amenity-charging_station-motorcar                 # caption(optional) z14- (also has icon z14-, area z15-)
+# amenity-fuel                                      # caption(optional) z14- (also has icon z14-, area z15-)
 # === -5730
 
-# highway-services                                  # caption(optional) z14- (also has icon z14-)
+# highway-services                                  # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5750
 
-# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z14-)
-# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship-buddhist                 # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian                # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian-jehovahs_witness  # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-christian-mormon         # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-hindu                    # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-jewish                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-muslim                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-shinto                   # caption(optional) z14- (also has icon z14-, area z13-)
+# amenity-place_of_worship-taoist                   # caption(optional) z14- (also has icon z14-, area z13-)
 # === -5800
 
-# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z14-)
+# amenity-place_of_worship                          # caption(optional) z14- (also has icon z14-, area z13-)
 # historic-memorial                                 # caption(optional) z15- (also has icon z15-)
 # === -5850
 
@@ -1558,11 +1558,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-shelter-basic_hut                         # caption(optional) z13- (also has icon z12-)
 # amenity-shelter-lean_to                           # caption(optional) z13- (also has icon z12-)
-# emergency-mountain_rescue                         # caption(optional) z12- (also has icon z12-)
+# emergency-mountain_rescue                         # caption(optional) z12- (also has icon z12-, area z13-)
 # tourism-wilderness_hut                            # caption(optional) z13- (also has icon z12-)
 # === -6100
 
-# highway-rest_area                                 # caption(optional) z15- (also has icon z14-)
+# highway-rest_area                                 # caption(optional) z15- (also has icon z14-, area z13-)
 # tourism-camp_site                                 # caption(optional) z13- (also has icon z13-, area z13-)
 # tourism-caravan_site                              # caption(optional) z13- (also has icon z13-)
 # tourism-chalet                                    # caption(optional) z14- (also has icon z14-)
@@ -1722,14 +1722,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -7150
 
 # amenity-townhall                                  # caption(optional) z16- (also has icon z16-)
-# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z15-)
+# leisure-resort                                    # caption(optional) z16- (also has icon z16-, area z13-)
 # tourism-hotel                                     # caption(optional) z16- (also has icon z16-)
 # === -7250
 
 # amenity-arts_centre                               # caption(optional) z17- (also has icon z17-)
 # amenity-bank                                      # caption(optional) z16- (also has icon z16-)
 # amenity-library                                   # caption(optional) z18- (also has icon z18-)
-# amenity-marketplace                               # caption(optional) z16- (also has icon z16-)
+# amenity-marketplace                               # caption(optional) z16- (also has icon z16-, area z15-)
 # amenity-pharmacy                                  # caption(optional) z17- (also has icon z16-)
 # shop-convenience                                  # caption(optional) z16- (also has icon z16-)
 # shop-deli                                         # caption(optional) z16- (also has icon z16-)
@@ -1796,7 +1796,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 
 # amenity-bureau_de_change                          # caption(optional) z18- (also has icon z17-)
 # amenity-public_bath                               # caption(optional) z17- (also has icon z17-)
-# amenity-vehicle_inspection                        # caption(optional) z16- (also has icon z16-)
+# amenity-vehicle_inspection                        # caption(optional) z16- (also has icon z16-, area z15-)
 # craft-brewery                                     # caption(optional) z18- (also has icon z17-)
 # craft-confectionery                               # caption(optional) z18- (also has icon z17-)
 # craft-winery                                      # caption(optional) z18- (also has icon z17-)
@@ -1844,12 +1844,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
-# leisure-dog_park                                  # caption(optional) z16- (also has icon z16-)
+# leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
 
-# amenity-clinic                                    # caption(optional) z17- (also has icon z17-)
-# amenity-college                                   # caption(optional) z16- (also has icon z16-, area z15-)
-# amenity-courthouse                                # caption(optional) z17- (also has icon z17-)
+# amenity-clinic                                    # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-college                                   # caption(optional) z16- (also has icon z16-, area z13-)
+# amenity-courthouse                                # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-dentist                                   # caption(optional) z17- (also has icon z17-)
 # landuse-military                                  # caption(optional) z17- (also has icon z16-, area z12-)
 # landuse-military-danger_area                      # caption(optional) z17- (also has icon z16-, area z10-)
@@ -1861,14 +1861,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z14- (also has icon z14-)
 # === -8200
 
-# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-)
-# amenity-childcare                                 # caption(optional) z17- (also has icon z17-)
-# amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z14-)
+# amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-driving_school                            # caption(optional) z19- (also has icon z17-)
 # amenity-language_school                           # caption(optional) z19- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
 # amenity-music_school                              # caption(optional) z19- (also has icon z17-)
-# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-)
+# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
 # craft-electronics_repair                          # caption(optional) z18- (also has icon z17-)
@@ -1940,8 +1940,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8400
 
 # aeroway-gate                                      # caption(optional) z17- (also has icon z17-)
-# amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z15-)
-# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-kindergarten                              # caption(optional) z17- (also has icon z17-, area z13-)
+# amenity-school                                    # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-studio                                    # caption(optional) z16- (also has icon z16-)
 # historic-archaeological_site                      # caption(optional) z17- (also has icon z17-)
 # historic-boundary_stone                           # caption(optional) z16- (also has icon z16-)
@@ -1960,7 +1960,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shelter                                   # caption(optional) z13- (also has icon z12-)
 # amenity-shelter-public_transport                  # caption(optional) z14- (also has icon z14-)
 # emergency-lifeguard                               # caption(optional) z18- (also has icon z14-)
-# leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
+# leisure-fitness_station                           # caption(optional) z17- (also has icon z17-, area z15-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z15-)
 # === -8500
 
@@ -2009,7 +2009,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-atm                                       # caption(optional) z18- (also has icon z18-)
 # amenity-dojo                                      # caption(optional) z18- (also has icon z17-)
 # leisure-dance                                     # caption(optional) z17- (also has icon z17-)
-# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z15-)
+# leisure-sports_centre                             # caption(optional) z17- (also has icon z17-, area z13-)
 # leisure-sports_hall                               # caption(optional) z17- (also has icon z17-)
 # === -8750
 
@@ -2031,8 +2031,8 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-grave_yard-christian                      # caption(optional) z17- (also has icon z17-, area z14-)
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
-# amenity-social_facility                           # caption(optional) z17- (also has icon z17-)
-# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-)
+# amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
+# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-, area z13-)
 # highway-ladder                                    # caption(optional) z17- (also has icon z16-)
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
@@ -2045,16 +2045,16 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-tower-communication                      # caption(optional) z14- (also has icon z13-)
 # === -9150
 
-# man_made-works                                    # caption(optional) z17- (also has icon z16-)
+# man_made-works                                    # caption(optional) z17- (also has icon z16-, area z13-)
 # === -9300
 
 # amenity-brothel                                   # caption(optional) z18- (also has icon z18-)
 # amenity-casino                                    # caption(optional) z17- (also has icon z17-)
-# amenity-fire_station                              # caption(optional) z18- (also has icon z18-)
+# amenity-fire_station                              # caption(optional) z18- (also has icon z18-, area z15-)
 # amenity-gambling                                  # caption(optional) z17- (also has icon z17-)
 # amenity-internet_cafe                             # caption(optional) z19- (also has icon z18-)
 # amenity-love_hotel                                # caption(optional) z18- (also has icon z18-)
-# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z16-)
+# amenity-police                                    # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
 # craft                                             # caption(optional) z18- (also has icon z18-)
 # craft-beekeeper                                   # caption(optional) z18- (also has icon z17-)
@@ -2078,7 +2078,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
-# office-diplomatic                                 # caption(optional) z17- (also has icon z17-)
+# office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
 # shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
@@ -2138,7 +2138,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z18-)
 # === -9750
 
-# power-plant-wind                                  # caption(optional) z16- (also has icon z13-)
+# power-plant-wind                                  # caption(optional) z16- (also has icon z13-, area z13-)
 # power-station                                     # caption(optional) z17- (also has icon z17-)
 # === -9770
 
@@ -2163,11 +2163,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-street_side-fee                   # caption(optional) z18- (also has icon z18-, area z17-)
 # === -9850
 
-# landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z15-)
-# landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z15-)
-# landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z15-)
+# landuse-industrial-mine                           # caption(optional) z15- (also has icon z15-, area z13-)
+# landuse-landfill                                  # caption(optional) z15- (also has icon z15-, area z13-)
+# landuse-quarry                                    # caption(optional) z15- (also has icon z15-, area z13-)
 # man_made-petroleum_well                           # caption(optional) z18- (also has icon z14-)
-# power-generator-wind                              # caption(optional) z16- (also has icon z13-)
+# power-generator-wind                              # caption(optional) z16- (also has icon z13-, area z13-)
 # === -9880
 
 # amenity-parking-lane-private                      # caption(optional) z19- (also has icon z19-, area z17-)
@@ -2220,7 +2220,7 @@ emergency-phone                                     # icon z17-
 
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
-power-substation                                    # icon z19- (also has caption(optional) z19-)
+power-substation                                    # icon z19- (also has caption(optional) z19-, area z13-)
 === -9990
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2247,7 +2247,7 @@ entrance-exit                                       # icon z19- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z17- (also has icon z17-)
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
-# power-substation                                  # caption(optional) z19- (also has icon z19-)
+# power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)
 # tourism-information-board                         # caption(optional) z15- (also has icon z15-)
 # tourism-information-guidepost                     # caption(optional) z15- (also has icon z15-)
diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
index 2097bd478..bebfa2f86 100644
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -86,7 +86,7 @@ landuse-forest-deciduous                            # area z10- (also has icon z
 landuse-forest-mixed                                # area z10- (also has icon z12-, caption(optional) z12-)
 === 50
 
-amenity-waste_transfer_station
+amenity-waste_transfer_station                      # area z15-
 landuse-churchyard                                  # area z15-
 landuse-construction                                # area z15-
 landuse-industrial                                  # area z15-
@@ -94,19 +94,19 @@ landuse-industrial-mine                             # area z15-
 landuse-landfill                                    # area z15- (also has caption z15-)
 landuse-quarry                                      # area z15- (also has caption z15-)
 landuse-railway                                     # area z15- (also has caption z15-)
-man_made-works
-power-plant
-power-plant-coal
-power-plant-gas
-power-plant-hydro
-power-plant-solar
-power-plant-wind
-power-substation
-power-generator
-power-generator-gas
-power-generator-hydro
-power-generator-solar
-power-generator-wind
+man_made-works                                      # area z15-
+power-generator                                     # area z15-
+power-generator-gas                                 # area z15-
+power-generator-hydro                               # area z15-
+power-generator-solar                               # area z15-
+power-generator-wind                                # area z15-
+power-plant                                         # area z15-
+power-plant-coal                                    # area z15-
+power-plant-gas                                     # area z15-
+power-plant-hydro                                   # area z15-
+power-plant-solar                                   # area z15-
+power-plant-wind                                    # area z15-
+power-substation                                    # area z15-
 === 40
 
 aeroway-aerodrome                                   # area z10- (also has icon z14-, caption(optional) z14-)
diff --git a/data/visibility.txt b/data/visibility.txt
index c678a9ac5..86f0303fc 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -184,7 +184,7 @@ world  000000000000000000000  +
         veterinary  000000000000000000000  -
         waste_basket  000000000000000000000  -
         waste_disposal  000000000000000000000  -
-        waste_transfer_station  000000000000000000000  -
+        waste_transfer_station  000000000000000111111  -
         water_point  000000000000000011111  +
             drinking_water_no  000000000000000000111  -
             {}
@@ -633,7 +633,7 @@ world  000000000000000000000  +
             deciduous  000000000011111111111  -
             mixed  000000000011111111111  -
             {}
-        garages  000000000000000111111  -
+        garages  000000000000000000000  -
         grass  000000000000111111111  -
         greenfield  000000000000000000000  -
         greenhouse_horticulture  000000000000000000000  -
@@ -735,7 +735,7 @@ world  000000000000000000000  +
             drinking_water_no  000000000000000000000  -
             {}
         windmill  000000000000000000000  -
-        works  000000000000000000000  -
+        works  000000000000000111111  -
         {}
     mapswithme  000000000000000000000  +
         grid  000000000000000000000  -
@@ -875,24 +875,24 @@ world  000000000000000000000  +
         village  000000000001111111111  -
         {}
     power  000000000000000000000  +
-        generator  000000000000000000000  +
-            gas  000000000000000000000  -
-            hydro  000000000000000000000  -
-            solar  000000000000000000000  -
-            wind  000000000000000000000  -
+        generator  000000000000000111111  +
+            gas  000000000000000111111  -
+            hydro  000000000000000111111  -
+            solar  000000000000000111111  -
+            wind  000000000000000111111  -
             {}
         line  000000000000000000000  -
         minor_line  000000000000000000000  -
-        plant  000000000000000000000  +
-            coal  000000000000000000000  -
-            gas  000000000000000000000  -
-            hydro  000000000000000000000  -
-            solar  000000000000000000000  -
-            wind  000000000000000000000  -
+        plant  000000000000000111111  +
+            coal  000000000000000111111  -
+            gas  000000000000000111111  -
+            hydro  000000000000000111111  -
+            solar  000000000000000111111  -
+            wind  000000000000000111111  -
             {}
         pole  000000000000000000000  -
         station  000000000000000000000  -
-        substation  000000000000000000000  -
+        substation  000000000000000111111  -
         tower  000000000000000000000  -
         {}
     psurface  000000000000000000000  +