diff --git a/data/classificator.txt b/data/classificator.txt
index 4c357b529..5314be138 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -621,7 +621,6 @@ world  +
         cemetery  +
             christian  -
             {}
-        churchyard  -
         commercial  -
         construction  -
         education  -
@@ -650,6 +649,7 @@ world  +
         quarry  -
         railway  -
         recreation_ground  -
+        religious  -
         reservoir  -
         residential  -
         retail  -
@@ -891,7 +891,6 @@ world  +
             wind  -
             {}
         pole  -
-        station  -
         substation  -
         tower  -
         {}
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 549e36471..cec8cadb8 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 552c9b042..21c9ed0cd 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -48792,51 +48792,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 16115926
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -51966,6 +51921,65 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -76804,73 +76818,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 32a4163ef..5f686ab45 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 b25a6baee..0d730e5ef 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -45619,45 +45619,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -48779,6 +48740,57 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -71549,73 +71561,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 3d369f0aa..9d79ce371 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 a6d8e5ad4..37483c290 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -45513,51 +45513,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 16115926
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -48687,6 +48642,65 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -71534,73 +71548,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 826b054e1..beb2ecc2a 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 a271cc71e..e2ad8f5de 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -48299,45 +48299,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -51551,6 +51512,57 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -76934,73 +76946,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 8f71318e1..272c35ef6 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 6b9ae9c2b..06156e711 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -48193,51 +48193,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 16115926
-      priority: -1950
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 16116442
-      priority: -1950
-    }
-  }
-}
 cont {
   name: "landuse-commercial"
   element {
@@ -51459,6 +51414,65 @@ cont {
     }
   }
 }
+cont {
+  name: "landuse-religious"
+  element {
+    scale: 13
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+  element {
+    scale: 20
+    area {
+      color: 16445409
+      priority: -1760
+    }
+  }
+}
 cont {
   name: "landuse-reservoir"
   element {
@@ -76919,73 +76933,6 @@ cont {
     }
   }
 }
-cont {
-  name: "power-station"
-  element {
-    scale: 17
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-  element {
-    scale: 20
-    symbol {
-      name: "power-m"
-      priority: 230
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9770
-    }
-  }
-}
 cont {
   name: "power-substation"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index ff0724db1..6c3e3e7de 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 fc7ac6484..2cb01f3e7 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -27260,51 +27260,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 328965
-      priority: -1960
-    }
-  }
-}
 cont {
   name: "landuse-construction"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index d44f0c902..26066f232 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 5e70f3a75..6d40adc15 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -26720,51 +26720,6 @@ cont {
     }
   }
 }
-cont {
-  name: "landuse-churchyard"
-  element {
-    scale: 15
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-  element {
-    scale: 20
-    area {
-      color: 14934482
-      priority: -1960
-    }
-  }
-}
 cont {
   name: "landuse-construction"
   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 578822bcc..f4e991a9d 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
@@ -27,7 +27,7 @@ amenity-place_of_worship-jewish                     # area z13- (also has icon z
 amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
 amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
 amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious
+landuse-religious                                   # area z13-
 === 240
 
 amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
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 e8604dbb5..cca075827 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
@@ -27,7 +27,7 @@ amenity-place_of_worship-jewish                     # area z13- (also has icon z
 amenity-place_of_worship-muslim                     # area z13- (also has icon z14-, caption(optional) z14-)
 amenity-place_of_worship-shinto                     # area z13- (also has icon z14-, caption(optional) z14-)
 amenity-place_of_worship-taoist                     # area z13- (also has icon z14-, caption(optional) z14-)
-landuse-religious
+landuse-religious                                   # area z13-
 === 240
 
 amenity-doctors                                     # area z15- (also has icon z17-, caption(optional) z17-)
diff --git a/data/types.txt b/data/types.txt
index d537dc37f..3f51ad324 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -216,7 +216,7 @@ mapswithme
 *sport|table_tennis
 *sport|beachvolleyball
 *sport|volleyball
-*power|station
+mapswithme
 *sport|swimming
 *leisure|track
 *sport|skateboard
@@ -1327,7 +1327,7 @@ tourism|attraction
 *amenity|parking_space|underground
 *amenity|parking_space|private
 *amenity|parking_space|permissive
-*landuse|churchyard
+*landuse|religious
 *isoline|step_1000
 *isoline|step_500
 *isoline|step_100
diff --git a/data/visibility.txt b/data/visibility.txt
index 86f0303fc..c22e0f5ec 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -621,7 +621,6 @@ world  000000000000000000000  +
         cemetery  000000000000001111111  +
             christian  000000000000001111111  -
             {}
-        churchyard  000000000000000111111  -
         commercial  000000000000000000000  -
         construction  000000000000000111111  -
         education  000000000000000000000  -
@@ -650,6 +649,7 @@ world  000000000000000000000  +
         quarry  000000000000000111111  -
         railway  000000000000000111111  -
         recreation_ground  000000000000111111111  -
+        religious  000000000000000000000  -
         reservoir  000000000011111111111  -
         residential  000000000000000000000  -
         retail  000000000000000000000  -
@@ -891,7 +891,6 @@ world  000000000000000000000  +
             wind  000000000000000111111  -
             {}
         pole  000000000000000000000  -
-        station  000000000000000000000  -
         substation  000000000000000111111  -
         tower  000000000000000000000  -
         {}