diff --git a/data/drules_proto_clear.prios.txt b/data/drules_proto_clear.prios.txt
index 649aeac95d..562bbde7cc 100644
--- a/data/drules_proto_clear.prios.txt
+++ b/data/drules_proto_clear.prios.txt
@@ -668,7 +668,6 @@ OVRL/z14	 text	 amenity-grave_yard            	 z[17-19]
 OVRL/z14	 text	 amenity-grave_yard-christian  	 z[17-19]
 OVRL/z14	 text	 landuse-cemetery              	 z[15-19]
 OVRL/z14	 text	 landuse-cemetery-christian    	 z[15-19]
-OVRL/z14	 text	 amenity-university-if[!name]  	 z[15-19]
 OVRL/z14	 text	 building                      	 z[16-19]
 OVRL/z14	 text	 building-garage               	 z[16-19]
 OVRL/z14	 text	 building-has_parts            	 z[16-19]
@@ -1336,9 +1335,6 @@ OVRL/z16	 text	 tourism-information-office    	 z[16-17]
 OVRL/z16	 text	 man_made-survey_point         	 z[16-19]
 OVRL/z16	 text	 amenity-fountain              	 z[16-19]
 OVRL/z16	 text	 amenity-charging_station      	 z[16]
-OVRL/z16	 text	 man_made-silo                 	 z[18-19]
-OVRL/z16	 text	 man_made-storage_tank         	 z[18-19]
-OVRL/z16	 text	 man_made-works                	 z[18-19]
 OVRL/z16	 text	 building-address              	 z[16-19]
 OVRL/z16	 text	 public_transport-platform     	 z[17-19]
 OVRL/z16	 text	 railway-platform              	 z[16-19]
@@ -1351,6 +1347,9 @@ OVRL/z16	 text	 barrier-gate                  	 z[16-19]
 OVRL/z16	 text	 barrier-kissing_gate          	 z[16-19]
 OVRL/z16	 text	 barrier-stile                 	 z[16-19]
 OVRL/z16	 text	 barrier-swing_gate            	 z[16-19]
+OVRL/z16	 text	 man_made-silo                 	 z[18-19]
+OVRL/z16	 text	 man_made-storage_tank         	 z[18-19]
+OVRL/z16	 text	 man_made-works                	 z[18-19]
 OVRL/z17	 icon	 aeroway-gate                  	 z[18-19]
 OVRL/z17	 icon	 amenity-cinema                	 z[17-19]
 OVRL/z17	 icon	 amenity-clinic                	 z[17-19]
@@ -1724,16 +1723,16 @@ OVRL/z18	 text	 amenity-hunting_stand         	 z[18-19]
 OVRL/z18	 text	 amenity-post_box              	 z[18-19]
 OVRL/z18	 text	 amenity-waste_basket          	 z[19]
 OVRL/z18	 text	 amenity-waste_disposal        	 z[18-19]
-OVRL/z18	 text	 amenity-internet_cafe         	 z[19]
-OVRL/z18	 text	 amenity-loading_dock          	 z[19]
-OVRL/z18	 text	 amenity-parking_space-disabled	 z[19]
-OVRL/z18	 text	 amenity-loading_dock          	 z[18]
+OVRL/z18	 text	 amenity-loading_dock          	 z[18-19]
 OVRL/z18	 text	 entrance-main                 	 z[18-19]
+OVRL/z18	 text	 amenity-internet_cafe         	 z[19]
+OVRL/z18	 text	 amenity-parking_space-disabled	 z[19]
 OVRL/z18	 text	 emergency-defibrillator       	 z[18-19]
 OVRL/z18	 text	 emergency-fire_hydrant        	 z[18-19]
 OVRL/z19	 icon	 power-substation              	 z[19]
 OVRL/z19	 icon	 entrance                      	 z[19]
 OVRL/z19	 text	 power-substation              	 z[19]
+OVRL/z19	 text	 entrance                      	 z[19]
 OVRL/z19	 text	 amenity                       	 z[19]
 OVRL/z19	 text	 amenity-brothel               	 z[19]
 OVRL/z19	 text	 amenity-parking_space         	 z[19]
@@ -1742,7 +1741,6 @@ OVRL/z19	 text	 amenity-parking_space-private 	 z[19]
 OVRL/z19	 text	 amenity-parking_space-underground	 z[19]
 OVRL/z19	 text	 amenity-public_bookcase       	 z[19]
 OVRL/z19	 text	 amenity-townhall              	 z[19]
-OVRL/z19	 text	 entrance                      	 z[19]
 GEOM	 area	 man_made-breakwater           	 z[17-19]
 GEOM	 area	 man_made-pier                 	 z[17-19]
 GEOM	 line1	 waterway-dam                  	 z[14-19]
@@ -2261,8 +2259,6 @@ amenity-charging_station-motorcar	 text	 	 z[14-16]	 15500
 amenity-charging_station-motorcar	 text	 	 z[17-19]	 15647
 amenity-fuel                  	 text	 	 z[14-16]	 15500
 amenity-fuel                  	 text	 	 z[17-19]	 15647
