diff --git a/presets/defaults.json b/presets/defaults.json
index 8df2a2de0..13b07f2fd 100644
--- a/presets/defaults.json
+++ b/presets/defaults.json
@@ -14,17 +14,12 @@
         "other"
     ],
     "line": [
-        "residential road",
-        "primary road",
-        "secondary road",
-        "tertiary road",
+        "roads",
         "foot path",
         "cycle path",
-        "motorway",
-        "trunk highway",
-        "service road",
-        "river",
         "rail",
+        "river",
+        "stream",
         "other"
     ],
     "point": [
diff --git a/presets/forms.json b/presets/forms.json
index 380111531..340155844 100644
--- a/presets/forms.json
+++ b/presets/forms.json
@@ -84,5 +84,9 @@
     "surface": {
         "key": "surface",
         "type": "combo"
+    },
+    "layer": {
+        "key": "layer",
+        "type": "combo"
     }
 }
diff --git a/presets/presets.json b/presets/presets.json
index 451c073cb..fa76d0b46 100644
--- a/presets/presets.json
+++ b/presets/presets.json
@@ -179,6 +179,17 @@
     "icon": "waterway-river",
     "form": []
 },
+{
+    "name": "stream",
+    "match": {
+        "type": ["line"],
+        "tags": {
+            "waterway": "stream"
+        }
+    },
+    "icon": "waterway-river",
+    "form": ["layer"]
+},
 {
     "title": "Motorway",
     "name": "motorway",