diff --git a/data/classificator.txt b/data/classificator.txt
index 84fdc265a..ca688fcbc 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -83,6 +83,7 @@ world  +
         language_school  -
         library  -
         loading_dock  -
+        love_hotel  -
         marketplace  -
         money_transfer  -
         motorcycle_parking  -
@@ -159,6 +160,7 @@ world  +
         shower  -
         social_facility  -
         stripclub  -
+        studio  -
         taxi  -
         telephone  -
         theatre  -
@@ -227,6 +229,7 @@ world  +
         entrance  -
         fence  -
         gate  -
+        guard_rail  -
         hedge  -
         kissing_gate  -
         lift_gate  -
@@ -438,6 +441,7 @@ world  +
             tunnel  -
             {}
         ford  -
+        ladder  -
         living_street  +
             bridge  -
             tunnel  -
@@ -643,6 +647,7 @@ world  +
             danger_area  -
             {}
         orchard  -
+        plant_nursery  -
         quarry  -
         railway  -
         recreation_ground  -
@@ -661,6 +666,7 @@ world  +
         common  -
         dance  -
         dog_park  -
+        firepit  -
         fitness_centre  -
         fitness_station  -
         garden  +
@@ -1051,6 +1057,7 @@ world  +
                 paris  -
                 philadelphia  -
                 pyongyang  -
+                qingdao  -
                 rennes  -
                 rio  -
                 roma  -
@@ -1172,6 +1179,7 @@ world  +
             paris  -
             philadelphia  -
             pyongyang  -
+            qingdao  -
             rennes  -
             rio  -
             roma  -
diff --git a/data/colors.txt b/data/colors.txt
index 5801c34d7..4878faf8c 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -598,6 +598,7 @@
 2569151010
 2570269491
 2570486556
+2571387972
 2571723081
 2571847235
 2572571903
@@ -606,6 +607,7 @@
 2573352319
 2574138695
 2575126307
+2575861896
 2576111654
 2576201856
 2576782726
@@ -630,11 +632,13 @@
 3005358626
 3006477107
 3006694172
+3007595588
 3007916315
 3008113177
 3008779519
 3009559935
 3010346311
