diff --git a/defines.py b/defines.py
index 2677a8f..da726cc 100644
--- a/defines.py
+++ b/defines.py
@@ -139,13 +139,18 @@ mstr_ortho_layers = [
     # Z-Order 5
     ("aeroway", "taxiway", 42),
     ("aeroway", "runway", 80),
+    ("building", "church", "building", "common"),
+    ("building", "hotel", "building", "industrial"),
+    ("building", "farm", "building", "industrial"),
     ("building", "semidetached_house", "building", "common"),
     ("building", "apartments", "building", "common"),
+    ("building", "civic", "building", "common"),
     ("building", "garage", "building", "industrial"),
     ("building", "office", "building", "office"),
     ("building", "retail", "building", "industrial"),
     ("building", "industrial", "building", "industrial"),
     ("building", "house", "building", "house"),
+    ("building", "terrace", "building", "industrial"),
     ("building", "yes", "building", "common")
 ]
 
@@ -208,12 +213,17 @@ mstr_mask_blur = [
     # Z-Order 5
     ("aeroway", "taxiway", 12),
     ("aeroway", "runway", 12),
-    ("building", "semidetached_house", 3),
+    ("building", "church", 1),
+    ("building", "hotel", 1),
+    ("building", "farm", 1),
+    ("building", "semidetached_house", 1),
     ("building", "apartments", 1),
+    ("building", "civic", 1),
     ("building", "garage", 1),
     ("building", "office", 1),
     ("building", "retail", 1),
     ("building", "industrial", 1),
     ("building", "house", 1),
+    ("building", "terrace", 1),
     ("building", "yes", 1)
 ]