diff --git a/public/assets/sunny-unlabeled.json b/public/assets/sunny-unlabeled.json
index 7282f36dd..8ac9d1b94 100644
--- a/public/assets/sunny-unlabeled.json
+++ b/public/assets/sunny-unlabeled.json
@@ -514,29 +514,39 @@
          }
       },
       {
-         "id": "physical_line_stream",
+         "id": "water_stream",
          "type": "line",
          "source": "protomaps",
-         "source-layer": "physical_line",
-         "minzoom": 14,
+         "source-layer": "water",
+         "minzoom": 10,
          "filter": [
-            "all",
-            [
-               "in",
-               "kind",
-               "stream"
-            ]
+            "in",
+            "kind",
+            "stream"
          ],
          "paint": {
             "line-color": "#85c2e9",
-            "line-width": 0.5
+            "line-width": [
+               "interpolate",
+               [
+                  "exponential",
+                  1.6
+               ],
+               [
+                  "zoom"
+               ],
+               12,
+               0,
+               18,
+               10
+            ]
          }
       },
       {
-         "id": "physical_line_river",
+         "id": "water_river",
          "type": "line",
          "source": "protomaps",
-         "source-layer": "physical_line",
+         "source-layer": "water",
          "minzoom": 9,
          "filter": [
             "in",
@@ -564,10 +574,10 @@
          }
       },
       {
-         "id": "physical_line_underground_stream",
+         "id": "water_underground_stream",
          "type": "line",
          "source": "protomaps",
-         "source-layer": "physical_line",
+         "source-layer": "water",
          "minzoom": 14,
          "filter": [
             "all",
@@ -587,10 +597,10 @@
          }
       },
       {
-         "id": "physical_line_underground_river",
+         "id": "water_underground_river",
          "type": "line",
          "source": "protomaps",
-         "source-layer": "physical_line",
+         "source-layer": "water",
          "minzoom": 9,
          "filter": [
             "all",
diff --git a/public/assets/sunny.json b/public/assets/sunny.json
index 8c6fe1dbd..5409ebb80 100644
--- a/public/assets/sunny.json
+++ b/public/assets/sunny.json
@@ -513,29 +513,39 @@
       }
     },
     {
-      "id": "physical_line_stream",
+      "id": "water_stream",
       "type": "line",
       "source": "protomaps",
-      "source-layer": "physical_line",
-      "minzoom": 14,
+      "source-layer": "water",
+      "minzoom": 10,
       "filter": [
-        "all",
-        [
           "in",
           "kind",
           "stream"
-        ]
       ],
       "paint": {
         "line-color": "#85c2e9",
-        "line-width": 0.5
+        "line-width": [
+          "interpolate",
+          [
+            "exponential",
+            1.6
+          ],
+          [
+            "zoom"
+          ],
+          12,
+          0,
+          18,
+          10
+        ]
       }
     },
     {
-      "id": "physical_line_river",
+      "id": "water_river",
       "type": "line",
       "source": "protomaps",
-      "source-layer": "physical_line",
+      "source-layer": "water",
       "minzoom": 9,
       "filter": [
         "in",
@@ -563,10 +573,10 @@
       }
     },
     {
-      "id": "physical_line_underground_stream",
+      "id": "water_underground_stream",
       "type": "line",
       "source": "protomaps",
-      "source-layer": "physical_line",
+      "source-layer": "water",
       "minzoom": 14,
       "filter": [
         "all",
@@ -586,10 +596,10 @@
       }
     },
     {
-      "id": "physical_line_underground_river",
+      "id": "water_underground_river",
       "type": "line",
       "source": "protomaps",
-      "source-layer": "physical_line",
+      "source-layer": "water",
       "minzoom": 9,
       "filter": [
         "all",