diff --git a/data/classificator.txt b/data/classificator.txt
index 0887fb853d..6b9438277b 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -69,7 +69,15 @@ world  +
                 {}
             {}
         pharmacy  -
-        place_of_worship  -
+        place_of_worship  +
+            buddhist  -
+            christian  -
+            hindu  -
+            jewish  -
+            muslim  -
+            shinto  -
+            taoist  -
+            {}
         police  -
         post_box  -
         post_office  -
@@ -155,6 +163,7 @@ world  +
     building  +
         address  -
         {}
+    building:part  -
     communication  +
         line  +
             underground  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index ffee432881..603f615b29 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 5e1fb02957..431801c501 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -4124,6 +4124,412 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 16
+    symbol {
+      name: "religion"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-christian"
+  element {
+    scale: 16
+    symbol {
+      name: "religion"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 16
+    symbol {
+      name: "religion"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 16
+    symbol {
+      name: "religion"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 16
+    symbol {
+      name: "religion"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 16
+    symbol {
+      name: "religion"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 16
+    symbol {
+      name: "religion"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "religion"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
 cont {
   name: "amenity-police"
   element {
@@ -8404,6 +8810,44 @@ cont {
     }
   }
 }
+cont {
+  name: "building:part"
+  element {
+    scale: 15
+    area {
+      color: 13487540
+      priority: 1001
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13487540
+      priority: 1001
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13487540
+      priority: 1001
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13487540
+      priority: 1001
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13487540
+      priority: 1001
+    }
+  }
+}
 cont {
   name: "communication-line"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index fb5938364d..c9a0569808 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 3437748dd6..82dba2e20a 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -4144,6 +4144,559 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 16
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-christian"
+  element {
+    scale: 16
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 16
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 16
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 16
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 16
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 16
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16316664
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
 cont {
   name: "amenity-police"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index e32d54ac10..c19fffad58 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 512c51b339..b34497a863 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -4144,6 +4144,559 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-place_of_worship-buddhist"
+  element {
+    scale: 16
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-christian"
+  element {
+    scale: 16
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-hindu"
+  element {
+    scale: 16
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-jewish"
+  element {
+    scale: 16
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-muslim"
+  element {
+    scale: 16
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-shinto"
+  element {
+    scale: 16
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
+cont {
+  name: "amenity-place_of_worship-taoist"
+  element {
+    scale: 16
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-m"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 3355426
+      priority: -15136
+    }
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16864
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15864
+    }
+  }
+}
 cont {
   name: "amenity-police"
   element {
diff --git a/data/types.txt b/data/types.txt
index 17095d87ef..71d9de1ec4 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1040,3 +1040,11 @@ barrier|border_control
 shop|laundry
 amenity|vending_machine|parking_tickets
 amenity|vending_machine|public_transport_tickets
+building:part
+amenity|place_of_worship|christian
+amenity|place_of_worship|muslim
+amenity|place_of_worship|buddhist
+amenity|place_of_worship|hindu
+amenity|place_of_worship|shinto
+amenity|place_of_worship|jewish
+amenity|place_of_worship|taoist
diff --git a/data/visibility.txt b/data/visibility.txt
index e7c1a65385..442a67b403 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -69,7 +69,15 @@ world  00000000000000000000  +
                 {}
             {}
         pharmacy  00000000000000001111  -
-        place_of_worship  00000000000000001111  -
+        place_of_worship  00000000000000001111  +
+            buddhist  00000000000000001111  -
+            christian  00000000000000001111  -
+            hindu  00000000000000001111  -
+            jewish  00000000000000001111  -
+            muslim  00000000000000001111  -
+            shinto  00000000000000001111  -
+            taoist  00000000000000001111  -
+            {}
         police  00000000000000000111  -
         post_box  00000000000000000111  -
         post_office  00000000000000001111  -
@@ -155,6 +163,7 @@ world  00000000000000000000  +
     building  00000000000000011111  +
         address  00000000000000001111  -
         {}
+    building:part  00000000000000011111  -
     communication  00000000000000000000  +
         line  00000000000000001111  +
             underground  00000000000000001111  -