diff --git a/data/presets.yaml b/data/presets.yaml
index db7399027..05e7895a4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -195,6 +195,8 @@ en:
         label: Layer
       leisure: 
         label: Type
+      length: 
+        label: Length (Meters)
       levels: 
         label: Levels
         placeholder: "2, 4, 6..."
@@ -348,6 +350,8 @@ en:
         label: Type
       wheelchair: 
         label: Wheelchair Access
+      width: 
+        label: Width (Meters)
       wikipedia: 
         label: Wikipedia
       wood: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 7994917de..37697aa0a 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -456,6 +456,11 @@
         "type": "typeCombo",
         "label": "Type"
     },
+    "length": {
+        "key": "length",
+        "type": "number",
+        "label": "Length (Meters)"
+    },
     "levels": {
         "key": "building:levels",
         "type": "number",
@@ -906,6 +911,11 @@
         "universal": true,
         "label": "Wheelchair Access"
     },
+    "width": {
+        "key": "width",
+        "type": "number",
+        "label": "Width (Meters)"
+    },
     "wikipedia": {
         "key": "wikipedia",
         "type": "wikipedia",
diff --git a/data/presets/fields/length.json b/data/presets/fields/length.json
new file mode 100644
index 000000000..a235ea37f
--- /dev/null
+++ b/data/presets/fields/length.json
@@ -0,0 +1,5 @@
+{
+    "key": "length",
+    "type": "number",
+    "label": "Length (Meters)"
+}
diff --git a/data/presets/fields/width.json b/data/presets/fields/width.json
new file mode 100644
index 000000000..381462d8c
--- /dev/null
+++ b/data/presets/fields/width.json
@@ -0,0 +1,5 @@
+{
+    "key": "width",
+    "type": "number",
+    "label": "Width (Meters)"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index d3ca7b763..a3ecb8657 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -279,7 +279,9 @@
         ],
         "fields": [
             "ref",
-            "surface"
+            "surface",
+            "length",
+            "width"
         ],
         "tags": {
             "aeroway": "runway"
@@ -3479,6 +3481,8 @@
         "fields": [
             "surface",
             "lit",
+            "width",
+            "structure",
             "access"
         ],
         "geometry": [
@@ -3614,9 +3618,10 @@
     },
     "highway/bridleway": {
         "fields": [
-            "access",
             "surface",
-            "structure"
+            "width",
+            "structure",
+            "access"
         ],
         "icon": "highway-bridleway",
         "geometry": [
@@ -3673,9 +3678,10 @@
         "fields": [
             "surface",
             "lit",
+            "width",
+            "oneway",
             "structure",
-            "access",
-            "oneway"
+            "access"
         ],
         "geometry": [
             "line"
@@ -3689,9 +3695,11 @@
     "highway/footway": {
         "icon": "highway-footway",
         "fields": [
+            "surface",
+            "lit",
+            "width",
             "structure",
-            "access",
-            "surface"
+            "access"
         ],
         "geometry": [
             "line",
@@ -3815,10 +3823,11 @@
     "highway/path": {
         "icon": "highway-path",
         "fields": [
+            "surface",
+            "width",
             "structure",
             "access",
             "sac_scale",
-            "surface",
             "incline",
             "trail_visibility",
             "ref"
@@ -3834,9 +3843,12 @@
     },
     "highway/pedestrian": {
         "fields": [
-            "access",
+            "surface",
+            "lit",
+            "width",
             "oneway",
-            "surface"
+            "structure",
+            "access"
         ],
         "geometry": [
             "line",
@@ -4103,8 +4115,10 @@
     },
     "highway/steps": {
         "fields": [
-            "access",
-            "surface"
+            "surface",
+            "lit",
+            "width",
+            "access"
         ],
         "icon": "highway-steps",
         "geometry": [
@@ -4819,7 +4833,8 @@
         "icon": "pitch",
         "fields": [
             "sport",
-            "surface"
+            "surface",
+            "lit"
         ],
         "geometry": [
             "point",
@@ -4834,7 +4849,8 @@
     "leisure/pitch/american_football": {
         "icon": "america-football",
         "fields": [
-            "surface"
+            "surface",
+            "lit"
         ],
         "geometry": [
             "point",
@@ -4849,6 +4865,9 @@
     },
     "leisure/pitch/baseball": {
         "icon": "baseball",
+        "fields": [
+            "lit"
+        ],
         "geometry": [
             "point",
             "area"
@@ -4864,7 +4883,8 @@
         "icon": "basketball",
         "fields": [
             "surface",
-            "hoops"
+            "hoops",
+            "lit"
         ],
         "geometry": [
             "point",
@@ -4880,7 +4900,8 @@
     "leisure/pitch/skateboard": {
         "icon": "pitch",
         "fields": [
-            "surface"
+            "surface",
+            "lit"
         ],
         "geometry": [
             "point",
@@ -4896,7 +4917,8 @@
     "leisure/pitch/soccer": {
         "icon": "soccer",
         "fields": [
-            "surface"
+            "surface",
+            "lit"
         ],
         "geometry": [
             "point",
@@ -4912,7 +4934,8 @@
     "leisure/pitch/tennis": {
         "icon": "tennis",
         "fields": [
-            "surface"
+            "surface",
+            "lit"
         ],
         "geometry": [
             "point",
@@ -4928,7 +4951,8 @@
     "leisure/pitch/volleyball": {
         "icon": "pitch",
         "fields": [
-            "surface"
+            "surface",
+            "lit"
         ],
         "geometry": [
             "point",
@@ -5011,7 +5035,9 @@
     "leisure/track": {
         "icon": "pitch",
         "fields": [
-            "surface"
+            "surface",
+            "lit",
+            "width"
         ],
         "geometry": [
             "point",
@@ -8132,6 +8158,9 @@
     },
     "waterway/canal": {
         "icon": "waterway-canal",
+        "fields": [
+            "width"
+        ],
         "geometry": [
             "line"
         ],
@@ -8182,7 +8211,8 @@
     "waterway/river": {
         "icon": "waterway-river",
         "fields": [
-            "tunnel"
+            "tunnel",
+            "width"
         ],
         "geometry": [
             "line"
@@ -8220,7 +8250,8 @@
     "waterway/stream": {
         "icon": "waterway-stream",
         "fields": [
-            "tunnel"
+            "tunnel",
+            "width"
         ],
         "geometry": [
             "line"
diff --git a/data/presets/presets/aeroway/runway.json b/data/presets/presets/aeroway/runway.json
index 1c0a688fe..42f9dec3d 100644
--- a/data/presets/presets/aeroway/runway.json
+++ b/data/presets/presets/aeroway/runway.json
@@ -8,7 +8,9 @@
     ],
     "fields": [
         "ref",
-        "surface"
+        "surface",
+        "length",
+        "width"
     ],
     "tags": {
         "aeroway": "runway"
diff --git a/data/presets/presets/footway/sidewalk.json b/data/presets/presets/footway/sidewalk.json
index 8a3a74a1a..07ba956cc 100644
--- a/data/presets/presets/footway/sidewalk.json
+++ b/data/presets/presets/footway/sidewalk.json
@@ -2,6 +2,8 @@
     "fields": [
         "surface",
         "lit",
+        "width",
+        "structure",
         "access"
     ],
     "geometry": [
@@ -13,4 +15,4 @@
     },
     "terms": [],
     "name": "Sidewalk"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json
index cf14cce65..8b6edf2e3 100644
--- a/data/presets/presets/highway/bridleway.json
+++ b/data/presets/presets/highway/bridleway.json
@@ -1,8 +1,9 @@
 {
     "fields": [
-        "access",
         "surface",
-        "structure"
+        "width",
+        "structure",
+        "access"
     ],
     "icon": "highway-bridleway",
     "geometry": [
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index ca143c40d..f6cc564d0 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -3,9 +3,10 @@
     "fields": [
         "surface",
         "lit",
+        "width",
+        "oneway",
         "structure",
-        "access",
-        "oneway"
+        "access"
     ],
     "geometry": [
         "line"
@@ -15,4 +16,4 @@
     },
     "terms": [],
     "name": "Cycle Path"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index 5adff5df6..196be7e2f 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -1,9 +1,11 @@
 {
     "icon": "highway-footway",
     "fields": [
+        "surface",
+        "lit",
+        "width",
         "structure",
-        "access",
-        "surface"
+        "access"
     ],
     "geometry": [
         "line", "area"
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index c8333f0e5..20a76a453 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -1,10 +1,11 @@
 {
     "icon": "highway-path",
     "fields": [
+        "surface",
+        "width",
         "structure",
         "access",
         "sac_scale",
-        "surface",
         "incline",
         "trail_visibility",
         "ref"
@@ -17,4 +18,4 @@
     },
     "terms": [],
     "name": "Path"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/pedestrian.json b/data/presets/presets/highway/pedestrian.json
index fcb3079d0..dc38f88e6 100644
--- a/data/presets/presets/highway/pedestrian.json
+++ b/data/presets/presets/highway/pedestrian.json
@@ -1,8 +1,11 @@
 {
     "fields": [
-        "access",
+        "surface",
+        "lit",
+        "width",
         "oneway",
-        "surface"
+        "structure",
+        "access"
     ],
     "geometry": [
         "line", "area"
diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json
index 42b35e3f5..ac060cb4e 100644
--- a/data/presets/presets/highway/steps.json
+++ b/data/presets/presets/highway/steps.json
@@ -1,7 +1,9 @@
 {
     "fields": [
-        "access",
-        "surface"
+        "surface",
+        "lit",
+        "width",
+        "access"
     ],
     "icon": "highway-steps",
     "geometry": [
diff --git a/data/presets/presets/leisure/pitch.json b/data/presets/presets/leisure/pitch.json
index ff0fff291..4958fd951 100644
--- a/data/presets/presets/leisure/pitch.json
+++ b/data/presets/presets/leisure/pitch.json
@@ -2,7 +2,8 @@
     "icon": "pitch",
     "fields": [
         "sport",
-        "surface"
+        "surface",
+        "lit"
     ],
     "geometry": [
         "point",
@@ -13,4 +14,4 @@
     },
     "terms": [],
     "name": "Sport Pitch"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/leisure/pitch/american_football.json b/data/presets/presets/leisure/pitch/american_football.json
index a01fdd3e0..54bc6c2f9 100644
--- a/data/presets/presets/leisure/pitch/american_football.json
+++ b/data/presets/presets/leisure/pitch/american_football.json
@@ -1,7 +1,8 @@
 {
     "icon": "america-football",
     "fields": [
-        "surface"
+        "surface",
+        "lit"
     ],
     "geometry": [
         "point",
@@ -13,4 +14,4 @@
     },
     "terms": [],
     "name": "American Football Field"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/leisure/pitch/baseball.json b/data/presets/presets/leisure/pitch/baseball.json
index ad318a6c9..7f98a03c9 100644
--- a/data/presets/presets/leisure/pitch/baseball.json
+++ b/data/presets/presets/leisure/pitch/baseball.json
@@ -1,5 +1,8 @@
 {
     "icon": "baseball",
+    "fields": [
+        "lit"
+    ],
     "geometry": [
         "point",
         "area"
@@ -10,4 +13,4 @@
     },
     "terms": [],
     "name": "Baseball Diamond"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json
index 189b1dd5f..708bf7687 100644
--- a/data/presets/presets/leisure/pitch/basketball.json
+++ b/data/presets/presets/leisure/pitch/basketball.json
@@ -2,7 +2,8 @@
     "icon": "basketball",
     "fields": [
         "surface",
-        "hoops"
+        "hoops",
+        "lit"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/pitch/skateboard.json b/data/presets/presets/leisure/pitch/skateboard.json
index a3b32a90f..73c996f2a 100644
--- a/data/presets/presets/leisure/pitch/skateboard.json
+++ b/data/presets/presets/leisure/pitch/skateboard.json
@@ -1,7 +1,8 @@
 {
     "icon": "pitch",
     "fields": [
-        "surface"
+        "surface",
+        "lit"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json
index 4f1724ea0..c2c9581c7 100644
--- a/data/presets/presets/leisure/pitch/soccer.json
+++ b/data/presets/presets/leisure/pitch/soccer.json
@@ -1,7 +1,8 @@
 {
     "icon": "soccer",
     "fields": [
-        "surface"
+        "surface",
+        "lit"
     ],
     "geometry": [
         "point",
@@ -13,4 +14,4 @@
     },
     "terms": [],
     "name": "Soccer Field"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/leisure/pitch/tennis.json b/data/presets/presets/leisure/pitch/tennis.json
index 6a308bcfb..b9920471d 100644
--- a/data/presets/presets/leisure/pitch/tennis.json
+++ b/data/presets/presets/leisure/pitch/tennis.json
@@ -1,7 +1,8 @@
 {
     "icon": "tennis",
     "fields": [
-        "surface"
+        "surface",
+        "lit"
     ],
     "geometry": [
         "point",
@@ -13,4 +14,4 @@
     },
     "terms": [],
     "name": "Tennis Court"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/leisure/pitch/volleyball.json b/data/presets/presets/leisure/pitch/volleyball.json
index f44ad8f3e..4ffdabc38 100644
--- a/data/presets/presets/leisure/pitch/volleyball.json
+++ b/data/presets/presets/leisure/pitch/volleyball.json
@@ -1,7 +1,8 @@
 {
     "icon": "pitch",
     "fields": [
-        "surface"
+        "surface",
+        "lit"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/track.json b/data/presets/presets/leisure/track.json
index 144b8d5a1..a9b07b30c 100644
--- a/data/presets/presets/leisure/track.json
+++ b/data/presets/presets/leisure/track.json
@@ -1,7 +1,9 @@
 {
     "icon": "pitch",
     "fields": [
-        "surface"
+        "surface",
+        "lit",
+        "width"
     ],
     "geometry": [
         "point",
@@ -12,4 +14,4 @@
         "leisure": "track"
     },
     "name": "Race Track"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json
index 7da248f8d..66405ca9f 100644
--- a/data/presets/presets/public_transport/platform.json
+++ b/data/presets/presets/public_transport/platform.json
@@ -15,4 +15,4 @@
         "public_transport": "platform"
     },
     "name": "Platform"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway/canal.json b/data/presets/presets/waterway/canal.json
index 7e4c677da..e1608d2b4 100644
--- a/data/presets/presets/waterway/canal.json
+++ b/data/presets/presets/waterway/canal.json
@@ -1,5 +1,8 @@
 {
     "icon": "waterway-canal",
+    "fields": [
+        "width"
+    ],
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json
index 26899cc23..b9d1e8b3e 100644
--- a/data/presets/presets/waterway/river.json
+++ b/data/presets/presets/waterway/river.json
@@ -1,7 +1,8 @@
 {
     "icon": "waterway-river",
     "fields": [
-        "tunnel"
+        "tunnel",
+        "width"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json
index 8c6cb758c..1a6a5f68c 100644
--- a/data/presets/presets/waterway/stream.json
+++ b/data/presets/presets/waterway/stream.json
@@ -1,7 +1,8 @@
 {
     "icon": "waterway-stream",
     "fields": [
-        "tunnel"
+        "tunnel",
+        "width"
     ],
     "geometry": [
         "line"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 683ca453b..011e79471 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -679,6 +679,9 @@
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Length (Meters)"
+            },
             "levels": {
                 "label": "Levels",
                 "placeholder": "2, 4, 6..."
@@ -900,6 +903,9 @@
             "wheelchair": {
                 "label": "Wheelchair Access"
             },
+            "width": {
+                "label": "Width (Meters)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },