diff --git a/buildings.json b/buildings.json
new file mode 100644
index 0000000..8c16eb3
--- /dev/null
+++ b/buildings.json
@@ -0,0 +1,36 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Buildings",
+        "de": "Gebäude"
+    },
+    "query": {
+        "16": [
+            "(",
+            "  way[building];",
+            "  relation[building];",
+            ")"
+        ]
+    },
+    "feature": {
+        "markerSign": null,
+        "priority": [
+            "{% set p = 100 %}",
+            "{% if tags.name %}{% set p = p - 10 %}{% endif %}",
+            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.historic %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.culture %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.highway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.railway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.aeroway %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.amenity %}{% set p = p - 1 %}{% endif %}",
+            "{% if tags.tourism %}{% set p = p - 1 %}{% endif %}",
+            "{{ p }}"
+        ],
+        "style": {
+            "weight": "1",
+            "color": "#000000",
+            "fillColor": "#000000"
+        }
+    }
+}
diff --git a/cycle_amenities.json b/cycle_amenities.json
index f6ac9c8..22332c2 100644
--- a/cycle_amenities.json
+++ b/cycle_amenities.json
@@ -29,8 +29,7 @@
             "node[vending~\"^(bicycle_tube)$\"];",
             "way[vending~\"^(bicycle_tube)$\"];",
             "relation[vending~\"^(bicycle_tube)$\"];",
-            ")",
-            ""
+            ")"
         ]
     },
     "feature": {
diff --git a/health.json b/health.json
index ab52d8d..e7ab82b 100644
--- a/health.json
+++ b/health.json
@@ -49,8 +49,7 @@
             "{% else %}",
             "  {% set key = 'amenity' %}",
             "  {% set value = tags.amenity %}",
-            "{% endif %}",
-            ""
+            "{% endif %}"
         ],
         "description": [
             "{{ tagTrans(key, value) }}",
diff --git a/index.json b/index.json
index a91bb32..9625293 100644
--- a/index.json
+++ b/index.json
@@ -204,24 +204,11 @@
             ]
         },
         {
-            "id": "agriculture_industry",
+            "id": "infrastructure",
             "type": "index",
             "name": {
-                "ast": "Agricultura ya industria",
-                "cs": "Průmysl a zemědělství",
-                "de": "Landwirtschaft und Industrie",
-                "el": "Γεωργία και Βιομηχανία",
-                "en": "Agriculture and Industry",
-                "et": "Põllumajandus ja tööstus",
-                "fr": "Agriculture et industrie",
-                "hu": "Mezőgazdaság és ipar",
-                "it": "Agricoltura e industria",
-                "ja": "農業と工業",
-                "nl": "Landbouw en Industrie",
-                "pl": "Rolnictwo i Przemysł",
-                "ro": "Agricultura si industrie",
-                "ru": "Сельское хозяйство и промышленность",
-                "uk": "Сільське господартво та промисловість"
+                "de": "Infrastruktur",
+                "en": "Infrastructure"
             },
             "subCategories": [
                 {
@@ -269,6 +256,9 @@
                 },
                 {
                     "id": "works"
+                },
+                {
+                    "id": "buildings"
                 }
             ]
         },
diff --git a/places.json b/places.json
index 800deaf..aceabb4 100644
--- a/places.json
+++ b/places.json
@@ -30,10 +30,7 @@
     "feature": {
         "title": "{% set loc_name = localizedTag(tags, 'name') %}{{ loc_name }}{% if loc_name != tags.name %} ({{ tags.name }}){% endif %}",
         "description": "{{ tagTrans('place', tags.place) }}",
-        "body": [
-            "{% if tags.population %}{{ keyTrans('population') }}: {{ tags.population }}{% endif %} ",
-            ""
-        ],
+        "body": "{% if tags.population %}{{ keyTrans('population') }}: {{ tags.population }}{% endif %}",
         "priority": "{% set priorities = { 'continent': 0, 'country': 1, 'state': 2, 'region': 3, 'city': 4, 'town': 5, 'village': 6, 'suburb': 7, 'hamlet': 8, 'quarter': 9, neighbourhood: 10, 'isolated_dwelling': 11, 'farm': 12 } %}{{ priorities[tags.place] }}"
     }
 }
diff --git a/places_geo.json b/places_geo.json
index 469ccac..a9e6432 100644
--- a/places_geo.json
+++ b/places_geo.json
@@ -24,6 +24,9 @@
         {
             "id": "natural"
         },
+        {
+            "id": "water"
+        },
         {
             "id": "administrative"
         },
diff --git a/railway-electrification.json b/railway-electrification.json
index 07d0018..9c27746 100644
--- a/railway-electrification.json
+++ b/railway-electrification.json
@@ -54,13 +54,14 @@
         ],
         "markerSign": null,
         "listMarkerSymbol": "line",
-        "priority": "{% if tags.railway == 'station' %}0{% elseif tags.railway in [ 'halt', 'tram_stop' ] %}1{% else %}5{% endif %}",
         "styles": "casing,default",
+        "priority": "{% if tags.railway == 'station' %}0{% elseif tags.railway in [ 'halt', 'tram_stop' ] %}1{% else %}5{% endif %}",
         "style": {
             "weight": "{{ weight }}",
+            "lineCap": "butt",
             "color": "{{ color }}",
             "opacity": "1",
-            "lineCap": "butt",
+            "fill": null,
             "dashArray": [
                 "{% if not tags.electrified or tags.electrified == 'no' %}",
                 "{% elseif tags.frequency == 0 %}",
diff --git a/water.json b/water.json
new file mode 100644
index 0000000..e480414
--- /dev/null
+++ b/water.json
@@ -0,0 +1,43 @@
+{
+    "type": "overpass",
+    "name": {
+        "en": "Waterbodies",
+        "de": "Gewässer"
+    },
+    "query": {
+        "12": [
+            "(",
+            "node[natural~\"^(water|divide)$\"];",
+            "way[natural~\"^(water|divide)$\"];",
+            "relation[type=multipolygon][natural=water];",
+            "way[waterway];",
+            ")"
+        ]
+    },
+    "feature": {
+        "markerSign": null,
+        "style": {
+            "weight": [
+                "{% if tags.waterway == 'stream' %}",
+                "1.5",
+                "{% else %}",
+                "3",
+                "{% endif %}"
+            ],
+            "color": [
+                "{% if tags.natural == 'divide' %}",
+                "#ff0000",
+                "{% elseif tags.waterway in [ 'dam', 'weir' ] %}",
+                "#000000",
+                "{% else %}",
+                "#3388ff",
+                "{% endif %}"
+            ],
+            "text": [
+                "{% if type=='way' and tags.waterway in [ 'river', 'stream', 'canal', 'wadi', 'drystream' ] %}",
+                "{{ tags.name }}   ➔   ",
+                "{% endif %}"
+            ]
+        }
+    }
+}