-amenity-loading_dock          	 text	 	 z[18]	 15038
-amenity-loading_dock          	 text	 	 z[19]	 15300
 building-train_station        	 area	 	 z[16-19]	 1267
 building-train_station        	 area	 	 z[14-15]	 1962
 craft-beekeeper               	 icon	 	 z[17]	 16000
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 6ff00151d0..ec1452a814 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3212,7 +3212,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3232,7 +3232,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3249,7 +3249,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3266,7 +3266,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3764,7 +3764,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -5016,7 +5016,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -5934,7 +5934,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -6042,7 +6042,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -6112,7 +6112,7 @@ cont {
         offset_x: 1
         offset_y: 1
       }
-      priority: 15300
+      priority: 15038
     }
   }
 }
@@ -6199,7 +6199,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -6216,7 +6216,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -6233,7 +6233,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -6265,7 +6265,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -6347,7 +6347,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -6363,7 +6363,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -6379,7 +6379,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -6483,7 +6483,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
   element {
@@ -6503,7 +6503,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
 }
@@ -6556,7 +6556,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
   element {
@@ -6576,7 +6576,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
 }
@@ -6629,7 +6629,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
   element {
@@ -6649,7 +6649,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
 }
@@ -6702,7 +6702,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
   element {
@@ -6722,7 +6722,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
 }
@@ -6775,7 +6775,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
   element {
@@ -6795,7 +6795,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
 }
@@ -6848,7 +6848,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
   element {
@@ -6868,7 +6868,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
 }
@@ -6921,7 +6921,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
   element {
@@ -6941,7 +6941,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
 }
@@ -6994,7 +6994,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
   element {
@@ -7014,7 +7014,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15104
     }
   }
 }
@@ -7047,7 +7047,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -7080,7 +7080,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -7113,7 +7113,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -7127,7 +7127,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -7152,7 +7152,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -7166,7 +7166,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -7180,7 +7180,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -7194,7 +7194,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -7213,7 +7213,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -7229,7 +7229,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -7245,7 +7245,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -8561,7 +8561,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -9284,7 +9284,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -9338,14 +9338,6 @@ cont {
       color: 16311482
       priority: -15981
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
     apply_if: "!name"
   }
   element {
@@ -9375,14 +9367,6 @@ cont {
       color: 16311482
       priority: -15981
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
     apply_if: "!name"
   }
   element {
@@ -9412,14 +9396,6 @@ cont {
       color: 16311482
       priority: -15981
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
     apply_if: "!name"
   }
   element {
@@ -9449,14 +9425,6 @@ cont {
       color: 16311482
       priority: -15981
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
     apply_if: "!name"
   }
   element {
@@ -9486,14 +9454,6 @@ cont {
       color: 16311482
       priority: -15981
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
     apply_if: "!name"
   }
 }
@@ -42612,7 +42572,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -42627,7 +42587,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -42659,7 +42619,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -42674,7 +42634,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -42929,7 +42889,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -42944,7 +42904,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
diff --git a/data/drules_proto_vehicle_clear.prios.txt b/data/drules_proto_vehicle_clear.prios.txt
index ec313fb957..74c2ec570c 100644
--- a/data/drules_proto_vehicle_clear.prios.txt
+++ b/data/drules_proto_vehicle_clear.prios.txt
@@ -593,17 +593,16 @@ OVRL/z15	 text	 amenity-cafe                  	 z[15-19]
 OVRL/z15	 text	 amenity-theatre               	 z[15-19]
 OVRL/z15	 text	 highway-motorway_junction     	 z[15-19]
 OVRL/z15	 text	 shop-car_repair-tyres         	 z[15-16]
-OVRL/z15	 text	 amenity-parking-permissive    	 z[17]
-OVRL/z15	 text	 amenity-parking-private       	 z[17]
-OVRL/z15	 text	 amenity-sanitary_dump_station 	 z[15-19]
-OVRL/z15	 text	 amenity-university-if[!name]  	 z[15-19]
 OVRL/z15	 text	 building                      	 z[18-19]
 OVRL/z15	 text	 building-garage               	 z[18-19]
 OVRL/z15	 text	 building-has_parts            	 z[18-19]
 OVRL/z15	 text	 building-train_station        	 z[18-19]
+OVRL/z15	 text	 amenity-parking-permissive    	 z[17]
+OVRL/z15	 text	 amenity-parking-private       	 z[17]
 OVRL/z15	 text	 landuse-landfill              	 z[15-19]
 OVRL/z15	 text	 landuse-quarry                	 z[15-19]
 OVRL/z15	 text	 landuse-railway               	 z[15-19]
+OVRL/z15	 text	 amenity-sanitary_dump_station 	 z[15-19]
 OVRL/z16	 icon	 amenity-charging_station      	 z[16-19]
 OVRL/z16	 icon	 barrier-lift_gate             	 z[16-19]
 OVRL/z16	 icon	 historic-boundary_stone       	 z[16-19]
@@ -916,8 +915,8 @@ OVRL/z17	 text	 amenity-vending_machine-sweets	 z[17-19]
 OVRL/z18	 icon	 amenity-car_rental            	 z[18-19]
 OVRL/z18	 icon	 amenity-car_sharing           	 z[18-19]
 OVRL/z18	 text	 amenity-car_rental            	 z[18-19]
-OVRL/z18	 text	 amenity-car_sharing           	 z[18-19]
 OVRL/z18	 text	 building-address              	 z[18-19]
+OVRL/z18	 text	 amenity-car_sharing           	 z[18-19]
 GEOM	 area	 building-train_station        	 z[15-17]
 GEOM	 line1	 waterway-dam                  	 z[15-19]
 GEOM	 line1	 waterway-ditch                	 z[17-19]
@@ -1387,7 +1386,7 @@ amenity-parking-permissive    	 area	 	 z[15-16]	 -15036
 amenity-parking-permissive    	 icon	 	 z[17]	 16047
 amenity-parking-permissive    	 icon	 	 z[18-19]	 16917
 amenity-parking-permissive    	 icon	 	 z[15-16]	 16964
-amenity-parking-permissive    	 text	 	 z[17]	 15300
+amenity-parking-permissive    	 text	 	 z[17]	 15047
 amenity-parking-permissive    	 text	 	 z[18-19]	 15917
 amenity-parking-permissive    	 text	 	 z[16]	 15964
 amenity-parking-private       	 area	 	 z[17]	 -15953
@@ -1396,7 +1395,7 @@ amenity-parking-private       	 area	 	 z[15-16]	 -15036
 amenity-parking-private       	 icon	 	 z[17]	 16047
 amenity-parking-private       	 icon	 	 z[18-19]	 16917
 amenity-parking-private       	 icon	 	 z[15-16]	 16964
-amenity-parking-private       	 text	 	 z[17]	 15300
+amenity-parking-private       	 text	 	 z[17]	 15047
 amenity-parking-private       	 text	 	 z[18-19]	 15917
 amenity-parking-private       	 text	 	 z[16]	 15964
 amenity-parking-underground   	 area	 	 z[17-19]	 -15083
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index bfd1417bd6..5437378437 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -641,7 +641,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -657,7 +657,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -673,7 +673,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -807,7 +807,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -822,7 +822,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -1491,7 +1491,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -1507,7 +1507,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -1523,7 +1523,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -2053,7 +2053,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15047
     }
   }
   element {
@@ -2148,7 +2148,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15047
     }
   }
   element {
@@ -2500,7 +2500,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2516,7 +2516,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2532,7 +2532,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
 }
@@ -2559,7 +2559,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2575,7 +2575,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2591,7 +2591,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
 }
@@ -2618,7 +2618,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2634,7 +2634,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2650,7 +2650,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
 }
@@ -2677,7 +2677,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2693,7 +2693,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2709,7 +2709,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
 }
@@ -2736,7 +2736,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2752,7 +2752,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2768,7 +2768,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
 }
@@ -2795,7 +2795,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2811,7 +2811,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2827,7 +2827,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
 }
@@ -2854,7 +2854,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2870,7 +2870,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2886,7 +2886,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
 }
@@ -2913,7 +2913,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2929,7 +2929,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
   element {
@@ -2945,7 +2945,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15294
     }
   }
 }
@@ -2991,7 +2991,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3007,7 +3007,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3023,7 +3023,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3109,7 +3109,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3125,7 +3125,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3141,7 +3141,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3157,7 +3157,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3173,7 +3173,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3274,18 +3274,6 @@ cont {
     }
     apply_if: "name"
   }
-  element {
-    scale: 15
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 16
     symbol {
@@ -3303,18 +3291,6 @@ cont {
     }
     apply_if: "name"
   }
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 17
     symbol {
@@ -3332,18 +3308,6 @@ cont {
     }
     apply_if: "name"
   }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 18
     symbol {
@@ -3361,18 +3325,6 @@ cont {
     }
     apply_if: "name"
   }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
-    apply_if: "!name"
-  }
   element {
     scale: 19
     symbol {
@@ -3389,18 +3341,6 @@ cont {
     }
     apply_if: "name"
   }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15300
-    }
-    apply_if: "!name"
-  }
 }
 cont {
   name: "amenity-vending_machine"
@@ -3417,7 +3357,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3433,7 +3373,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3449,7 +3389,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3468,7 +3408,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3484,7 +3424,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3500,7 +3440,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3519,7 +3459,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3535,7 +3475,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3551,7 +3491,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3570,7 +3510,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3586,7 +3526,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3602,7 +3542,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3621,7 +3561,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3637,7 +3577,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3653,7 +3593,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3672,7 +3612,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3688,7 +3628,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3704,7 +3644,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3723,7 +3663,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3739,7 +3679,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3755,7 +3695,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3782,7 +3722,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3798,7 +3738,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3817,7 +3757,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3833,7 +3773,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3849,7 +3789,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3868,7 +3808,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3884,7 +3824,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3900,7 +3840,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3919,7 +3859,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3935,7 +3875,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3951,7 +3891,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }
@@ -3970,7 +3910,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -3986,7 +3926,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
   element {
@@ -4002,7 +3942,7 @@ cont {
         color: 4473924
         offset_y: 1
       }
-      priority: 15300
+      priority: 15000
     }
   }
 }