diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.json b/assets/layers/walls_and_buildings/walls_and_buildings.json
index bd130083d..c632e9d77 100644
--- a/assets/layers/walls_and_buildings/walls_and_buildings.json
+++ b/assets/layers/walls_and_buildings/walls_and_buildings.json
@@ -43,5 +43,8 @@
         "render": "2"
       }
     }
+  ],
+  "calculatedTags": [
+    "_entrance=feat.get('entrance')"
   ]
 }
\ No newline at end of file
diff --git a/assets/layers/walls_and_buildings/walls_and_buildings.png b/assets/layers/walls_and_buildings/walls_and_buildings.png
new file mode 100644
index 000000000..1b9332d3d
Binary files /dev/null and b/assets/layers/walls_and_buildings/walls_and_buildings.png differ
diff --git a/assets/themes/walls_and_buildings/walls_and_buildings.json b/assets/themes/walls_and_buildings/walls_and_buildings.json
new file mode 100644
index 000000000..aa0d108b6
--- /dev/null
+++ b/assets/themes/walls_and_buildings/walls_and_buildings.json
@@ -0,0 +1,20 @@
+{
+  "id": "walls_and_buildings",
+  "title": {
+    "en": "Walls and buildings"
+  },
+  "description": {
+    "en": "Buildings are shown with entrance metatags"
+  },
+  "maintainer": "MapComplete",
+  "icon": "./assets/layers/walls_and_buildings/walls_and_buildings.png",
+  "version": "0",
+  "startLat": 50.8465573,
+  "defaultBackgroundId": "CartoDB.Voyager",
+  "startLon": 4.351697,
+  "startZoom": 16,
+  "widenFactor": 2,
+  "layers": [
+    "walls_and_buildings"
+  ]
+}
\ No newline at end of file