Merge pull request #4775 from Zverik/fix_fills

[styles] Fix university and place_of_worship over forests

8 files changed, 48 insertions, 435 deletions

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index c5b09ee92a..52c15e4d52 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 55b76f0005..872d5e451d 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -6056,10 +6056,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-m"
       priority: 16813
@@ -6076,10 +6072,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -6095,10 +6087,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -6114,10 +6102,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -6152,10 +6136,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-m"
       priority: 16813
@@ -6172,10 +6152,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -6191,10 +6167,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -6210,10 +6182,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -6248,10 +6216,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-m"
       priority: 16813
@@ -6268,10 +6232,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -6287,10 +6247,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -6306,10 +6262,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -6344,10 +6296,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-m"
       priority: 16813
@@ -6364,10 +6312,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -6383,10 +6327,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -6402,10 +6342,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -6440,10 +6376,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-m"
       priority: 16813
@@ -6460,10 +6392,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -6479,10 +6407,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -6498,10 +6422,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -6536,10 +6456,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-m"
       priority: 16813
@@ -6556,10 +6472,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6575,10 +6487,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6594,10 +6502,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6632,10 +6536,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-m"
       priority: 16813
@@ -6652,10 +6552,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6671,10 +6567,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6690,10 +6582,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6728,10 +6616,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-m"
       priority: 16813