+3012069512
 3015998207
 3016153515
 3018761472
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index a38049abc..0037bf3e9 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 8001306a0..5ec9ba2b2 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -7461,6 +7461,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-love_hotel"
+  element {
+    scale: 18
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -13060,6 +13111,93 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-studio"
+  element {
+    scale: 16
+    symbol {
+      name: "studio-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "amenity-taxi"
   element {
@@ -16593,6 +16731,49 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-guard_rail"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2156431496
+      priority: 320
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 2156431496
+      priority: 320
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.3
+      color: 1720223880
+      priority: 320
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.3
+      color: 1720223880
+      priority: 320
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.3
+      color: 1720223880
+      priority: 320
+    }
+  }
+}
 cont {
   name: "barrier-hedge"
   element {
@@ -25919,6 +26100,89 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-ladder"
+  element {
+    scale: 16
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
 cont {
   name: "highway-living_street"
   element {
@@ -50217,6 +50481,124 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-plant_nursery"
+  element {
+    scale: 12
+    area {
+      color: 13620648
+      priority: -1930
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13620648
+      priority: -1930
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+}
 cont {
   name: "landuse-quarry"
   element {
@@ -51552,46 +51934,70 @@ cont {
   name: "leisure-dance"
   element {
     scale: 17
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 20
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
 }
@@ -51683,6 +52089,89 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-firepit"
+  element {
+    scale: 16
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "leisure-fitness_centre"
   element {
@@ -97076,6 +97565,184 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-qingdao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+}
 cont {
   name: "railway-station-subway-rennes"
   element {
@@ -111875,6 +112542,112 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-qingdao"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-rennes"
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index c3d886cff..eef405750 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 1d9579e7d..6e4e390cb 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -7303,6 +7303,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-love_hotel"
+  element {
+    scale: 18
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -12502,6 +12553,93 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-studio"
+  element {
+    scale: 16
+    symbol {
+      name: "studio-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "amenity-taxi"
   element {
@@ -15827,6 +15965,41 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-guard_rail"
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 2151957572
+      priority: 320
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.3
+      color: 1715749956
+      priority: 320
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.3
+      color: 1715749956
+      priority: 320
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.3
+      color: 1715749956
+      priority: 320
+    }
+  }
+}
 cont {
   name: "barrier-hedge"
   element {
@@ -23978,6 +24151,73 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-ladder"
+  element {
+    scale: 17
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
 cont {
   name: "highway-living_street"
   element {
@@ -47638,6 +47878,124 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-plant_nursery"
+  element {
+    scale: 12
+    area {
+      color: 988160
+      priority: -1930
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 988160
+      priority: -1930
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1251584
+      priority: -1930
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1251584
+      priority: -1930
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1251584
+      priority: -1930
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1251584
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1251584
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1251584
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 1251584
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+}
 cont {
   name: "landuse-quarry"
   element {
@@ -48973,46 +49331,70 @@ cont {
   name: "leisure-dance"
   element {
     scale: 17
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 20
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
 }
@@ -49104,6 +49486,57 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-firepit"
+  element {
+    scale: 18
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "leisure-fitness_centre"
   element {
@@ -91978,6 +92411,184 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-qingdao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 11
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+}
 cont {
   name: "railway-station-subway-rennes"
   element {
@@ -106777,6 +107388,112 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-qingdao"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-rennes"
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index e97914122..5405c34ac 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index 746f61f01..1dd2da16a 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -7303,6 +7303,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-love_hotel"
+  element {
+    scale: 18
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -12502,6 +12553,93 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-studio"
+  element {
+    scale: 16
+    symbol {
+      name: "studio-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "amenity-taxi"
   element {
@@ -15827,6 +15965,41 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-guard_rail"
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 2156431496
+      priority: 320
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.3
+      color: 1720223880
+      priority: 320
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.3
+      color: 1720223880
+      priority: 320
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.3
+      color: 1720223880
+      priority: 320
+    }
+  }
+}
 cont {
   name: "barrier-hedge"
   element {
@@ -23978,6 +24151,73 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-ladder"
+  element {
+    scale: 17
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
 cont {
   name: "highway-living_street"
   element {
@@ -47374,6 +47614,124 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-plant_nursery"
+  element {
+    scale: 12
+    area {
+      color: 13620648
+      priority: -1930
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13620648
+      priority: -1930
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+}
 cont {
   name: "landuse-quarry"
   element {
@@ -48709,46 +49067,70 @@ cont {
   name: "leisure-dance"
   element {
     scale: 17
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 20
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
 }
@@ -48840,6 +49222,57 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-firepit"
+  element {
+    scale: 18
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "leisure-fitness_centre"
   element {
@@ -91763,6 +92196,184 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-qingdao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+}
 cont {
   name: "railway-station-subway-rennes"
   element {
@@ -106562,6 +107173,112 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-qingdao"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-rennes"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 81804c310..678eedcd7 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 2183650c3..2f55b5ce9 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -3420,15 +3420,6 @@ cont {
       name: "bbq-m"
       priority: 450
     }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9550
-    }
   }
   element {
     scale: 17
@@ -7454,6 +7445,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-love_hotel"
+  element {
+    scale: 18
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -12896,6 +12938,93 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-studio"
+  element {
+    scale: 16
+    symbol {
+      name: "studio-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "amenity-taxi"
   element {
@@ -16406,6 +16535,49 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-guard_rail"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2151957572
+      priority: 320
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1296319556
+      priority: 320
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.3
+      color: 860111940
+      priority: 320
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.3
+      color: 860111940
+      priority: 320
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.3
+      color: 860111940
+      priority: 320
+    }
+  }
+}
 cont {
   name: "barrier-hedge"
   element {
@@ -25455,6 +25627,80 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-ladder"
+  element {
+    scale: 16
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
 cont {
   name: "highway-living_street"
   element {
@@ -50263,6 +50509,124 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-plant_nursery"
+  element {
+    scale: 12
+    area {
+      color: 988160
+      priority: -1930
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 988160
+      priority: -1930
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1251584
+      priority: -1930
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1251584
+      priority: -1930
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1251584
+      priority: -1930
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 1251584
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 1251584
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1251584
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 1251584
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+}
 cont {
   name: "landuse-quarry"
   element {
@@ -51598,46 +51962,70 @@ cont {
   name: "leisure-dance"
   element {
     scale: 17
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 20
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
 }
@@ -51729,6 +52117,80 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-firepit"
+  element {
+    scale: 16
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "leisure-fitness_centre"
   element {
@@ -97901,6 +98363,184 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-qingdao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 11
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+}
 cont {
   name: "railway-station-subway-rennes"
   element {
@@ -112700,6 +113340,112 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-qingdao"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-rennes"
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 12c4d5840..a324b46cd 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 6d8275b3d..5dcbc838b 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -3420,15 +3420,6 @@ cont {
       name: "bbq-m"
       priority: 450
     }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9550
-    }
   }
   element {
     scale: 17
@@ -7454,6 +7445,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-love_hotel"
+  element {
+    scale: 18
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "stripclub-m"
+      priority: 500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9500
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -12896,6 +12938,93 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-studio"
+  element {
+    scale: 16
+    symbol {
+      name: "studio-m"
+      priority: 1550
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "studio-m"
+      priority: 1550
+      min_distance: 24
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8450
+    }
+  }
+}
 cont {
   name: "amenity-taxi"
   element {
@@ -16406,6 +16535,49 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-guard_rail"
+  element {
+    scale: 16
+    lines {
+      width: 1.0
+      color: 2156431496
+      priority: 320
+    }
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 1300793480
+      priority: 320
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.3
+      color: 864585864
+      priority: 320
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.3
+      color: 864585864
+      priority: 320
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.3
+      color: 864585864
+      priority: 320
+    }
+  }
+}
 cont {
   name: "barrier-hedge"
   element {
@@ -25455,6 +25627,80 @@ cont {
     }
   }
 }
+cont {
+  name: "highway-ladder"
+  element {
+    scale: 16
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ladder-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
 cont {
   name: "highway-living_street"
   element {
@@ -49999,6 +50245,124 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-plant_nursery"
+  element {
+    scale: 12
+    area {
+      color: 13620648
+      priority: -1930
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13620648
+      priority: -1930
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13029267
+      priority: -1930
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 13029267
+      priority: -1930
+    }
+    symbol {
+      name: "plant_nursery-m"
+      priority: 2450
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7550
+    }
+  }
+}
 cont {
   name: "landuse-quarry"
   element {
@@ -51334,46 +51698,70 @@ cont {
   name: "leisure-dance"
   element {
     scale: 17
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
   element {
     scale: 20
+    symbol {
+      name: "dance-m"
+      priority: 1250
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 1600
+      priority: -8750
     }
   }
 }
@@ -51465,6 +51853,80 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-firepit"
+  element {
+    scale: 16
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "firepit-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "leisure-fitness_centre"
   element {
@@ -97686,6 +98148,184 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-qingdao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 6250
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -3750
+    }
+  }
+}
 cont {
   name: "railway-station-subway-rennes"
   element {
@@ -112485,6 +113125,112 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-qingdao"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 3700
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -6300
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-rennes"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 94daed3e8..d634a7b12 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 6868d3d5a..db8796559 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -6085,6 +6085,41 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-guard_rail"
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 3007595588
+      priority: 260
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.3
+      color: 2571387972
+      priority: 260
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.3
+      color: 2571387972
+      priority: 260
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.3
+      color: 2571387972
+      priority: 260
+    }
+  }
+}
 cont {
   name: "barrier-hedge"
   element {
@@ -63061,6 +63096,167 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-qingdao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 2000
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 2000
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 856032768
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+}
 cont {
   name: "railway-station-subway-rennes"
   element {
@@ -77259,6 +77455,112 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-qingdao"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 436602368
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9450
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-rennes"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 2c48ecaab..302b94c0d 100644
Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ
diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index ebd060233..12cb644ee 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -6085,6 +6085,41 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-guard_rail"
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 3012069512
+      priority: 260
+    }
+  }
+  element {
+    scale: 18
+    lines {
+      width: 1.3
+      color: 2575861896
+      priority: 260
+    }
+  }
+  element {
+    scale: 19
+    lines {
+      width: 1.3
+      color: 2575861896
+      priority: 260
+    }
+  }
+  element {
+    scale: 20
+    lines {
+      width: 1.3
+      color: 2575861896
+      priority: 260
+    }
+  }
+}
 cont {
   name: "barrier-hedge"
   element {
@@ -62521,6 +62556,167 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-qingdao"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 2000
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 2000
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-m"
+      priority: 2000
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8000
+    }
+  }
+}
 cont {
   name: "railway-station-subway-rennes"
   element {
@@ -76719,6 +76915,112 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-qingdao"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9450
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "subway-qingdao-s"
+      priority: 550
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9450
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-rennes"
   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 f99140827..62cb1e323 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
@@ -118,7 +118,7 @@ natural-scree                                       # area z11-
 natural-shingle                                     # area z12-
 === 80
 
-landuse-plant_nursery                               # area z12- (also has icon z16-, caption(optional) z16-)
+landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
 leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
 leisure-garden-residential                          # area z12-
 leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 59f1ce3dc..46230d9b0 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -58,7 +58,7 @@ waterway-weir                                       # line z14- (also has pathte
 
 barrier-city_wall                                   # line z14- (also has pathtext z16-)
 barrier-fence                                       # line z16-
-barrier-guard_rail
+barrier-guard_rail                                  # line z17-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z16-
 railway-funicular                                   # line z12-
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index e3dd46f36..b8440b975 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -816,9 +816,9 @@ highway-construction                                # pathtext z15- (also has li
 highway-living_street                               # pathtext z14- (also has line z12-)
 highway-living_street-bridge                        # pathtext z14- (also has line z12-)
 highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
+landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
-landuse-plant_nursery
 leisure-swimming_pool                               # icon z17- (also has caption(optional) z17-, area z13-)
 tourism-zoo-petting                                 # icon z15- (also has caption(optional) z15-)
 === 2450
@@ -986,6 +986,7 @@ shop-video_games                                    # icon z16- (also has captio
 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-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-)
 historic-gallows                                    # icon z16- (also has caption(optional) z17-)
@@ -998,7 +999,6 @@ man_made-cross                                      # icon z16- (also has captio
 tourism-artwork                                     # icon z15- (also has caption(optional) z15-)
 tourism-artwork-architecture                        # icon z15- (also has caption(optional) z15-)
 tourism-artwork-painting                            # icon z15- (also has caption(optional) z15-)
-amenity-studio
 === 1550
 
 amenity-shelter                                     # icon z17- (also has caption(optional) z17-)
@@ -1055,10 +1055,10 @@ amenity-atm                                         # icon z18- (also has captio
 amenity-dojo                                        # icon z17- (also has caption(optional) z18-)
 isoline-step_50                                     # pathtext z16- (also has line z14-)
 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_hall                                 # icon z17- (also has caption(optional) z17-)
-leisure-dance
 === 1250
 
 amenity-compressed_air                              # icon z18- (also has caption(optional) z19-)
@@ -1086,6 +1086,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 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-)
+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-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -1097,7 +1098,6 @@ man_made-flagpole                                   # icon z15-
 man_made-flare                                      # icon z16- (also has caption(optional) z18-)
 man_made-tower                                      # icon z16- (also has caption(optional) z18-)
 man_made-tower-communication                        # icon z16- (also has caption(optional) z18-)
-highway-ladder
 === 850
 
 junction                                            # caption z17-
@@ -1110,12 +1110,12 @@ public_transport-platform                           # caption z17- (also has are
 waterway-lock_gate                                  # icon z16-
 === 700
 
-amenity-love_hotel
 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-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-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
 craft                                               # icon z18- (also has caption(optional) z18-)
@@ -1174,10 +1174,10 @@ office                                              # icon z18- (also has captio
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
 
-leisure-firepit
 amenity-bbq                                         # icon z18- (also has caption(optional) z18-)
 amenity-public_bookcase                             # icon z18- (also has caption(optional) z18-)
 cemetery-grave                                      # icon z17- (also has caption(optional) z17-)
+leisure-firepit                                     # icon z18- (also has caption(optional) z18-)
 leisure-outdoor_seating                             # icon z18-
 man_made-mast                                       # icon z16-
 man_made-silo                                       # icon z16- (also has caption(optional) z18-)
@@ -1783,6 +1783,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # attraction-historic                               # caption(optional) z17- (also has icon z17-)
 # attraction-maze                                   # caption(optional) z17- (also has icon z17-)
 # attraction-roller_coaster                         # caption(optional) z17- (also has icon z17-)
+# landuse-plant_nursery                             # caption(optional) z17- (also has icon z17-, area z12-)
 # leisure-bowling_alley                             # caption(optional) z17- (also has icon z17-)
 # leisure-garden                                    # caption(optional) z16- (also has icon z16-, area z12-)
 # leisure-swimming_pool                             # caption(optional) z17- (also has icon z17-, area z13-)
@@ -1937,6 +1938,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # 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-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-)
 # historic-gallows                                  # caption(optional) z17- (also has icon z16-)
@@ -1949,7 +1951,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-artwork                                   # caption(optional) z15- (also has icon z15-)
 # tourism-artwork-architecture                      # caption(optional) z15- (also has icon z15-)
 # tourism-artwork-painting                          # caption(optional) z15- (also has icon z15-)
-# amenity-studio
 # === -8450
 
 # amenity-shelter                                   # caption(optional) z17- (also has icon z17-)
@@ -2003,9 +2004,9 @@ 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_hall                               # caption(optional) z17- (also has icon z17-)
-# leisure-dance
 # === -8750
 
 # amenity-compressed_air                            # caption(optional) z19- (also has icon z18-)
@@ -2028,6 +2029,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # 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-)
+# 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-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
@@ -2040,12 +2042,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-works                                    # caption(optional) z17- (also has icon z16-)
 # === -9300
 
-# amenity-love_hotel
 # 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-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-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
 # craft                                             # caption(optional) z18- (also has icon z18-)
@@ -2103,10 +2105,10 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
 
-# leisure-firepit
 # amenity-bbq                                       # caption(optional) z18- (also has icon z18-)
 # amenity-public_bookcase                           # caption(optional) z18- (also has icon z18-)
 # cemetery-grave                                    # caption(optional) z17- (also has icon z17-)
+# leisure-firepit                                   # caption(optional) z18- (also has icon z18-)
 # man_made-silo                                     # caption(optional) z18- (also has icon z16-)
 # man_made-storage_tank                             # caption(optional) z18- (also has icon z16-)
 # man_made-water_tower                              # caption(optional) z18- (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 e7f9acd34..ec3d8e101 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
@@ -118,7 +118,7 @@ natural-scree                                       # area z11-
 natural-shingle                                     # area z12-
 === 80
 
-landuse-plant_nursery                               # area z12- (also has icon z16-, caption(optional) z16-)
+landuse-plant_nursery                               # area z12- (also has icon z17-, caption(optional) z17-)
 leisure-garden                                      # area z12- (also has icon z16-, caption(optional) z16-)
 leisure-garden-residential                          # area z12-
 leisure-park                                        # area z10- (also has icon z14-, caption(optional) z14-)
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index 482819ee6..c88956085 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -60,7 +60,7 @@ waterway-weir                                       # line z14- (also has pathte
 
 barrier-city_wall                                   # line z14- (also has pathtext z16-)
 barrier-fence                                       # line z15-
-barrier-guard_rail
+barrier-guard_rail                                  # line z16-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z15-
 railway-funicular                                   # line z12-
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index bb3e3f60a..040cef7ad 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -816,9 +816,9 @@ highway-construction                                # pathtext z15- (also has li
 highway-living_street                               # pathtext z14- (also has line z12-)
 highway-living_street-bridge                        # pathtext z14- (also has line z12-)
 highway-living_street-tunnel                        # pathtext z14- (also has line z12-, line(casing) z16-)
+landuse-plant_nursery                               # icon z17- (also has caption(optional) z17-, area z12-)
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
-landuse-plant_nursery
 leisure-swimming_pool                               # icon z17- (also has caption(optional) z17-, area z13-)
 tourism-zoo-petting                                 # icon z15- (also has caption(optional) z15-)
 === 2450
@@ -986,6 +986,7 @@ shop-video_games                                    # icon z16- (also has captio
 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-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-)
 historic-gallows                                    # icon z16- (also has caption(optional) z17-)
@@ -998,7 +999,6 @@ man_made-cross                                      # icon z14- (also has captio
 tourism-artwork                                     # icon z15- (also has caption(optional) z15-)
 tourism-artwork-architecture                        # icon z15- (also has caption(optional) z15-)
 tourism-artwork-painting                            # icon z15- (also has caption(optional) z15-)
-amenity-studio
 === 1550
 
 amenity-shelter                                     # icon z12- (also has caption(optional) z13-)
@@ -1055,10 +1055,10 @@ amenity-atm                                         # icon z18- (also has captio
 amenity-dojo                                        # icon z17- (also has caption(optional) z18-)
 isoline-step_50                                     # pathtext z15- (also has line z13-)
 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_hall                                 # icon z17- (also has caption(optional) z17-)
-leisure-dance
 === 1250
 
 amenity-compressed_air                              # icon z18- (also has caption(optional) z19-)
@@ -1087,6 +1087,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 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-)
+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-)
 landuse-orchard                                     # caption z15- (also has area z12-)
@@ -1098,7 +1099,6 @@ man_made-flagpole                                   # icon z12- (also has captio
 man_made-flare                                      # icon z13- (also has caption(optional) z18-)
 man_made-tower                                      # icon z13- (also has caption(optional) z14-)
 man_made-tower-communication                        # icon z13- (also has caption(optional) z14-)
-highway-ladder
 === 850
 
 junction                                            # caption z17-
@@ -1111,12 +1111,12 @@ public_transport-platform                           # caption z17- (also has are
 waterway-lock_gate                                  # icon z16-
 === 700
 
-amenity-love_hotel
 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-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-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
 craft                                               # icon z18- (also has caption(optional) z18-)
@@ -1175,10 +1175,10 @@ office                                              # icon z18- (also has captio
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
 
-leisure-firepit
-amenity-bbq                                         # icon z16- (also has caption(optional) z16-)
+amenity-bbq                                         # icon z16- (also has caption(optional) z17-)
 amenity-public_bookcase                             # icon z18- (also has caption(optional) z18-)
 cemetery-grave                                      # icon z17- (also has caption(optional) z17-)
+leisure-firepit                                     # icon z16- (also has caption(optional) z17-)
 leisure-outdoor_seating                             # icon z18-
 man_made-mast                                       # icon z13- (also has caption(optional) z14-)
 man_made-silo                                       # icon z13- (also has caption(optional) z14-)
@@ -1786,6 +1786,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # attraction-historic                               # caption(optional) z17- (also has icon z17-)
 # attraction-maze                                   # caption(optional) z17- (also has icon z17-)
 # attraction-roller_coaster                         # caption(optional) z17- (also has icon z17-)
+# landuse-plant_nursery                             # caption(optional) z17- (also has icon z17-, area z12-)
 # leisure-bowling_alley                             # caption(optional) z17- (also has icon z17-)
 # leisure-garden                                    # caption(optional) z16- (also has icon z16-, area z12-)
 # leisure-swimming_pool                             # caption(optional) z17- (also has icon z17-, area z13-)
@@ -1940,6 +1941,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # 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-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-)
 # historic-gallows                                  # caption(optional) z17- (also has icon z16-)
@@ -1952,7 +1954,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-artwork                                   # caption(optional) z15- (also has icon z15-)
 # tourism-artwork-architecture                      # caption(optional) z15- (also has icon z15-)
 # tourism-artwork-painting                          # caption(optional) z15- (also has icon z15-)
-# amenity-studio
 # === -8450
 
 # amenity-shelter                                   # caption(optional) z13- (also has icon z12-)
@@ -2006,9 +2007,9 @@ 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_hall                               # caption(optional) z17- (also has icon z17-)
-# leisure-dance
 # === -8750
 
 # amenity-compressed_air                            # caption(optional) z19- (also has icon z18-)
@@ -2031,6 +2032,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # 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-)
+# 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-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
@@ -2044,12 +2046,12 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # man_made-works                                    # caption(optional) z17- (also has icon z16-)
 # === -9300
 
-# amenity-love_hotel
 # 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-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-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
 # craft                                             # caption(optional) z18- (also has icon z18-)
@@ -2107,10 +2109,10 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
 
-# leisure-firepit
-# amenity-bbq                                       # caption(optional) z16- (also has icon z16-)
+# amenity-bbq                                       # caption(optional) z17- (also has icon z16-)
 # amenity-public_bookcase                           # caption(optional) z18- (also has icon z18-)
 # cemetery-grave                                    # caption(optional) z17- (also has icon z17-)
+# leisure-firepit                                   # caption(optional) z17- (also has icon z16-)
 # man_made-mast                                     # caption(optional) z14- (also has icon z13-)
 # man_made-silo                                     # caption(optional) z14- (also has icon z13-)
 # man_made-storage_tank                             # caption(optional) z14- (also has icon z13-)
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index daebcbbdd..72eb922c9 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -26,7 +26,7 @@ waterway-weir                                       # line z15-
 
 barrier-city_wall                                   # line z15-
 barrier-fence                                       # line z17-
-barrier-guard_rail
+barrier-guard_rail                                  # line z17-
 barrier-hedge                                       # line z18-
 barrier-wall                                        # line z17-
 railway-monorail                                    # line z14-
diff --git a/data/types.txt b/data/types.txt
index b0f8eb9b8..d99e63e0d 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -476,7 +476,7 @@ mapswithme
 *emergency|mountain_rescue
 *aerialway|platter
 *man_made|flare
-mapswithme
+*highway|ladder
 *railway|preserved|tunnel
 *boundary|protected_area|1
 *boundary|protected_area|2
@@ -548,10 +548,10 @@ mapswithme
 mapswithme
 mapswithme
 *waterway|lock_gate
-mapswithme
-mapswithme
-mapswithme
-mapswithme
+*leisure|firepit
+*barrier|guard_rail
+*amenity|studio
+*amenity|love_hotel
 highway|path|expert
 mapswithme
 mapswithme
@@ -691,7 +691,7 @@ mapswithme
 mapswithme
 *man_made|cross
 landuse|orchard
-mapswithme
+*landuse|plant_nursery
 mapswithme
 mapswithme
 mapswithme
@@ -1620,3 +1620,5 @@ amenity|recycling|container
 *railway|station|subway|shenzhen
 *railway|subway_entrance|shenzhen
 *shop|hearing_aids
+*railway|station|subway|qingdao
+*railway|subway_entrance|qingdao
diff --git a/data/visibility.txt b/data/visibility.txt
index 97bf8f602..c217caf78 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -83,6 +83,7 @@ world  000000000000000000000  +
         language_school  000000000000000000000  -
         library  000000000000000000000  -
         loading_dock  000000000000000000011  -
+        love_hotel  000000000000000000000  -
         marketplace  000000000000000000000  -
         money_transfer  000000000000000000000  -
         motorcycle_parking  000000000000000001111  -
@@ -159,6 +160,7 @@ world  000000000000000000000  +
         shower  000000000000000000000  -
         social_facility  000000000000000000000  -
         stripclub  000000000000000000000  -
+        studio  000000000000000000000  -
         taxi  000000000000000000000  -
         telephone  000000000000000000000  -
         theatre  000000000000000111111  -
@@ -227,6 +229,7 @@ world  000000000000000000000  +
         entrance  000000000000000000000  -
         fence  000000000000000001111  -
         gate  000000000000000000000  -
+        guard_rail  000000000000000001111  -
         hedge  000000000000000000111  -
         kissing_gate  000000000000000000000  -
         lift_gate  000000000000000011111  -
@@ -438,6 +441,7 @@ world  000000000000000000000  +
             tunnel  000000000000000000000  -
             {}
         ford  000000000000001111111  -
+        ladder  000000000000000000000  -
         living_street  000000000000111111111  +
             bridge  000000000000111111111  -
             tunnel  000000000000111111111  -
@@ -643,6 +647,7 @@ world  000000000000000000000  +
             danger_area  000000000011111111111  -
             {}
         orchard  000000000000111111111  -
+        plant_nursery  000000000000000000000  -
         quarry  000000000000000111111  -
         railway  000000000000000111111  -
         recreation_ground  000000000000111111111  -
@@ -661,6 +666,7 @@ world  000000000000000000000  +
         common  000000000000000000000  -
         dance  000000000000000000000  -
         dog_park  000000000000000000000  -
+        firepit  000000000000000000000  -
         fitness_centre  000000000000000000000  -
         fitness_station  000000000000000000000  -
         garden  000000000000111111111  +
@@ -1051,6 +1057,7 @@ world  000000000000000000000  +
                 paris  000000000000111111111  -
                 philadelphia  000000000000011111111  -
                 pyongyang  000000000000011111111  -
+                qingdao  000000000000011111111  -
                 rennes  000000000000011111111  -
                 rio  000000000000011111111  -
                 roma  000000000000111110000  -
@@ -1172,6 +1179,7 @@ world  000000000000000000000  +
             paris  000000000000000011111  -
             philadelphia  000000000000000011111  -
             pyongyang  000000000000000011111  -
+            qingdao  000000000000000011111  -
             rennes  000000000000000011111  -
             rio  000000000000000011111  -
             roma  000000000000000011111  -