diff --git a/terrain-classic-background.yml b/terrain-classic-background.yml
index 91ec896..5abcbce 100644
--- a/terrain-classic-background.yml
+++ b/terrain-classic-background.yml
@@ -94,6 +94,67 @@ Layer:
       file: landcover/LCType_z9-urban-only.vrt
       # file: landcover/LCType_z9_s3-urban-only.vrt
 
+  - <<: *layer
+    name: ne_10m_rivers_lake_centerlines_scale_rank
+    id:   ne_10m_rivers_lake_centerlines_scale_rank
+    properties:
+      minzoom: 4
+      maxzoom: 8
+    Datasource:
+      <<: *postgis
+      geometry_field: geom
+      table: ne_10m_rivers_lake_centerlines_scale_rank
+      encoding: "ISO-8859-1"
+
+  - <<: *layer
+    name: ne_50m_lakes
+    id:   ne_50m_lakes
+    properties:
+      minzoom: 2
+      maxzoom: 5
+    Datasource:
+      <<: *postgis
+      geometry_field: geom
+      table: ne_50m_lakes
+      encoding: "ISO-8859-1"
+
+  - <<: *layer
+    name: ne_10m_lakes
+    id:   ne_10m_lakes
+    properties:
+      minzoom: 6
+      maxzoom: 8
+    Datasource:
+      <<: *postgis
+      geometry_field: geom
+      table: ne_10m_lakes
+      encoding: "ISO-8859-1"
+
+  - <<: *layer
+    name: ne_10m_ocean
+    id:   ne_10m_ocean
+    properties:
+      minzoom: 0
+      maxzoom: 7
+    Datasource:
+      <<: *postgis
+      geometry_field: geom
+      table: ne_10m_ocean
+      encoding: "ISO-8859-1"
+
+  - <<: *layer
+    name: ne_50m_ocean
+    id:   ne_50m_ocean
+    properties:
+      minzoom: 0
+      maxzoom: 7
+    Datasource:
+      <<: *postgis
+      geometry_field: geom
+      table: ne_50m_ocean
+      encoding: "ISO-8859-1"
+
+
   - <<: *layer
     name: country-shapes-50m
     id:   country-shapes-50m
@@ -366,6 +427,37 @@ Layer:
           WHERE geometry && !bbox!
         ) AS _
 
+  - <<: *layer
+    name: water
+    id:   water
+    properties:
+      minzoom: 8
+      maxzoom: 9
+    Datasource:
+      <<: *postgis
+      geometry_field: geom
+      table: water_polygons
+
+  - <<: *layer
+    name: water-bodies-low
+    id:   water-bodies-low
+    properties:
+      minzoom: 8
+      maxzoom: 9
+    Datasource:
+      <<: *postgis
+      geometry_field: geometry
+      table: >
+        (
+          SELECT
+            name,
+            type,
+            geometry,
+            area
+          FROM osm_water_areas_z10
+          WHERE geometry && !bbox!
+        ) AS _
+
   - <<: *layer
     name: brown-areas-high
     id:   brown-areas-high
diff --git a/terrain-classic-features.yml b/terrain-classic-features.yml
index a17ff14..631516f 100644
--- a/terrain-classic-features.yml
+++ b/terrain-classic-features.yml
@@ -47,66 +47,6 @@ Stylesheet:
 
 Layer:
 
-  - <<: *layer
-    name: ne_10m_rivers_lake_centerlines_scale_rank
-    id:   ne_10m_rivers_lake_centerlines_scale_rank
-    properties:
-      minzoom: 4
-      maxzoom: 8
-    Datasource:
-      <<: *postgis
-      geometry_field: geom
-      table: ne_10m_rivers_lake_centerlines_scale_rank
-      encoding: "ISO-8859-1"
-
-  - <<: *layer
-    name: ne_50m_lakes
-    id:   ne_50m_lakes
-    properties:
-      minzoom: 2
-      maxzoom: 5
-    Datasource:
-      <<: *postgis
-      geometry_field: geom
-      table: ne_50m_lakes
-      encoding: "ISO-8859-1"
-
-  - <<: *layer
-    name: ne_10m_lakes
-    id:   ne_10m_lakes
-    properties:
-      minzoom: 6
-      maxzoom: 8
-    Datasource:
-      <<: *postgis
-      geometry_field: geom
-      table: ne_10m_lakes
-      encoding: "ISO-8859-1"
-
-  - <<: *layer
-    name: ne_10m_ocean
-    id:   ne_10m_ocean
-    properties:
-      minzoom: 0
-      maxzoom: 7
-    Datasource:
-      <<: *postgis
-      geometry_field: geom
-      table: ne_10m_ocean
-      encoding: "ISO-8859-1"
-
-  - <<: *layer
-    name: ne_50m_ocean
-    id:   ne_50m_ocean
-    properties:
-      minzoom: 0
-      maxzoom: 7
-    Datasource:
-      <<: *postgis
-      geometry_field: geom
-      table: ne_50m_ocean
-      encoding: "ISO-8859-1"
-
   - <<: *layer
     name: nullisland
     id:   nullisland
@@ -140,7 +80,7 @@ Layer:
     name: water
     id:   water
     properties:
-      minzoom: 8
+      minzoom: 10
     Datasource:
       <<: *postgis
       geometry_field: geom
@@ -205,18 +145,6 @@ Layer:
           WHERE geometry && !bbox!
         ) AS _
 
-  - <<: *layer
-    name: ne_10m_rivers_lake_centerlines_scale_rank
-    id:   ne_10m_rivers_lake_centerlines_scale_rank
-    properties:
-      minzoom: 4
-      maxzoom: 8
-    Datasource:
-      <<: *postgis
-      geometry_field: geom
-      table: ne_10m_rivers_lake_centerlines_scale_rank
-      encoding: "ISO-8859-1"
-
   - <<: *layer
     name: admin0-map-units-10m
     id:   admin0-map-units-10m