@@ -6748,10 +6632,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6767,10 +6647,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6786,10 +6662,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -7833,12 +7705,12 @@ cont {
     scale: 15
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-m"
       apply_for_type: 1
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7900,11 +7772,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7929,11 +7801,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7958,11 +7830,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7986,11 +7858,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -8014,11 +7886,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -8054,11 +7926,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 1aecd21c5a..b3a17a4060 100644
--- a/data/drules_proto_clear.bin
+++ b/data/drules_proto_clear.bin
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index f0c7ac11a2..7b3d60a9d0 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5480,10 +5480,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-m"
       priority: 16813
@@ -5500,10 +5496,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5519,10 +5511,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5538,10 +5526,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5576,10 +5560,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-m"
       priority: 16813
@@ -5596,10 +5576,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5615,10 +5591,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5634,10 +5606,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5672,10 +5640,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-m"
       priority: 16813
@@ -5692,10 +5656,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5711,10 +5671,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5730,10 +5686,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5768,10 +5720,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-m"
       priority: 16813
@@ -5788,10 +5736,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5807,10 +5751,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5826,10 +5766,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5864,10 +5800,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-m"
       priority: 16813
@@ -5884,10 +5816,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5903,10 +5831,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5922,10 +5846,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5960,10 +5880,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-m"
       priority: 16813
@@ -5980,10 +5896,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -5999,10 +5911,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6018,10 +5926,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6056,10 +5960,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-m"
       priority: 16813
@@ -6076,10 +5976,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6095,10 +5991,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6114,10 +6006,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6152,10 +6040,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-m"
       priority: 16813
@@ -6172,10 +6056,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6191,10 +6071,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6210,10 +6086,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 16316664
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6969,12 +6841,12 @@ cont {
     scale: 15
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-m"
       apply_for_type: 1
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7036,11 +6908,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7065,11 +6937,11 @@ cont {
     scale: 17
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7094,11 +6966,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7122,11 +6994,11 @@ cont {
     scale: 18
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7150,11 +7022,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7190,11 +7062,11 @@ cont {
     scale: 19
     area {
       color: 16311482
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 48b3baa1e7..9daad6edcc 100644
--- a/data/drules_proto_dark.bin
+++ b/data/drules_proto_dark.bin
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 611a3e7271..172b44e8ab 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5480,10 +5480,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-m"
       priority: 16813
@@ -5500,10 +5496,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5519,10 +5511,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5538,10 +5526,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "place-of-worship-l"
       priority: 16813
@@ -5576,10 +5560,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "buddhist-m"
       priority: 16813
@@ -5596,10 +5576,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5615,10 +5591,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5634,10 +5606,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "buddhist-l"
       priority: 16813
@@ -5672,10 +5640,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "christian-m"
       priority: 16813
@@ -5692,10 +5656,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5711,10 +5671,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5730,10 +5686,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "christian-l"
       priority: 16813
@@ -5768,10 +5720,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "hindu-m"
       priority: 16813
@@ -5788,10 +5736,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5807,10 +5751,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5826,10 +5766,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "hindu-l"
       priority: 16813
@@ -5864,10 +5800,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "jewish-m"
       priority: 16813
@@ -5884,10 +5816,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5903,10 +5831,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5922,10 +5846,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "jewish-l"
       priority: 16813
@@ -5960,10 +5880,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "muslim-m"
       priority: 16813
@@ -5980,10 +5896,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -5999,10 +5911,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6018,10 +5926,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "muslim-l"
       priority: 16813
@@ -6056,10 +5960,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "shinto-m"
       priority: 16813
@@ -6076,10 +5976,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6095,10 +5991,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6114,10 +6006,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "shinto-l"
       priority: 16813
@@ -6152,10 +6040,6 @@ cont {
   }
   element {
     scale: 16
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "taoist-m"
       priority: 16813
@@ -6172,10 +6056,6 @@ cont {
   }
   element {
     scale: 17
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6191,10 +6071,6 @@ cont {
   }
   element {
     scale: 18
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6210,10 +6086,6 @@ cont {
   }
   element {
     scale: 19
-    area {
-      color: 5064516
-      priority: -15187
-    }
     symbol {
       name: "taoist-l"
       priority: 16813
@@ -6969,12 +6841,12 @@ cont {
     scale: 15
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-m"
       apply_for_type: 1
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7036,11 +6908,11 @@ cont {
     scale: 17
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7065,11 +6937,11 @@ cont {
     scale: 17
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
       min_distance: 10
     }
     caption {
@@ -7094,11 +6966,11 @@ cont {
     scale: 18
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7122,11 +6994,11 @@ cont {
     scale: 18
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7150,11 +7022,11 @@ cont {
     scale: 19
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
@@ -7190,11 +7062,11 @@ cont {
     scale: 19
     area {
       color: 2498323
-      priority: -15099
+      priority: -15991
     }
     symbol {
       name: "college-l"
-      priority: 16901
+      priority: 16009
     }
     caption {
       primary {
diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index c469f241d3..055b316f95 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -28,7 +28,7 @@ node|z14[tourism=viewpoint] { icon-image: viewpoint-s.svg; text-offset: 6; font-
 node|z14[tourism=attraction], area|z14[tourism=attraction] { icon-image: tourism-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2840; icon-min-distance: 12;}
 node|z14[amenity=community_centre], area|z14[amenity=community_centre] { icon-image: tourism-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2840; icon-min-distance: 8;}
 
-area|z14[amenity=university][name] { icon-image: college-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 1; icon-min-distance: 12; -x-me-text-priority:16000; z-index: 2890;}
+area|z14[amenity=university][name] { icon-image: college-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 1; icon-min-distance: 12; -x-me-text-priority:16000;}
 node|z14[amenity=theatre], area|z14[amenity=theatre] { icon-image: theatre-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2790; icon-min-distance: 8;}
 
 node|z14[tourism=hotel] { icon-image: hotel-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2820; icon-min-distance: 24; text-halo-color: @halo_park_label; text-halo-radius: 0.5; text-halo-opacity: 0.8;}
@@ -81,8 +81,8 @@ node|z15[tourism=artwork] { icon-image: tourism-m.svg; text-offset: 10; font-siz
 node|z15[amenity=community_centre], area|z15[amenity=community_centre] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2840; icon-min-distance: 24;}
 
 
-area|z155[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 12; -x-me-text-priority:16000; z-index: 2890;}
-node|z15[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 10; -x-me-text-priority:1600; z-index: 2890;}
+area|z155[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 12; -x-me-text-priority:16000;}
+node|z15[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 10; -x-me-text-priority:1600;}
 node|z15[amenity=university][!name] { }
 
 node|z15-16[leisure=stadium] { icon-image: stadium-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2848; icon-min-distance: 8; }
@@ -138,7 +138,7 @@ node|z16[tourism=zoo], area|z16[tourism=zoo] { icon-image: zoo-m.svg; text-offse
 node|z16[tourism=information]{ icon-image: information-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2200; icon-min-distance: 10;}
 
 
-ode|z16[amenity=university][name], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1;icon-min-distance: 11; -x-me-text-priority:16000; z-index: 2890;}
+ode|z16[amenity=university][name], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1;icon-min-distance: 11; -x-me-text-priority:16000;}
 node|z16[amenity=university][!name], area|z16[amenity=university][!name] { }
 
 node|z16[tourism=museum],area|z16[tourism=museum] { icon-image: museum-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label; z-index: 2846; icon-min-distance: 12;}
@@ -278,7 +278,7 @@ node|z17-[tourism=zoo], area|z17-[tourism=zoo] { icon-image: zoo-l.svg; text-off
 node|z17-[tourism=viewpoint] { icon-image: viewpoint-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2850; }
 node|z17-[tourism=information]{ icon-image: information-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label; z-index: 2200; }
 
-node|z17[amenity=university][name], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 10; -x-me-text-priority:16000; z-index: 2890;}
+node|z17[amenity=university][name], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 10; -x-me-text-priority:16000;}
 node|z17[amenity=university][!name], area|z17[amenity=university][!name] { }
 
 node|z17-[leisure=stadium] { icon-image: stadium-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2848; icon-min-distance: 8; }
@@ -483,7 +483,7 @@ node|z18-[amenity=doctors],area|z18-[amenity=doctors]{ icon-image: hospital-l.sv
 node|z18-[amenity=veterinary], area|z18-[amenity=veterinary] { icon-image: veterinary-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
 node|z18-[amenity=pharmacy], area|z18-[amenity=pharmacy] { icon-image: pharmacy-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2900; }
 
-node|z18-[amenity=university][name], area|z18-[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; -x-me-text-priority:16000; z-index: 2890;}
+node|z18-[amenity=university][name], area|z18-[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; -x-me-text-priority:16000;}
 node|z18-[amenity=university][!name], area|z18-[amenity=university][!name] { }
 
 node|z18-[tourism=hotel]{ icon-image: hotel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2820; text-halo-color: @halo_park_label; text-halo-radius: 0.5; text-halo-opacity: 0.8;}
diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss
index 6ba9d305dc..e13cf5b496 100644
--- a/data/styles/clear/include/landuse.mapcss
+++ b/data/styles/clear/include/landuse.mapcss
@@ -192,9 +192,6 @@ area|z16-[amenity=doctors]{
 }
 area|z16-[amenity=place_of_worship]
 {
- fill-color: @pedestrian;
- fill-opacity: 1;
- fill-position: background;
  z-index: 210;
 
 }